agent specific changes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

agent/bindir/cloud-guest-tool.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -78,7 +78,7 @@ class GuestCommand:
         info['network'] = 'guest-network-get-interfaces'
 
         result = dict()
-        for key, cmd in info.items():
+        for key, cmd in list(info.items()):
             result[key] = self.virt.agent_command(self.dom, cmd)
 
         return result, 0
@@ -110,10 +110,10 @@ def main(args):
         elif command == 'fstrim':
             result, code = guestcmd.fstrim()
 
-        print(json.dumps(result))
+        print((json.dumps(result)))
         sys.exit(code)
     except libvirt.libvirtError as exc:
-        print(json.dumps({'error': str(exc)}))
+        print((json.dumps({'error': str(exc)})))
         sys.exit(255)
 
 if __name__ == '__main__':

agent/bindir/cloud-setup-agent.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -31,56 +31,56 @@ from cloudutils.serviceConfig import configureLibvirtConfig
 from optparse import OptionParser
 
 def getUserInputs():
-    print "Welcome to the CloudStack Agent Setup:"
+    print("Welcome to the CloudStack Agent Setup:")
 
     cfo = configFileOps("@AGENTSYSCONFDIR@/agent.properties")
     oldMgt = cfo.getEntry("host")
 
-    mgtSvr = raw_input("Please input the Management Server Hostname/IP-Address:[%s]"%oldMgt)
+    mgtSvr = input("Please input the Management Server Hostname/IP-Address:[%s]"%oldMgt)
     if mgtSvr == "":
         mgtSvr = oldMgt
     try:
         socket.getaddrinfo(mgtSvr, 443)
     except:
-        print "Failed to resolve %s. Please input a valid hostname or IP-Address."%mgtSvr
+        print("Failed to resolve %s. Please input a valid hostname or IP-Address."%mgtSvr)
         exit(1)
 
     oldToken = cfo.getEntry("zone")
-    zoneToken = raw_input("Please input the Zone Id:[%s]"%oldToken)
+    zoneToken = input("Please input the Zone Id:[%s]"%oldToken)
 
     if zoneToken == "":
         zoneToken = oldToken
 
     oldPod = cfo.getEntry("pod")
-    podId = raw_input("Please input the Pod Id:[%s]"%oldPod)
+    podId = input("Please input the Pod Id:[%s]"%oldPod)
 
     if podId == "":
        podId  = oldToken
 
     oldCluster = cfo.getEntry("cluster")
-    clusterId = raw_input("Please input the Cluster Id:[%s]"%oldCluster)
+    clusterId = input("Please input the Cluster Id:[%s]"%oldCluster)
     if clusterId == "":
         clusterId = oldCluster
 
     oldHypervisor = cfo.getEntry("hypervisor")
     if oldHypervisor == "":
         oldHypervisor = "kvm"
 
-    hypervisor = raw_input("Please input the Hypervisor type kvm/lxc:[%s]"%oldHypervisor)
+    hypervisor = input("Please input the Hypervisor type kvm/lxc:[%s]"%oldHypervisor)
     if hypervisor == "":
         hypervisor = oldHypervisor
 
     try:
         defaultNic = networkConfig.getDefaultNetwork()
     except:
-        print "Failed to get default route. Please configure your network to have a default route"
+        print("Failed to get default route. Please configure your network to have a default route")
         exit(1)
 
     defNic = defaultNic.name
-    network = raw_input("Please choose which network used to create VM:[%s]"%defNic)
+    network = input("Please choose which network used to create VM:[%s]"%defNic)
     if network == "":
         if defNic == "":
-            print "You need to specifiy one of Nic or bridge on your system"
+            print("You need to specifiy one of Nic or bridge on your system")
             exit(1)
         elif network == "":
             network = defNic
@@ -115,7 +115,7 @@ if __name__ == '__main__':
 
     if not options.auto and options.secure:
         configureLibvirtConfig(True)
-        print "Libvirtd with TLS configured"
+        print("Libvirtd with TLS configured")
         sys.exit(0)
 
     if options.auto is None:
@@ -131,10 +131,10 @@ if __name__ == '__main__':
         if glbEnv.uuid == "":
             glbEnv.uuid = bash("uuidgen").getStdout()
     else:
-        for para, value in options.__dict__.items():
+        for para, value in list(options.__dict__.items()):
             if value is None:
-                print "Missing operand:%s"%para
-                print "Try %s --help for more information"%sys.argv[0]
+                print("Missing operand:%s"%para)
+                print("Try %s --help for more information"%sys.argv[0])
                 sys.exit(1)
 
         glbEnv.uuid = options.guid
@@ -149,14 +149,14 @@ if __name__ == '__main__':
 
     glbEnv.secure = options.secure
 
-    print "Starting to configure your system:"
+    print("Starting to configure your system:")
     syscfg = sysConfigFactory.getSysConfigFactory(glbEnv)
     try:
         syscfg.config()
-        print "CloudStack Agent setup is done!"
-    except (CloudRuntimeException,CloudInternalException), e:
-        print e
-        print "Try to restore your system:"
+        print("CloudStack Agent setup is done!")
+    except (CloudRuntimeException,CloudInternalException) as e:
+        print(e)
+        print("Try to restore your system:")
         try:
             syscfg.restore()
         except:

agent/bindir/cloudstack-agent-upgrade.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -25,13 +25,13 @@ def isOldStyleBridge(brName):
     else:
        return False
 def upgradeBridgeName(brName, enslavedDev):
-    print("upgrade bridge: %s, %s"%(brName, enslavedDev))
+    print(("upgrade bridge: %s, %s"%(brName, enslavedDev)))
     vlanId = brName.replace("cloudVirBr", "")
-    print("find vlan Id: %s"%vlanId)
+    print(("find vlan Id: %s"%vlanId))
     phyDev = enslavedDev.split(".")[0]
-    print("find physical device %s"%phyDev)
+    print(("find physical device %s"%phyDev))
     newBrName = "br" + phyDev + "-" + vlanId
-    print("new bridge name %s"%newBrName)
+    print(("new bridge name %s"%newBrName))
     bash("ip link set %s down"%brName) 
     bash("ip link set %s name %s"%(brName, newBrName))
     bash("ip link set %s up" %newBrName)
@@ -49,15 +49,15 @@ def upgradeBridgeName(brName, enslavedDev):
 if __name__ == '__main__':
    netlib = networkConfig() 
    bridges = netlib.listNetworks()
-   bridges = filter(isOldStyleBridge, bridges)
+   bridges = list(filter(isOldStyleBridge, bridges))
    for br in bridges:
        enslavedDev = netlib.getEnslavedDev(br, 1)
        if enslavedDev is not None:
            upgradeBridgeName(br, enslavedDev)
 
    bridges = netlib.listNetworks()
-   bridges = filter(isOldStyleBridge, bridges)
+   bridges = list(filter(isOldStyleBridge, bridges))
    if len(bridges) > 0:
-       print("Warning: upgrade is not finished, still some bridges have the old style name:" + str(bridges))
+       print(("Warning: upgrade is not finished, still some bridges have the old style name:" + str(bridges)))
    else:
        print("Upgrade succeed")

agent/bindir/libvirtqemuhook.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -32,7 +32,7 @@ logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log',
 logger = logging.getLogger('qemu-hook')
 
 customDir = "/etc/libvirt/hooks/custom"
-customDirPermissions = 0744
+customDirPermissions = 0o744
 timeoutSeconds = 10 * 60
 validQemuActions = ['prepare', 'start', 'started', 'stopped', 'release', 'migrate', 'restore', 'reconnect', 'attach']
 
@@ -76,7 +76,7 @@ def handleMigrateBegin():
                 continue
             newBrName = "br" + phyDev + "-" + vlanId
             source.setAttribute("bridge", newBrName)
-        print(domain.toxml())
+        print((domain.toxml()))
     except:
         pass
 
@@ -128,9 +128,8 @@ def terminateProcess(process, scriptName):
 
 
 def getCustomScriptsFromDirectory():
-    return sorted(filter(lambda fileName: (fileName is not None) & (fileName != "") & ('_' in fileName) &
-                                          (fileName.startswith((action + '_')) | fileName.startswith(('all' + '_'))),
-                         os.listdir(customDir)), key=lambda fileName: substringAfter(fileName, '_'))
+    return sorted([fileName for fileName in os.listdir(customDir) if (fileName is not None) & (fileName != "") & ('_' in fileName) &
+                                          (fileName.startswith((action + '_')) | fileName.startswith(('all' + '_')))], key=lambda fileName: substringAfter(fileName, '_'))
 
 
 def substringAfter(s, delimiter):

agent/bindir/rolling-maintenance.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

scripts/vm/network/security_group.py

@@ -148,7 +148,7 @@ def split_ips_by_family(ips):
 def destroy_network_rules_for_nic(vm_name, vm_ip, vm_mac, vif, sec_ips):
     try:
         rules = execute("""iptables-save -t filter | awk '/ %s / { sub(/-A/, "-D", $1) ; print }'""" % vif ).split("\n")
-        for rule in filter(None, rules):
+        for rule in [_f for _f in rules if _f]:
             try:
                 execute("iptables " + rule)
             except:
@@ -158,7 +158,7 @@ def destroy_network_rules_for_nic(vm_name, vm_ip, vm_mac, vif, sec_ips):
 
     try:
         dnats = execute("""iptables-save -t nat | awk '/ %s / { sub(/-A/, "-D", $1) ; print }'""" % vif ).split("\n")
-        for dnat in filter(None, dnats):
+        for dnat in [_f for _f in dnats if _f]:
             try:
                 execute("iptables -t nat " + dnat)
             except:
@@ -205,14 +205,14 @@ def destroy_network_rules_for_vm(vm_name, vif=None):
     destroy_ebtables_rules(vm_name, vif)
 
     chains = [vmchain_default, vmchain, vmchain_egress]
-    for chain in filter(None, chains):
+    for chain in [_f for _f in chains if _f]:
         try:
             execute("iptables -F " + chain)
             execute('ip6tables -F ' + chain)
         except:
             logging.debug("Ignoring failure to flush chain: " + chain)
 
-    for chain in filter(None, chains):
+    for chain in [_f for _f in chains if _f]:
         try:
             execute("iptables -X " + chain)
             execute('ip6tables -X ' + chain)
@@ -229,7 +229,7 @@ def destroy_network_rules_for_vm(vm_name, vif=None):
     if vif:
         try:
             dnats = execute("""iptables -t nat -S | awk '/%s/ { sub(/-A/, "-D", $1) ; print }'""" % vif ).split("\n")
-            for dnat in filter(None, dnats):
+            for dnat in [_f for _f in dnats if _f]:
                 try:
                     execute("iptables -t nat " + dnat)
                 except:
@@ -247,14 +247,14 @@ def destroy_ebtables_rules(vm_name, vif):
     delcmd = "ebtables -t nat -L PREROUTING | grep " + eb_vm_chain
     delcmds = []
     try:
-        delcmds = filter(None, execute(delcmd).split('\n'))
+        delcmds = [_f for _f in execute(delcmd).split('\n') if _f]
         delcmds = ["-D PREROUTING " + x for x in delcmds ]
     except:
         pass
     postcmds = []
     try:
         postcmd = "ebtables -t nat -L POSTROUTING | grep " + eb_vm_chain
-        postcmds = filter(None, execute(postcmd).split('\n'))
+        postcmds = [_f for _f in execute(postcmd).split('\n') if _f]
         postcmds = ["-D POSTROUTING " + x for x in postcmds]
     except:
         pass
@@ -493,7 +493,7 @@ def ebtables_rules_vmip (vmname, vmmac, ips, action):
     if action and action.strip() == "-A":
         action = "-I"
 
-    for ip in filter(None, ips):
+    for ip in [_f for _f in ips if _f]:
         logging.debug("ip = " + ip)
         if ip == 0 or ip == "0":
             continue
@@ -736,15 +736,15 @@ def delete_rules_for_vm_in_bridge_firewall_chain(vmName):
     vmchain = iptables_chain_name(vm_name)
 
     delcmd = """iptables-save | awk '/BF(.*)physdev-is-bridged(.*)%s/ { sub(/-A/, "-D", $1) ; print }'""" % vmchain
-    delcmds = filter(None, execute(delcmd).split('\n'))
+    delcmds = [_f for _f in execute(delcmd).split('\n') if _f]
     for cmd in delcmds:
         try:
             execute("iptables " + cmd)
         except:
               logging.exception("Ignoring failure to delete rules for vm " + vmName)
 
     delcmd = """ip6tables-save | awk '/BF(.*)physdev-is-bridged(.*)%s/ { sub(/-A/, "-D", $1) ; print }'""" % vmchain
-    delcmds = filter(None, execute(delcmd).split('\n'))
+    delcmds = [_f for _f in execute(delcmd).split('\n') if _f]
     for cmd in delcmds:
         try:
             execute('ip6tables ' + cmd)
@@ -847,7 +847,7 @@ def network_rules_for_rebooted_vm(vmName):
         ipts = []
         for cmd in [delcmd, inscmd]:
             logging.debug(cmd)
-            cmds = filter(None, execute(cmd).split('\n'))
+            cmds = [_f for _f in execute(cmd).split('\n') if _f]
             for c in cmds:
                     ipt = "iptables " + c
                     ipts.append(ipt)
@@ -882,7 +882,7 @@ def get_rule_logs_for_vms():
     except:
         logging.exception("Failed to get rule logs, better luck next time!")
 
-    print(";".join(result))
+    print((";".join(result)))
 
 
 def cleanup_rules_for_dead_vms():
@@ -897,7 +897,7 @@ def cleanup_bridge(bridge):
 
     # Delete iptables/bridge rules
     rules = execute("""iptables-save | grep %s | grep '^-A' | sed 's/-A/-D/' """ % bridge_name).split("\n")
-    for rule in filter(None, rules):
+    for rule in [_f for _f in rules if _f]:
         try:
             command = "iptables " + rule
             execute(command)
@@ -945,13 +945,13 @@ def cleanup_rules():
                     cleanup.append(vm_name)
 
         bridge_tables = execute("""grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//""").split('\n')
-        for table in filter(None, bridge_tables):
+        for table in [_f for _f in bridge_tables if _f]:
             chainscmd = """ebtables -t %s -L | awk '/chain:/ { gsub(/(^.*chain: |-(in|out|ips).*)/, ""); print $1}' | sort | uniq""" % table
             chains = execute(chainscmd).split('\n')
 
         logging.debug(" ebtables chains in the host: %s ", chains)
 
-        for chain in filter(None, chains):
+        for chain in [_f for _f in chains if _f]:
             if 1 in [chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-']]:
                 vm_name = chain
                 vmpresent = False
@@ -1421,7 +1421,7 @@ def verify_ipset_for_vm(vm_name, vm_id, vm_ips, vm_ip6):
                 found = True
                 break
         if not found:
-            print("vm ip %s is not found" % vm_ip)
+            print(("vm ip %s is not found" % vm_ip))
             return False
 
     rules = []
@@ -1435,7 +1435,7 @@ def verify_ipset_for_vm(vm_name, vm_id, vm_ips, vm_ip6):
                 found = True
                 break
         if not found:
-            print("vm ipv6 %s is not found" % vm_ip6)
+            print(("vm ipv6 %s is not found" % vm_ip6))
             return False
 
     return True
@@ -1574,7 +1574,7 @@ def verify_expected_rules_exist(expected_rules, rules):
                 found = True
                 break
         if not found:
-            print("Rule '%s' is not found" % expected_rule)
+            print(("Rule '%s' is not found" % expected_rule))
             return False
     return True
 
@@ -1585,7 +1585,7 @@ def verify_expected_rules_in_order(expected_rules, rules):
         if i < len(expected_rules) and rule == expected_rules[i]:
             i += 1
     if i != len(expected_rules):
-        print("Cannot find rule '%s'" % expected_rules[i])
+        print(("Cannot find rule '%s'" % expected_rules[i]))
         return False
     return True