Simple fixes and code formatting

Author: GabrielBrascher

engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java

@@ -18,6 +18,8 @@
 
 import java.util.List;
 
+import org.apache.cloudstack.framework.config.ConfigKey;
+
 import com.cloud.deploy.DeploymentPlanner;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
@@ -28,6 +30,9 @@
  * HighAvailabilityManager checks to make sure the VMs are running fine.
  */
 public interface HighAvailabilityManager extends Manager {
+
+    ConfigKey<Long> TimeToSleep = new ConfigKey<>("Advanced", Long.class, "time.to.sleep", "60", "Time in seconds to sleep if no work items are found.", false, null);
+
     public enum WorkType {
         Migration,  // Migrating VMs off of a host.
         Stop,       // Stops a VM for storage pool migration purposes.  This should be obsolete now.

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

@@ -21,9 +21,14 @@
 import os
 import re
 import sys
-import urllib.request, urllib.parse, urllib.error
 import time
 
+# import urllib.request
+# import urllib.parse
+# import urllib.error
+from urllib.parse import urlparse
+from urlib import request
+
 from collections import OrderedDict
 from fcntl import flock, LOCK_EX, LOCK_UN
 
@@ -68,7 +73,7 @@ def __update(self, vm_ip, password):
                 data = urllib.parse.urlencode(payload)
                 request = urllib.request.Request(url, data=data, headers={"DomU_Request": "save_password"})
                 try:
-                    resp = urllib.request.urlopen(request, data)
+                    resp = urllib.urlopen(request, data)
                     logging.debug("Update password server result: http:%s, content:%s" % (resp.code, resp.read()))
                 except Exception as e:
                     logging.error("Failed to update password server due to: %s" % e)

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

@@ -180,7 +180,7 @@ def add(self, entry):
             self.dhcp_opts.add("%s,%s" % (tag, 6))
             self.dhcp_opts.add("%s,%s" % (tag, 15))
 
-        i = IPAddress(entry['ipv4_address'])
+        i = ip_address(entry['ipv4_address'])
         # Calculate the device
         for v in self.devinfo:
             if i > v['network'].network and i < v['network'].broadcast:

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

@@ -17,15 +17,14 @@
 # under the License.
 """ General helper functions
 for use in the configuration process
-
 """
 import subprocess
 import logging
 import sys
 import os.path
 import re
 import shutil
-from ipaddress import *
+from netaddr import *
 
 PUBLIC_INTERFACES = {"router": "eth2", "vpcrouter": "eth1"}
 

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

@@ -19,6 +19,7 @@
 from .CsDatabag import CsCmdLine
 import logging
 
+
 class CsChain(object):
 
     def __init__(self):

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

@@ -18,6 +18,7 @@
 import logging
 from ipaddress import *
 
+
 def merge(dbag, data):
     # A duplicate ip address wil clobber the old value
     # This seems desirable ....

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

@@ -51,10 +51,10 @@ def merge(dbag, ip):
         if mac_address in device_map:
             nic_dev_id = device_map[mac_address]
     ip['device'] = 'eth' + str(nic_dev_id)
-    ip['broadcast'] = str(ipo.broadcast)
-    ip['cidr'] = str(ipo.ip) + '/' + str(ipo.prefixlen)
+    ip['broadcast'] = str(ipo.broadcast_address)
+    ip['cidr'] = str(ipo.network_address) + '/' + str(ipo.prefixlen)
     ip['size'] = str(ipo.prefixlen)
-    ip['network'] = str(ipo.network) + '/' + str(ipo.prefixlen)
+    ip['network'] = str(ipo.network_address) + '/' + str(ipo.prefixlen)
     if 'nw_type' not in list(ip.keys()):
         ip['nw_type'] = 'public'
     else:

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

@@ -17,6 +17,7 @@
 
 from ipaddress import *
 
+
 def merge(dbag, data):
 
     if "config" in data:

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

@@ -17,6 +17,7 @@
 
 from ipaddress import *
 
+
 def merge(dbag, data):
     dbag[data['device']] = data
     return dbag

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

@@ -17,6 +17,7 @@
 
 from ipaddress import *
 
+
 def merge(dbag, data):
     """
     create a dictionary of values new in data ignoring those in dbag and return it