Fix various issues in 3.0.0 release

If the kernel is new enough to do SKU, but the firmware doesn't have it,
fallback to model.

Fix outright mistakes in the config_port_tsm code

Up mac count from 2 to 3. If querying cumulus switches using SNMP
the switch will add its own mac to the list bringing the
total for a shared port to 3.

confluent_osdeploy/el8/profiles/default/scripts/configbmc

@@ -321,7 +321,9 @@ def main():
     vendor = open('/sys/devices/virtual/dmi/id/sys_vendor').read()
     vendor = vendor.strip()
     try:
-        model = open('/sys/devices/virtual/dmi/id/product_sku').read()
+        model = open('/sys/devices/virtual/dmi/id/product_sku').read().strip()
+        if model == 'none':
+            raise Exception('no sku')
     except Exception:
         model = open('/sys/devices/virtual/dmi/id/product_name').read()
     if vendor in ('Lenovo', 'IBM'):

confluent_osdeploy/genesis/profiles/default/scripts/configbmc

@@ -169,6 +169,7 @@ def set_port_tsm(s, port, model):
         raise Exception("Unsupported port for TSM")
     timer = 15
     while timer:
+        timer = timer - 1
         time.sleep(1.0)
         sys.stdout.write('.')
         sys.stdout.flush()
@@ -178,7 +179,7 @@ def set_port_tsm(s, port, model):
     elif port == 'dedicated':
         iface = 1
         s.raw_command(0x32, 0x71, b'\x00\x01\x03')
-    rsp = s.raw_command(0x32, 0x72, bytearray(4, iface, 0))
+    rsp = s.raw_command(0x32, 0x72, bytearray([4, iface, 0]))
     print('Complete')
     return int(rsp['data'][0])
 
@@ -321,7 +322,9 @@ def main():
     vendor = open('/sys/devices/virtual/dmi/id/sys_vendor').read()
     vendor = vendor.strip()
     try:
-        model = open('/sys/devices/virtual/dmi/id/product_sku').read()
+        model = open('/sys/devices/virtual/dmi/id/product_sku').read().strip()
+        if model == 'none':
+            raise Exception('No SKU')
     except Exception:
         model = open('/sys/devices/virtual/dmi/id/product_name').read()
     if vendor in ('Lenovo', 'IBM'):

confluent_server/bin/osdeploy

@@ -114,7 +114,7 @@ def local_node_trust_setup():
         'IgnoreRhosts no'])
     if domain and not myname.endswith(domain):
         myprincipals.add('{0}.{1}'.format(myname, domain))
-    if '.' in myname and myname.endswith(domain):
+    if domain and '.' in myname and myname.endswith(domain):
         myprincipals.add(myname.split('.')[0])
     for pubkey in glob.glob('/etc/ssh/ssh_host_*_key.pub'):
         currpubkey = open(pubkey, 'rb').read()

confluent_server/confluent/discovery/handlers/generic.py

@@ -21,7 +21,7 @@ class NodeHandler(object):
     https_supported = True
     is_enclosure = False
     devname = ''
-    maxmacs = 2  # reasonable default, allowing for common scenario of
+    maxmacs = 3  # reasonable default, allowing for common scenario of
                  # shared nic in theory, but blocking enclosure managers
                  # and uplink ports
 
@@ -122,4 +122,4 @@ class NodeHandler(object):
         except Exception:
             self._certfailreason = 2
             return None
-        return self._fp
+        return self._fp