Fix Python code checkstyle execute by "systemvm\test\runtests.sh" (#2576)

* dependencies update

* Add extra blank line required by ...!?

* fix W605 invalid escape sequence and more blank lines

* print all installed python packages versions

Author: rafaelweingartner

systemvm/debian/opt/cloud/bin/configure.py

@@ -196,18 +196,18 @@ def add_rule(self):
                 egressIpsetStr = ''
                 if sflag and dflag:
                     egressIpsetStr = " -m set --match-set %s src " % sourceIpsetName + \
-                                " -m set --match-set %s dst " % destIpsetName
+                                     " -m set --match-set %s dst " % destIpsetName
                 elif sflag:
                     egressIpsetStr = " -m set --match-set %s src " % sourceIpsetName
                 elif dflag:
                     egressIpsetStr = " -m set --match-set %s dst " % destIpsetName
 
                 if rule['protocol'] == "icmp":
                     fwr += egressIpsetStr + " -p %s " % rule['protocol'] + " -m %s " % rule['protocol'] + \
-                                    " --icmp-type %s" % icmp_type
+                                     " --icmp-type %s" % icmp_type
                 elif rule['protocol'] != "all":
                     fwr += egressIpsetStr + " -p %s " % rule['protocol'] + " -m %s " % rule['protocol'] + \
-                           " %s" % rnge
+                                     " %s" % rnge
                 elif rule['protocol'] == "all":
                     fwr += egressIpsetStr
 
@@ -1052,5 +1052,6 @@ def execIptables(config):
     red.set()
     return 0
 
+
 if __name__ == "__main__":
     main(sys.argv)

systemvm/debian/opt/cloud/bin/cs/CsProcess.py

@@ -42,10 +42,10 @@ def find_pid(self):
         self.pid = []
         for i in CsHelper.execute("ps aux"):
             items = len(self.search)
-            proc = re.split("\s+", i)[items*-1:]
+            proc = re.split(r"\s+", i)[items*-1:]
             matches = len([m for m in proc if m in self.search])
             if matches == items:
-                self.pid.append(re.split("\s+", i)[1])
+                self.pid.append(re.split(r"\s+", i)[1])
 
         logging.debug("CsProcess:: Searching for process ==> %s and found PIDs ==> %s", self.search, self.pid)
         return self.pid
@@ -61,5 +61,5 @@ def kill(self, pid):
     def grep(self, str):
         for i in CsHelper.execute("ps aux"):
             if i.find(str) != -1:
-                return re.split("\s+", i)[1]
+                return re.split(r"\s+", i)[1]
         return -1

systemvm/debian/opt/cloud/bin/cs/CsRedundant.py

@@ -127,7 +127,7 @@ def _redundant_on(self):
             "%s/%s" % (self.CS_TEMPLATES_DIR, "checkrouter.sh.templ"), "/opt/cloud/bin/checkrouter.sh")
 
         CsHelper.execute(
-            'sed -i "s/--exec\ \$DAEMON;/--exec\ \$DAEMON\ --\ --vrrp;/g" /etc/init.d/keepalived')
+            'sed -i "s/--exec $DAEMON;/--exec $DAEMON -- --vrrp;/g" /etc/init.d/keepalived')
         # checkrouter.sh configuration
         check_router = CsFile("/opt/cloud/bin/checkrouter.sh")
         check_router.greplace("[RROUTER_LOG]", self.RROUTER_LOG)
@@ -319,7 +319,7 @@ def set_master(self):
                     logging.info("Adding gateway ==> %s to device ==> %s" % (gateway, dev))
                     if dev == CsHelper.PUBLIC_INTERFACES[self.cl.get_type()]:
                         route.add_defaultroute(gateway)
-                except:
+                except Exception:
                     logging.error("ERROR getting gateway from device %s" % dev)
             else:
                 logging.error("Device %s was not ready could not bring it up" % dev)

systemvm/debian/opt/cloud/bin/line_edit.py

@@ -193,6 +193,7 @@ def commit(self):
                 os.unlink(changed_filename)
         return changes
 
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
     import doctest

systemvm/debian/opt/cloud/bin/update_config.py

@@ -112,6 +112,7 @@ def is_guestnet_configured(guestnet_dict, keys):
 
     return exists
 
+
 # If the command line json file is unprocessed process it
 # This is important or, the control interfaces will get deleted!
 if jsonFilename != "cmd_line.json" and os.path.isfile(jsonPath % "cmd_line.json"):

systemvm/debian/opt/cloud/bin/vmdata.py

@@ -164,5 +164,6 @@ def unflock(file):
         sys.exit(1)
     return True
 
+
 if __name__ == "__main__":
     main(sys.argv[1:])

systemvm/test/TestCsAddress.py

@@ -38,5 +38,6 @@ def test_get_guest_ip(self):
     def test_get_guest_netmask(self):
         self.assertTrue(self.csaddress.get_guest_netmask() == "255.255.255.0")
 
+
 if __name__ == '__main__':
     unittest.main()

systemvm/test/TestCsApp.py

@@ -34,5 +34,6 @@ def test_init(self):
         csapp = CsApp(csip)
         self.assertTrue(csapp is not None)
 
+
 if __name__ == '__main__':
     unittest.main()

systemvm/test/TestCsCmdLine.py

@@ -42,5 +42,6 @@ def test_get_guest_gw(self):
         self.cscmdline.set_guest_gw(tval)
         self.assertTrue(self.cscmdline.get_guest_gw() == tval)
 
+
 if __name__ == '__main__':
     unittest.main()

systemvm/test/TestCsConfig.py

@@ -29,5 +29,6 @@ def test_ini(self):
         csconfig = CsConfig()
         self.assertTrue(csconfig is not None)
 
+
 if __name__ == '__main__':
     unittest.main()