pylint issues

Author: Daan Hoogland

systemvm/debian/opt/cloud/bin/baremetal-vr.py

@@ -16,7 +16,7 @@
 #under the License.
 
 import subprocess
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import hmac
 import hashlib
 import base64
@@ -131,10 +131,10 @@ def _make_sign(self, mac):
             "mac": mac
         }
 
-        request = zip(reqs.keys(), reqs.values())
+        request = list(zip(list(reqs.keys()), list(reqs.values())))
         request.sort(key=lambda x: str.lower(x[0]))
-        hashStr = "&".join(["=".join([str.lower(r[0]), str.lower(urllib.quote_plus(str(r[1]))).replace("+", "%20").replace('=', '%3d')]) for r in request])
-        sig = urllib.quote_plus(base64.encodestring(hmac.new(secretkey, hashStr, hashlib.sha1).digest()).strip())
+        hashStr = "&".join(["=".join([str.lower(r[0]), str.lower(urllib.parse.quote_plus(str(r[1]))).replace("+", "%20").replace('=', '%3d')]) for r in request])
+        sig = urllib.parse.quote_plus(base64.encodebytes(hmac.new(secretkey, hashStr, hashlib.sha1).digest()).strip())
         return sig
 
     def notify_provisioning_done(self, mac):

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

@@ -54,7 +54,7 @@ def merge(dbag, ip):
     ip['broadcast'] = str(ipo.broadcast_address)
     ip['cidr'] = str(ipo.network_address) + '/' + str(ipo.prefixlen)
     ip['size'] = str(ipo.prefixlen)
-    ip['network'] = str(ipo.ip_network)
+    ip['network'] = str(ipo.compressed)
     if 'nw_type' not in list(ip.keys()):
         ip['nw_type'] = 'public'
     else:

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

@@ -28,17 +28,17 @@ def check_filesystem():
     readOnly1 = bool(stat1.f_flag & ST_RDONLY)
 
     if (readOnly1):
-        print "Read-only file system : monitor results (/root) file system is mounted as read-only"
+        print("Read-only file system : monitor results (/root) file system is mounted as read-only")
         exit(1)
 
     stat2 = os.statvfs('/var/cache/cloud')
     readOnly2 = bool(stat2.f_flag & ST_RDONLY)
 
     if (readOnly2):
-        print "Read-only file system : config info (/var/cache/cloud) file system is mounted as read-only"
+        print("Read-only file system : config info (/var/cache/cloud) file system is mounted as read-only")
         exit(1)
 
-    print "file system is writable"
+    print("file system is writable")
     exit(0)
 
 

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

@@ -97,7 +97,7 @@ def process(self):
             self.db.setKey("forwardingrules")
         else:
             self.db.setKey(self.qFile.type)
-        dbag = self.db.load()
+        self.db.load()
         logging.info("Command of type %s received", self.qFile.type)
 
         if self.qFile.type == 'ips':