Add discovery handler for ThinkAgile storage

confluent_server/confluent/discovery/core.py

@@ -69,6 +69,7 @@ import confluent.discovery.protocols.slp as slp
 import confluent.discovery.handlers.imm as imm
 import confluent.discovery.handlers.pxe as pxeh
 import confluent.discovery.handlers.smm as smm
+import confluent.discovery.handlers.cpstorage as cpstorage
 import confluent.discovery.handlers.xcc as xcc
 import confluent.exceptions as exc
 import confluent.log as log
@@ -97,7 +98,7 @@ nodehandlers = {
     'service:management-hardware.Lenovo:lenovo-xclarity-controller': xcc,
     'service:management-hardware.IBM:integrated-management-module2': imm,
     'pxe-client': pxeh,
-    'service:io-device.Lenovo:management-module': None,
+    'service:io-device.Lenovo:management-module': cpstorage,
 }
 
 servicenames = {

confluent_server/confluent/discovery/handlers/bmc.py

@@ -26,13 +26,18 @@ ipmicommand.session.threading = eventlet.green.threading
 ipmicommand.session.socket.getaddrinfo = eventlet.support.greendns.getaddrinfo
 getaddrinfo = eventlet.support.greendns.getaddrinfo
 
-DEFAULT_USER = 'USERID'
-DEFAULT_PASS = 'PASSW0RD'
+
 
 
 class NodeHandler(generic.NodeHandler):
+    DEFAULT_USER = 'USERID'
+    DEFAULT_PASS = 'PASSW0RD'
 
-    def _get_ipmicmd(self, user=DEFAULT_USER, password=DEFAULT_PASS):
+    def _get_ipmicmd(self, user=None, password=None):
+        if user is None:
+            user = self.DEFAULT_USER
+        if password is None:
+            password = self.DEFAULT_PASS
         return ipmicommand.Command(self.ipaddr, user, password)
 
     def __init__(self, info, configmanager):
@@ -51,7 +56,7 @@ class NodeHandler(generic.NodeHandler):
         # between hypothetical secure path and today.
         try:
             ic = self._get_ipmicmd()
-            passwd = DEFAULT_PASS
+            passwd = self.DEFAULT_PASS
         except pygexc.IpmiException as pi:
             creds = self.configmanager.get_node_attributes(
                 nodename,
@@ -60,16 +65,16 @@ class NodeHandler(generic.NodeHandler):
             user = creds.get(nodename, {}).get(
                 'secret.hardwaremanagementuser', {}).get('value', None)
             havecustomcreds = False
-            if user is not None and user != DEFAULT_USER:
+            if user is not None and user != self.DEFAULT_USER:
                 havecustomcreds = True
             else:
-                user = DEFAULT_USER
+                user = self.DEFAULT_USER
             passwd = creds.get(nodename, {}).get(
                 'secret.hardwaremanagementpassword', {}).get('value', None)
-            if passwd is not None and passwd != DEFAULT_PASS:
+            if passwd is not None and passwd != self.DEFAULT_PASS:
                 havecustomcreds = True
             else:
-                passwd = DEFAULT_PASS
+                passwd = self.DEFAULT_PASS
             if havecustomcreds:
                 ic = self._get_ipmicmd(user, passwd)
             else:

confluent_server/confluent/discovery/handlers/cpstorage.py

@@ -0,0 +1,21 @@
+# Copyright 2019 Lenovo
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import confluent.discovery.handlers.bmc as bmchandler
+
+class NodeHandler(bmchandler.NodeHandler):
+    DEFAULT_USER = 'admin'
+    DEFAULT_PASS = 'admin'
+    devname = 'BMC'
+    maxmacs = 2

confluent_server/confluent/sockapi.py

@@ -148,9 +148,10 @@ def sessionhdl(connection, authname, skipauth=False, cert=None):
             tlvdata.send(
                 connection,
                 {'collective': {'error': 'Server either does not have '
-                                         'python-openssl installed or has an '
+                                         'python-pyopenssl installed or has an '
                                          'incorrect version installed '
-                                         '(e.g. pyOpenSSL)'}})
+                                         '(e.g. pyOpenSSL would need to be '
+                                         'replaced with python-pyopenssl)'}})
             return
         return collective.handle_connection(connection, None, request['collective'],
                                      local=True)