Remove ucloud_common and put its files under ucloud.common subpackage.

Remove individual config.py used by every component and put them into single config.py ucloud/config.py
Use /etc/ucloud/ucloud.conf for Environment Variables
Refactoring and a lot of it
Make ucloud repo a package and different components of ucloud a subpackage for avoiding code duplication.
Improved logging.

api/helper.py

@@ -1,20 +1,20 @@
 import binascii
-import requests
+import ipaddress
 import random
 import subprocess as sp
-import ipaddress
 
-from decouple import config
+import requests
 from pyotp import TOTP
-from config import VM_POOL, etcd_client, IMAGE_PREFIX
+
+from config import vm_pool, env_vars
 
 
 def check_otp(name, realm, token):
     try:
         data = {
-            "auth_name": config("AUTH_NAME", ""),
-            "auth_token": TOTP(config("AUTH_SEED", "")).now(),
-            "auth_realm": config("AUTH_REALM", ""),
+            "auth_name": env_vars.get("AUTH_NAME"),
+            "auth_token": TOTP(env_vars.get("AUTH_SEED")).now(),
+            "auth_realm": env_vars.get("AUTH_REALM"),
             "name": name,
             "realm": realm,
             "token": token,
@@ -24,8 +24,8 @@ def check_otp(name, realm, token):
 
     response = requests.get(
         "{OTP_SERVER}{OTP_VERIFY_ENDPOINT}".format(
-            OTP_SERVER=config("OTP_SERVER", ""),
-            OTP_VERIFY_ENDPOINT=config("OTP_VERIFY_ENDPOINT", "verify"),
+            OTP_SERVER=env_vars.get("OTP_SERVER", ""),
+            OTP_VERIFY_ENDPOINT=env_vars.get("OTP_VERIFY_ENDPOINT", "verify"),
         ),
         json=data,
     )
@@ -41,7 +41,7 @@ def resolve_vm_name(name, owner):
     result = next(
         filter(
             lambda vm: vm.value["owner"] == owner and vm.value["name"] == name,
-            VM_POOL.vms,
+            vm_pool.vms,
         ),
         None,
     )
@@ -61,7 +61,7 @@ def resolve_image_name(name, etcd_client):
     """
 
     seperator = ":"
-    
+
     # Ensure, user/program passed valid name that is of type string
     try:
         store_name_and_image_name = name.split(seperator)
@@ -79,7 +79,7 @@ def resolve_image_name(name, etcd_client):
     except Exception:
         raise ValueError("Image name not in correct format i.e {store_name}:{image_name}")
 
-    images = etcd_client.get_prefix(IMAGE_PREFIX, value_in_json=True)
+    images = etcd_client.get_prefix(env_vars.get('IMAGE_PREFIX'), value_in_json=True)
 
     # Try to find image with name == image_name and store_name == store_name
     try:
@@ -89,7 +89,7 @@ def resolve_image_name(name, etcd_client):
         raise KeyError("No image with name {} found.".format(name))
     else:
         image_uuid = image.key.split('/')[-1]
-    
+
     return image_uuid
 
 
@@ -102,16 +102,16 @@ def generate_mac(uaa=False, multicast=False, oui=None, separator=':', byte_fmt='
     if oui:
         if type(oui) == str:
             oui = [int(chunk) for chunk in oui.split(separator)]
-        mac = oui + random_bytes(num=6-len(oui))
+        mac = oui + random_bytes(num=6 - len(oui))
     else:
         if multicast:
-            mac[0] |= 1 # set bit 0
+            mac[0] |= 1  # set bit 0
         else:
-            mac[0] &= ~1 # clear bit 0
+            mac[0] &= ~1  # clear bit 0
         if uaa:
-            mac[0] &= ~(1 << 1) # clear bit 1
+            mac[0] &= ~(1 << 1)  # clear bit 1
         else:
-            mac[0] |= 1 << 1 # set bit 1
+            mac[0] |= 1 << 1  # set bit 1
     return separator.join(byte_fmt % b for b in mac)
 
 
@@ -128,7 +128,7 @@ def get_ip_addr(mac_address, device):
           and is connected/neighbor of arg:device       
     """
     try:
-        output = sp.check_output(['ip','-6','neigh', 'show', 'dev', device], stderr=sp.PIPE)
+        output = sp.check_output(['ip', '-6', 'neigh', 'show', 'dev', device], stderr=sp.PIPE)
     except sp.CalledProcessError:
         return None
     else:
@@ -145,25 +145,6 @@ def get_ip_addr(mac_address, device):
         return result
 
 
-def increment_etcd_counter(etcd_client, key):
-    kv = etcd_client.get(key)
-    
-    if kv:
-        counter = int(kv.value)
-        counter = counter + 1
-    else:
-        counter = 1
-    
-    etcd_client.put(key, str(counter))
-    return counter
-
-
-def get_etcd_counter(etcd_client, key):
-    kv = etcd_client.get(key)
-    if kv:
-        return int(kv.value)
-    return None
-
 def mac2ipv6(mac, prefix):
     # only accept MACs separated by a colon
     parts = mac.split(":")
@@ -174,10 +155,10 @@ def mac2ipv6(mac, prefix):
     parts[0] = "%x" % (int(parts[0], 16) ^ 2)
 
     # format output
-    ipv6Parts = [str(0)]*4
+    ipv6Parts = [str(0)] * 4
     for i in range(0, len(parts), 2):
-        ipv6Parts.append("".join(parts[i:i+2]))
-    
+        ipv6Parts.append("".join(parts[i:i + 2]))
+
     lower_part = ipaddress.IPv6Address(":".join(ipv6Parts))
     prefix = ipaddress.IPv6Address(prefix)
     return str(prefix + int(lower_part))