Added --conf-dir, --etcd-{host,port,ca_cert,cert_cert,cert_key} parameters to cli and settings is now accessbile through uncloud.shared.shared.settings

uncloud/api/common_fields.py

@@ -1,7 +1,6 @@
 import os
 
 from uncloud.common.shared import shared
-from uncloud.common.settings import settings
 
 
 class Optional:
@@ -54,9 +53,7 @@ class VmUUIDField(Field):
 
     def vm_uuid_validation(self):
         r = shared.etcd_client.get(
-            os.path.join(settings["etcd"]["vm_prefix"], self.uuid)
+            os.path.join(shared.settings["etcd"]["vm_prefix"], self.uuid)
         )
         if not r:
-            self.add_error(
-                "VM with uuid {} does not exists".format(self.uuid)
-            )
+            self.add_error("VM with uuid {} does not exists".format(self.uuid))

uncloud/api/create_image_store.py

@@ -4,7 +4,6 @@ import os
 from uuid import uuid4
 
 from uncloud.common.shared import shared
-from uncloud.common.settings import settings
 
 data = {
     'is_public': True,
@@ -15,6 +14,6 @@ data = {
 }
 
 shared.etcd_client.put(
-    os.path.join(settings['etcd']['image_store_prefix'], uuid4().hex),
+    os.path.join(shared.settings['etcd']['image_store_prefix'], uuid4().hex),
     json.dumps(data),
 )

uncloud/api/helper.py

@@ -7,7 +7,6 @@ import requests
 from pyotp import TOTP
 
 from uncloud.common.shared import shared
-from uncloud.common.settings import settings
 
 logger = logging.getLogger(__name__)
 
@@ -15,9 +14,9 @@ logger = logging.getLogger(__name__)
 def check_otp(name, realm, token):
     try:
         data = {
-            "auth_name": settings["otp"]["auth_name"],
-            "auth_token": TOTP(settings["otp"]["auth_seed"]).now(),
-            "auth_realm": settings["otp"]["auth_realm"],
+            "auth_name": shared.settings["otp"]["auth_name"],
+            "auth_token": TOTP(shared.settings["otp"]["auth_seed"]).now(),
+            "auth_realm": shared.settings["otp"]["auth_realm"],
             "name": name,
             "realm": realm,
             "token": token,
@@ -25,13 +24,13 @@ def check_otp(name, realm, token):
     except binascii.Error as err:
         logger.error(
             "Cannot compute OTP for seed: {}".format(
-                settings["otp"]["auth_seed"]
+                shared.settings["otp"]["auth_seed"]
             )
         )
         return 400
 
     response = requests.post(
-        settings["otp"]["verification_controller_url"], json=data
+        shared.settings["otp"]["verification_controller_url"], json=data
     )
     return response.status_code
 
@@ -87,7 +86,7 @@ def resolve_image_name(name, etcd_client):
         )
 
     images = etcd_client.get_prefix(
-        settings["etcd"]["image_prefix"], value_in_json=True
+        shared.settings["etcd"]["image_prefix"], value_in_json=True
     )
 
     # Try to find image with name == image_name and store_name == store_name
@@ -111,9 +110,7 @@ def random_bytes(num=6):
     return [random.randrange(256) for _ in range(num)]
 
 
-def generate_mac(
-    uaa=False, multicast=False, oui=None, separator=":", byte_fmt="%02x"
-):
+def generate_mac(uaa=False, multicast=False, oui=None, separator=":", byte_fmt="%02x"):
     mac = random_bytes()
     if oui:
         if type(oui) == str:
@@ -148,3 +145,4 @@ def mac2ipv6(mac, prefix):
     lower_part = ipaddress.IPv6Address(":".join(ipv6_parts))
     prefix = ipaddress.IPv6Address(prefix)
     return str(prefix + int(lower_part))
+

uncloud/api/main.py

@@ -15,9 +15,8 @@ from uncloud.common.shared import shared
 from uncloud.common import counters
 from uncloud.common.vm import VMStatus
 from uncloud.common.request import RequestEntry, RequestType
-from uncloud.common.settings import settings
-from . import schemas
-from .helper import generate_mac, mac2ipv6
+from uncloud.api import schemas
+from uncloud.api.helper import generate_mac, mac2ipv6
 from uncloud import UncloudException
 
 logger = logging.getLogger(__name__)
@@ -50,7 +49,7 @@ class CreateVM(Resource):
         validator = schemas.CreateVMSchema(data)
         if validator.is_valid():
             vm_uuid = uuid4().hex
-            vm_key = join_path(settings['etcd']['vm_prefix'], vm_uuid)
+            vm_key = join_path(shared.settings['etcd']['vm_prefix'], vm_uuid)
             specs = {
                 'cpu': validator.specs['cpu'],
                 'ram': validator.specs['ram'],
@@ -60,7 +59,7 @@ class CreateVM(Resource):
             macs = [generate_mac() for _ in range(len(data['network']))]
             tap_ids = [
                 counters.increment_etcd_counter(
-                    shared.etcd_client, settings['etcd']['tap_counter']
+                    shared.etcd_client, shared.settings['etcd']['tap_counter']
                 )
                 for _ in range(len(data['network']))
             ]
@@ -84,7 +83,7 @@ class CreateVM(Resource):
             r = RequestEntry.from_scratch(
                 type=RequestType.ScheduleVM,
                 uuid=vm_uuid,
-                request_prefix=settings['etcd']['request_prefix'],
+                request_prefix=shared.settings['etcd']['request_prefix'],
             )
             shared.request_pool.put(r)
 
@@ -99,7 +98,7 @@ class VmStatus(Resource):
         validator = schemas.VMStatusSchema(data)
         if validator.is_valid():
             vm = shared.vm_pool.get(
-                join_path(settings['etcd']['vm_prefix'], data['uuid'])
+                join_path(shared.settings['etcd']['vm_prefix'], data['uuid'])
             )
             vm_value = vm.value.copy()
             vm_value['ip'] = []
@@ -107,7 +106,7 @@ class VmStatus(Resource):
                 network_name, mac, tap = network_mac_and_tap
                 network = shared.etcd_client.get(
                     join_path(
-                        settings['etcd']['network_prefix'],
+                        shared.settings['etcd']['network_prefix'],
                         data['name'],
                         network_name,
                     ),
@@ -130,7 +129,7 @@ class CreateImage(Resource):
         validator = schemas.CreateImageSchema(data)
         if validator.is_valid():
             file_entry = shared.etcd_client.get(
-                join_path(settings['etcd']['file_prefix'], data['uuid'])
+                join_path(shared.settings['etcd']['file_prefix'], data['uuid'])
             )
             file_entry_value = json.loads(file_entry.value)
 
@@ -144,7 +143,7 @@ class CreateImage(Resource):
             }
             shared.etcd_client.put(
                 join_path(
-                    settings['etcd']['image_prefix'], data['uuid']
+                    shared.settings['etcd']['image_prefix'], data['uuid']
                 ),
                 json.dumps(image_entry_json),
             )
@@ -157,7 +156,7 @@ class ListPublicImages(Resource):
     @staticmethod
     def get():
         images = shared.etcd_client.get_prefix(
-            settings['etcd']['image_prefix'], value_in_json=True
+            shared.settings['etcd']['image_prefix'], value_in_json=True
         )
         r = {'images': []}
         for image in images:
@@ -178,7 +177,7 @@ class VMAction(Resource):
 
         if validator.is_valid():
             vm_entry = shared.vm_pool.get(
-                join_path(settings['etcd']['vm_prefix'], data['uuid'])
+                join_path(shared.settings['etcd']['vm_prefix'], data['uuid'])
             )
             action = data['action']
 
@@ -208,7 +207,7 @@ class VMAction(Resource):
                 type='{}VM'.format(action.title()),
                 uuid=data['uuid'],
                 hostname=vm_entry.hostname,
-                request_prefix=settings['etcd']['request_prefix'],
+                request_prefix=shared.settings['etcd']['request_prefix'],
             )
             shared.request_pool.put(r)
             return (
@@ -231,10 +230,10 @@ class VMMigration(Resource):
                 type=RequestType.InitVMMigration,
                 uuid=vm.uuid,
                 hostname=join_path(
-                    settings['etcd']['host_prefix'],
+                    shared.settings['etcd']['host_prefix'],
                     validator.destination.value,
                 ),
-                request_prefix=settings['etcd']['request_prefix'],
+                request_prefix=shared.settings['etcd']['request_prefix'],
             )
 
             shared.request_pool.put(r)
@@ -254,7 +253,7 @@ class ListUserVM(Resource):
 
         if validator.is_valid():
             vms = shared.etcd_client.get_prefix(
-                settings['etcd']['vm_prefix'], value_in_json=True
+                shared.settings['etcd']['vm_prefix'], value_in_json=True
             )
             return_vms = []
             user_vms = filter(
@@ -287,7 +286,7 @@ class ListUserFiles(Resource):
 
         if validator.is_valid():
             files = shared.etcd_client.get_prefix(
-                settings['etcd']['file_prefix'], value_in_json=True
+                shared.settings['etcd']['file_prefix'], value_in_json=True
             )
             return_files = []
             user_files = [f for f in files if f.value['owner'] == data['name']]
@@ -312,7 +311,7 @@ class CreateHost(Resource):
         validator = schemas.CreateHostSchema(data)
         if validator.is_valid():
             host_key = join_path(
-                settings['etcd']['host_prefix'], uuid4().hex
+                shared.settings['etcd']['host_prefix'], uuid4().hex
             )
             host_entry = {
                 'specs': data['specs'],
@@ -354,7 +353,7 @@ class GetSSHKeys(Resource):
 
                 # {user_prefix}/{realm}/{name}/key/
                 etcd_key = join_path(
-                    settings['etcd']['user_prefix'],
+                    shared.settings['etcd']['user_prefix'],
                     data['realm'],
                     data['name'],
                     'key',
@@ -372,7 +371,7 @@ class GetSSHKeys(Resource):
 
                 # {user_prefix}/{realm}/{name}/key/{key_name}
                 etcd_key = join_path(
-                    settings['etcd']['user_prefix'],
+                    shared.settings['etcd']['user_prefix'],
                     data['realm'],
                     data['name'],
                     'key',
@@ -405,7 +404,7 @@ class AddSSHKey(Resource):
 
             # {user_prefix}/{realm}/{name}/key/{key_name}
             etcd_key = join_path(
-                settings['etcd']['user_prefix'],
+                shared.settings['etcd']['user_prefix'],
                 data['realm'],
                 data['name'],
                 'key',
@@ -439,7 +438,7 @@ class RemoveSSHKey(Resource):
 
             # {user_prefix}/{realm}/{name}/key/{key_name}
             etcd_key = join_path(
-                settings['etcd']['user_prefix'],
+                shared.settings['etcd']['user_prefix'],
                 data['realm'],
                 data['name'],
                 'key',
@@ -471,23 +470,23 @@ class CreateNetwork(Resource):
 
             network_entry = {
                 'id': counters.increment_etcd_counter(
-                    shared.etcd_client, settings['etcd']['vxlan_counter']
+                    shared.etcd_client, shared.settings['etcd']['vxlan_counter']
                 ),
                 'type': data['type'],
             }
             if validator.user.value:
                 try:
                     nb = pynetbox.api(
-                        url=settings['netbox']['url'],
-                        token=settings['netbox']['token'],
+                        url=shared.settings['netbox']['url'],
+                        token=shared.settings['netbox']['token'],
                     )
                     nb_prefix = nb.ipam.prefixes.get(
-                        prefix=settings['network']['prefix']
+                        prefix=shared.settings['network']['prefix']
                     )
                     prefix = nb_prefix.available_prefixes.create(
                         data={
                             'prefix_length': int(
-                                settings['network']['prefix_length']
+                                shared.settings['network']['prefix_length']
                             ),
                             'description': '{}\'s network "{}"'.format(
                                 data['name'], data['network_name']
@@ -506,7 +505,7 @@ class CreateNetwork(Resource):
                 network_entry['ipv6'] = 'fd00::/64'
 
             network_key = join_path(
-                settings['etcd']['network_prefix'],
+                shared.settings['etcd']['network_prefix'],
                 data['name'],
                 data['network_name'],
             )
@@ -526,7 +525,7 @@ class ListUserNetwork(Resource):
 
         if validator.is_valid():
             prefix = join_path(
-                settings['etcd']['network_prefix'], data['name']
+                shared.settings['etcd']['network_prefix'], data['name']
             )
             networks = shared.etcd_client.get_prefix(
                 prefix, value_in_json=True
@@ -570,7 +569,7 @@ def main(arguments):
     try:
         image_stores = list(
             shared.etcd_client.get_prefix(
-                settings['etcd']['image_store_prefix'], value_in_json=True
+                shared.settings['etcd']['image_store_prefix'], value_in_json=True
             )
         )
     except KeyError:
@@ -590,7 +589,7 @@ def main(arguments):
 
     #     shared.etcd_client.put(
     #         join_path(
-    #             settings['etcd']['image_store_prefix'], uuid4().hex
+    #             shared.settings['etcd']['image_store_prefix'], uuid4().hex
     #         ),
     #         json.dumps(data),
     #     )

uncloud/api/schemas.py

@@ -22,7 +22,6 @@ import bitmath
 from uncloud.common.host import HostStatus
 from uncloud.common.vm import VMStatus
 from uncloud.common.shared import shared
-from uncloud.common.settings import settings
 from . import helper, logger
 from .common_fields import Field, VmUUIDField
 from .helper import check_otp, resolve_vm_name
@@ -112,7 +111,7 @@ class CreateImageSchema(BaseSchema):
     def file_uuid_validation(self):
         file_entry = shared.etcd_client.get(
             os.path.join(
-                settings["etcd"]["file_prefix"], self.uuid.value
+                shared.shared.shared.shared.shared.settings["etcd"]["file_prefix"], self.uuid.value
             )
         )
         if file_entry is None:
@@ -125,7 +124,7 @@ class CreateImageSchema(BaseSchema):
     def image_store_name_validation(self):
         image_stores = list(
             shared.etcd_client.get_prefix(
-                settings["etcd"]["image_store_prefix"]
+                shared.shared.shared.shared.shared.settings["etcd"]["image_store_prefix"]
             )
         )
 
@@ -283,7 +282,7 @@ class CreateVMSchema(OTPSchema):
             for net in _network:
                 network = shared.etcd_client.get(
                     os.path.join(
-                        settings["etcd"]["network_prefix"],
+                        shared.shared.shared.shared.shared.settings["etcd"]["network_prefix"],
                         self.name.value,
                         net,
                     ),
@@ -488,7 +487,7 @@ class VmMigrationSchema(OTPSchema):
             self.add_error("Can't migrate non-running VM")
 
         if vm.hostname == os.path.join(
-            settings["etcd"]["host_prefix"], self.destination.value
+            shared.shared.shared.shared.shared.settings["etcd"]["host_prefix"], self.destination.value
         ):
             self.add_error(
                 "Destination host couldn't be same as Source Host"
@@ -539,9 +538,7 @@ class CreateNetwork(OTPSchema):
         super().__init__(data, fields=fields)
 
     def network_name_validation(self):
-        print(self.name.value, self.network_name.value)
-        key = os.path.join(settings["etcd"]["network_prefix"], self.name.value, self.network_name.value)
-        print(key)
+        key = os.path.join(shared.shared.shared.shared.shared.settings["etcd"]["network_prefix"], self.name.value, self.network_name.value)
         network = shared.etcd_client.get(key, value_in_json=True)
         if network:
             self.add_error(