Fix confignet for python2

Some python 3 exclusive assumptions were made.
Unfortunately, EL7 is python2
centric.

confluent_osdeploy/common/initramfs/opt/confluent/bin/apiclient

@@ -20,9 +20,9 @@ class InvalidApiKey(Exception):
 
 cryptname = ctypes.util.find_library('crypt')
 if not cryptname:
-    if os.path.exists('/usr/lib64/libcrypt.so.1'):
+    if os.path.exists('/lib64/libcrypt.so.1'):
         cryptname = 'libcrypt.so.1'
-    elif os.path.exists('/usr/lib64/libcrypt.so.2'):
+    elif os.path.exists('/lib64/libcrypt.so.2'):
         cryptname = 'libcrypt.so.2'
 c_libcrypt = ctypes.CDLL(cryptname)
 c_crypt = c_libcrypt.crypt
@@ -55,10 +55,10 @@ def get_my_addresses():
                     rta = v[nlhdrsz+ifaddrsz:length]
                     while len(rta):
                         rtalen, rtatyp = struct.unpack('HH', rta[:4])
+                        if rtalen < 4:
+                            break
                         if rtatyp == 1:
                             addrs.append((fam, rta[4:rtalen], plen, ridx))
-                        if not rtalen:
-                            break
                         rta = rta[rtalen:]
             v = v[length:]
     return addrs
@@ -93,14 +93,20 @@ def scan_confluents():
         if addr[0] == socket.AF_INET6:
             if addr[-1] in doneidxs:
                 continue
-            s6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, addr[-1])
+            try:
+                s6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, addr[-1])
+            except TypeError:
+                s6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, addr[-1].tobytes())
             try:
                 s6.sendto(msg, ('ff02::c', 1900))
             except OSError:
                 pass
             doneidxs.add(addr[-1])
         elif addr[0] == socket.AF_INET:
-            s4.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, addr[1])
+            try:
+                s4.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, addr[1])
+            except TypeError:
+                s4.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, addr[1].tobytes())
             try:
                 s4.sendto(msg, ('239.255.255.250', 1900))
             except OSError:
@@ -138,7 +144,7 @@ def get_net_apikey(nodename, mgr):
     newpass = newpass.encode('utf8')
     salt = salt.encode('utf8')
     crypted = c_crypt(newpass, salt)
-    for addrinfo in socket.getaddrinfo(mgr, 13001, type=socket.SOCK_STREAM):
+    for addrinfo in socket.getaddrinfo(mgr, 13001, 0, socket.SOCK_STREAM):
         try:
             clisock = socket.socket(addrinfo[0], addrinfo[1])
             clisock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

confluent_osdeploy/common/profile/scripts/confignet

@@ -8,11 +8,17 @@ import sys
 import time
 import shlex
 import subprocess
-from importlib.machinery import SourceFileLoader
 try:
-    apiclient = SourceFileLoader('apiclient', '/opt/confluent/bin/apiclient').load_module()
-except FileNotFoundError:
-    apiclient = SourceFileLoader('apiclient', '/etc/confluent/apiclient').load_module()
+    from importlib.machinery import SourceFileLoader
+    def load_source(mod, path):
+        return SourceFileLoader(mod, path).load_module()
+except ImportError:
+    from imp import load_source
+
+try:
+    apiclient = load_source('apiclient', '/opt/confluent/bin/apiclient')
+except IOError:
+    apiclient = load_source('apiclient', '/etc/confluent/apiclient')
 
 def add_lla(iface, mac):
     pieces = mac.split(':')
@@ -311,7 +317,7 @@ if __name__ == '__main__':
             myname = myname[0]
             myname = socket.inet_pton(socket.AF_INET, myname)
             for addr in myaddrs:
-                if myname == bytes(addr[1]):
+                if myname == addr[1].tobytes():
                     curridx = addr[-1]
         if curridx in doneidxs:
             continue

confluent_osdeploy/el7/profiles/default/scripts/configbmc

@@ -267,7 +267,7 @@ def get_lan_channel(s):
         medtype = int(rsp[1]) & 0b1111111
         if medtype not in (4, 6):
             continue
-        rsp = s.raw_command(0xc, 2, bytearray([2, chan, 5, 0, 0]))
+        rsp = s.raw_command(0xc, 2, bytearray([chan, 5, 0, 0]))
         if rsp.get('code', 1) == 0:
             return chan
     return 1

confluent_osdeploy/el8/profiles/default/scripts/configbmc

@@ -267,7 +267,7 @@ def get_lan_channel(s):
         medtype = int(rsp[1]) & 0b1111111
         if medtype not in (4, 6):
             continue
-        rsp = s.raw_command(0xc, 2, bytearray([2, chan, 5, 0, 0]))
+        rsp = s.raw_command(0xc, 2, bytearray([chan, 5, 0, 0]))
         if rsp.get('code', 1) == 0:
             return chan
     return 1

confluent_osdeploy/genesis/profiles/default/scripts/configbmc

@@ -165,9 +165,18 @@ def set_port(s, port, vendor, model):
         return 1
 
 
-def get_remote_config_mod(vendor, model):
+def get_remote_config_mod(vendor, model, waiters):
     if vendor in ('IBM', 'Lenovo'):
         if _is_tsm(model):
+            for waiter in waiters:
+                if waiter:
+                    sys.stdout.write('Waiting for TSM network to activate')
+                    for x in range(0, 90):
+                        sys.stdout.write('.')
+                        sys.stdout.flush()
+                        time.sleep(1)
+                    sys.stdout.write('Complete\n')
+                    break
             return 'tsm'
         else:
             return 'xcc'
@@ -275,7 +284,7 @@ def get_lan_channel(s):
         medtype = int(rsp[1]) & 0b1111111
         if medtype not in (4, 6):
             continue
-        rsp = s.raw_command(0xc, 2, bytearray([2, chan, 5, 0, 0]))
+        rsp = s.raw_command(0xc, 2, bytearray([chan, 5, 0, 0]))
         if rsp.get('code', 1) == 0:
             return chan
     return 1
@@ -415,7 +424,7 @@ def main():
         dotwait()
     sys.stdout.write('done\n')
     sys.stdout.flush()
-    cfgmod = get_remote_config_mod(vendor, model)
+    cfgmod = get_remote_config_mod(vendor, model, (awaitip, awaitvlan, awaitprefix, awaitgw))
     if cfgmod:
         with open('configbmc.configmod', 'w+') as cm:
             cm.write('configmod: {0}\n'.format(cfgmod))

confluent_server/bin/osdeploy

@@ -364,7 +364,7 @@ def oslist():
     print("Distributions:")
     for rsp in c.read('/deployment/distributions'):
         if 'error' in rsp:
-            sys.stderr.write(res['error'] + '\n')
+            sys.stderr.write(rsp['error'] + '\n')
             exitcode = 1
         else:
             print("  " + rsp['item']['href'].replace('/', ''))
@@ -373,7 +373,7 @@ def oslist():
     print("Profiles:")
     for rsp in c.read('/deployment/profiles'):
         if 'error' in rsp:
-            sys.stderr.write(res['error'] + '\n')
+            sys.stderr.write(rsp['error'] + '\n')
             exitcode = 1
         else:
             print("  " + rsp['item']['href'].replace('/', ''))

confluent_server/confluent/discovery/protocols/slp.py

@@ -112,7 +112,10 @@ def _parse_slp_packet(packet, peer, rsps, xidmap, defer=None, sock=None):
             identifier = addr
         else:
             probepeer = (peer[0], struct.unpack('H', os.urandom(2))[0] | 1025) + peer[2:]
-            sock.sendto(b'\x00', probepeer)
+            try:
+                sock.sendto(b'\x00', probepeer)
+            except Exception:
+                return
             defer.append((packet, peer))
             return
     if (identifier, parsed['xid']) in rsps:
@@ -487,7 +490,10 @@ def snoop(handler, protocol=None):
                     mac = neighutil.get_hwaddr(peer[0])
                     if not mac:
                         probepeer = (peer[0], struct.unpack('H', os.urandom(2))[0] | 1025) + peer[2:]
-                        s.sendto(b'\x00', probepeer)
+                        try:
+                            s.sendto(b'\x00', probepeer)
+                        except Exception:
+                            continue
                         deferpeers.append(peer)
                         continue
                     process_peer(newmacs, known_peers, peerbymacaddress, peer)

confluent_server/confluent/discovery/protocols/ssdp.py

@@ -167,7 +167,10 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
                             continue
                         mac = neighutil.get_hwaddr(peer[0])
                         if not mac:
-                            s.sendto(b'\x00', peer)
+                            try:
+                                s.sendto(b'\x00', peer)
+                            except Exception:
+                                continue
                             deferrednotifies.append((peer, rsp))
                             continue
                         _process_snoop(peer, rsp, mac, known_peers, newmacs, peerbymacaddress, byehandler, machandlers)
@@ -311,8 +314,11 @@ def _find_service(service, target):
         for s in r:
             (rsp, peer) = s.recvfrom(9000)
             if not neighutil.get_hwaddr(peer[0]):
+                try:
+                    s.sendto(b'\x00', peer)
+                except Exception:
+                    continue
                 deferparse.append((rsp, peer))
-                s.sendto(b'\x00', peer)
                 continue
             _parse_ssdp(peer, rsp, peerdata)
         timeout = deadline - util.monotonic_time()

confluent_server/confluent/netutil.py

@@ -398,15 +398,18 @@ def get_nic_config(configmanager, node, ip=None, mac=None, ifidx=None,
         foundaddr = False
         candgws = []
         candsrvs = []
+        bestsrvbyfam = {}
         for myaddr in myaddrs:
             fam, svrip, prefix = myaddr[:3]
             candsrvs.append((fam, svrip, prefix))
             if fam == socket.AF_INET:
-                cfgdata['deploy_server'] = socket.inet_ntop(socket.AF_INET, svrip)
                 nver = '4'
+                srvkey = 'deploy_server'
             elif fam == socket.AF_INET6:
-                cfgdata['deploy_server_v6'] = socket.inet_ntop(socket.AF_INET6, svrip)
                 nver = '6'
+                srvkey = 'deploy_server_v6'
+            if fam not in bestsrvbyfam:
+                cfgdata[srvkey] = socket.inet_ntop(fam, svrip)
             for candidate in cfgbyname:
                 ipmethod = cfgbyname[candidate].get('ipv{}_method'.format(nver), 'static')
                 if ipmethod == 'dhcp':
@@ -425,6 +428,7 @@ def get_nic_config(configmanager, node, ip=None, mac=None, ifidx=None,
                         for inf in socket.getaddrinfo(candip, 0, fam, socket.SOCK_STREAM):
                             candipn = socket.inet_pton(fam, inf[-1][0])
                         if ipn_on_same_subnet(fam, svrip, candipn, prefix):
+                            bestsrvbyfam[fam] = svrip
                             cfgdata['ipv{}_address'.format(nver)] = candip
                             cfgdata['ipv{}_method'.format(nver)] = ipmethod
                             cfgdata['ipv{}_gateway'.format(nver)] = cfgbyname[candidate].get(
@@ -563,6 +567,8 @@ def get_my_addresses(idx=0, family=0, matchlla=None):
                         rta = v[nlhdrsz+ifaddrsz:length]
                         while len(rta):
                             rtalen, rtatyp = struct.unpack('HH', rta[:4])
+                            if rtalen < 4:
+                                break
                             if rta[4:rtalen].tobytes() == matchlla:
                                 return get_my_addresses(idx=ridx)
                             rta = rta[rtalen:]
@@ -570,10 +576,10 @@ def get_my_addresses(idx=0, family=0, matchlla=None):
                     rta = v[nlhdrsz+ifaddrsz:length]
                     while len(rta):
                         rtalen, rtatyp = struct.unpack('HH', rta[:4])
+                        if rtalen < 4:
+                            break
                         if rtatyp == 1:
                             addrs.append((fam, rta[4:rtalen].tobytes(), plen, ridx))
-                        if not rtalen:
-                            break
                         rta = rta[rtalen:]
             v = v[length:]
     return addrs