Defer console startup until after API startup

Consoles starting up would potentially delay API availaility.  Change
by having the API having ample time to startup, then commence the
busy work of starting cnosole sessions.

confluent_client/bin/confetty

@@ -2,7 +2,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2014 IBM Corporation
-# Copyright 2015 Lenovo
+# Copyright 2015-2016 Lenovo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -316,21 +316,31 @@ def do_command(command, server):
         if parentpath:
             childname = '{0}/'.format(parentpath[parentpath.rindex('/') + 1:])
             parentpath = parentpath[:parentpath.rindex('/') + 1]
-            foundchild = False
-            for res in session.read(parentpath, server):
-                try:
-                    if res['item']['href'] == childname:
-                        foundchild = True
-                except KeyError:
-                    pass
-                if 'errorcode' in res:
-                    exitcode = res['errorcode']
-                if 'error' in res:
-                    sys.stderr.write(target + ': ' + res['error'] + '\n')
+            if parentpath == '/noderange/':
+                for res in session.read(target, server):
+                    if 'errorcode' in res:
+                        exitcode = res['errorcode']
+                        target = otarget
+                    if 'error' in res:
+                        sys.stderr.write(target + ': ' + res['error'] + '\n')
+                        target = otarget
+            else:
+                foundchild = False
+                for res in session.read(parentpath, server):
+                    try:
+                        if res['item']['href'] == childname:
+                            foundchild = True
+                    except KeyError:
+                        pass
+                    if 'errorcode' in res:
+                        exitcode = res['errorcode']
+                        target = otarget
+                    if 'error' in res:
+                        sys.stderr.write(target + ': ' + res['error'] + '\n')
+                        target = otarget
+                if not foundchild:
+                    sys.stderr.write(target + ': Target not found - \n')
                     target = otarget
-            if not foundchild:
-                sys.stderr.write(target + ': Target not found - \n')
-                target = otarget
     elif argv[0] in ('cat', 'show', 'ls', 'dir'):
         if len(argv) > 1:
             targpath = fullpath_target(argv[1])

confluent_client/bin/nodeeventlog

@@ -49,11 +49,11 @@ def format_event(evt):
         display = dt.strptime(evt['timestamp'], '%Y-%m-%dT%H:%M:%S')
         retparts.append(display.strftime('%m/%d/%Y %H:%M:%S'))
     dscparts = []
-    if 'component_type' in evt:
+    if 'component_type' in evt and evt['component_type'] is not None:
         dscparts.append(evt['component_type'])
     if 'component' in evt and evt['component'] is not None:
         dscparts.append(evt['component'])
-    if 'event' in evt and evt['event']:
+    if 'event' in evt and evt['event'] and evt['event'] is not None:
         evttext = evt['event']
         try:
             if evttext.startswith(evt['component'] + ' - '):
@@ -83,4 +83,4 @@ for rsp in func('/noderange/{0}/events/hardware/log'.format(noderange)):
             if 'events' in thisdata:
                evtdata = thisdata['events']
                for evt in evtdata:
-                   print '{0}: {1}'.format(node, format_event(evt))
+                   print '{0}: {1}'.format(node, format_event(evt))

confluent_server/confluent/consoleserver.py

@@ -255,11 +255,12 @@ class ConsoleHandler(object):
         self._send_rcpts({'connectstate': self.connectstate})
 
     def _got_disconnected(self):
-        self.connectstate = 'unconnected'
-        self.log(
-            logdata='console disconnected', ltype=log.DataTypes.event,
-            event=log.Events.consoledisconnect)
-        self._send_rcpts({'connectstate': self.connectstate})
+        if self.connectstate != 'unconnected':
+            self.connectstate = 'unconnected'
+            self.log(
+                logdata='console disconnected', ltype=log.DataTypes.event,
+                event=log.Events.consoledisconnect)
+            self._send_rcpts({'connectstate': self.connectstate})
         if self._isalive:
             self._connect()
 

confluent_server/confluent/main.py

@@ -209,7 +209,6 @@ def run():
         os.umask(oumask)
     http_bind_host, http_bind_port = _get_connector_config('http')
     sock_bind_host, sock_bind_port = _get_connector_config('socket')
-    consoleserver.start_console_sessions()
     webservice = httpapi.HttpApi(http_bind_host, http_bind_port)
     webservice.start()
     try:
@@ -218,6 +217,8 @@ def run():
     except NameError:
         pass
     atexit.register(doexit)
+    eventlet.sleep(1)
+    consoleserver.start_console_sessions()
     while 1:
         eventlet.sleep(100)
 

confluent_server/confluent/messages.py

@@ -19,6 +19,7 @@
 # Things are defined here to 'encourage' developers to coordinate information
 # format.  This is also how different data formats are supported
 import confluent.exceptions as exc
+from copy import deepcopy
 from datetime import datetime
 import json
 
@@ -418,7 +419,7 @@ class InputAttributes(ConfluentMessage):
     def get_attributes(self, node):
         if node not in self.nodeattribs:
             return {}
-        nodeattr = self.nodeattribs[node]
+        nodeattr = deepcopy(self.nodeattribs[node])
         for attr in nodeattr:
             if type(nodeattr[attr]) in (str, unicode):
                 try:
@@ -492,7 +493,7 @@ class InputCredential(ConfluentMessage):
     def get_attributes(self, node):
         if node not in self.credentials:
             return {}
-        credential = self.credentials[node]
+        credential = deepcopy(self.credentials[node])
         for attr in credential:
             if type(credential[attr]) in (str, unicode):
                 try:

confluent_server/confluent/plugins/hardwaremanagement/ipmi.py

@@ -217,6 +217,7 @@ class IpmiConsole(conapi.Console):
                 self.broken = True
                 self.error = data['error']
                 if self.connected:
+                    self.connected = False
                     self.datacallback(conapi.ConsoleEvent.Disconnect)
         else:
             self.datacallback(data)