fix string formatting + docker-compose networks

deli/counter/http/mounts/root/routes/compute/v1/images.py

@@ -48,8 +48,8 @@ def create(self):
             raise cherrypy.HTTPError(404, 'A region with the requested name does not exist.')
 
         if region.state != ResourceState.Created:
-            raise cherrypy.HTTPError(409, 'Can only create a image with a region in the following state: %s'.format(
-                ResourceState.Created))
+            raise cherrypy.HTTPError(409, 'Can only create a image with a region in the following state: {0}'.format(
+                ResourceState.Created.value))
 
         # TODO: check duplicate file name
 

deli/counter/http/mounts/root/routes/compute/v1/instance.py

@@ -57,8 +57,8 @@ def create(self):
         if region is None:
             raise cherrypy.HTTPError(404, 'A region with the requested name does not exist.')
         if region.state != ResourceState.Created:
-            raise cherrypy.HTTPError(400, 'Can only create a instance with a region in the following state: %s'.format(
-                ResourceState.Created))
+            raise cherrypy.HTTPError(400, 'Can only create a instance with a region in the following state: {0}'.format(
+                ResourceState.Created.value))
 
         zone = None
         if request.zone_name is not None:
@@ -69,17 +69,18 @@ def create(self):
                 raise cherrypy.HTTPError(409, 'The requested zone is not within the requested region')
             if zone.state != ResourceState.Created:
                 raise cherrypy.HTTPError(400,
-                                         'Can only create a instance with a zone in the following state: %s'.format(
-                                             ResourceState.Created))
+                                         'Can only create a instance with a zone in the following state: {0}'.format(
+                                             ResourceState.Created.value))
 
         network = Network.get(request.network_name)
         if network is None:
             raise cherrypy.HTTPError(404, 'A network with the requested name does not exist.')
         if network.region.name != region.name:
             raise cherrypy.HTTPError(409, 'The requested network is not within the requested region')
         if network.state != ResourceState.Created:
-            raise cherrypy.HTTPError(400, 'Can only create a instance with a network in the following state: %s'.format(
-                ResourceState.Created))
+            raise cherrypy.HTTPError(400,
+                                     'Can only create a instance with a network in the following state: {0}'.format(
+                                         ResourceState.Created.value))
 
         # TODO: User inputs image url instead of id
         # projectId/imageId
@@ -89,8 +90,8 @@ def create(self):
         if image.region.name != region.name:
             raise cherrypy.HTTPError(409, 'The requested image is not within the requested region')
         if image.state != ResourceState.Created:
-            raise cherrypy.HTTPError(400, 'Can only create a instance with a image in the following state: %s'.format(
-                ResourceState.Created))
+            raise cherrypy.HTTPError(400, 'Can only create a instance with a image in the following state: {0}'.format(
+                ResourceState.Created.value))
 
         flavor: Flavor = Flavor.get(request.flavor_name)
         if flavor is None:
@@ -101,15 +102,16 @@ def create(self):
             keypair = Keypair.get(project, keypair_name)
             if keypair is None:
                 raise cherrypy.HTTPError(404,
-                                         'A keypair with the requested name of %s does not exist.'.format(keypair_name))
+                                         'A keypair with the requested name of {0} does not exist.'.format(
+                                             keypair_name))
             keypairs.append(keypair)
 
         # TODO: User inputs service account email instead of id
         # Only project service accounts are allowed
         if request.service_account_name is not None:
             service_account = ProjectServiceAccount.get(project, request.service_account_name)
             if service_account is None:
-                raise cherrypy.HTTPError(404, 'A service account with the requested name of %s does not exist.'.format(
+                raise cherrypy.HTTPError(404, 'A service account with the requested name of {0} does not exist.'.format(
                     request.service_account_name))
         else:
             service_account = ProjectServiceAccount.get(project, 'default')

deli/counter/http/mounts/root/routes/compute/v1/networks.py

@@ -47,8 +47,8 @@ def create(self):
             raise cherrypy.HTTPError(404, 'A region with the requested name does not exist.')
 
         if region.state != ResourceState.Created:
-            raise cherrypy.HTTPError(409, 'Can only create a network with a region in the following state: %s'.format(
-                ResourceState.Created))
+            raise cherrypy.HTTPError(409, 'Can only create a network with a region in the following state: {0}'.format(
+                ResourceState.Created.value))
 
         network = Network()
         network.name = request.name

deli/counter/http/mounts/root/routes/compute/v1/volume.py

@@ -50,8 +50,8 @@ def create(self):
             raise cherrypy.HTTPError(404, 'A zone with the requested name does not exist.')
         if zone.state != ResourceState.Created:
             raise cherrypy.HTTPError(400,
-                                     'Can only create a volume with a zone in the following state: %s'.format(
-                                         ResourceState.Created))
+                                     'Can only create a volume with a zone in the following state: {0}'.format(
+                                         ResourceState.Created.value))
 
         quota: ProjectQuota = ProjectQuota.get(project.name)
         used_disk = quota.used_disk + request.size

deli/counter/http/mounts/root/routes/location/v1/zones.py

@@ -43,8 +43,8 @@ def create(self):
             raise cherrypy.HTTPError(404, 'A region with the requested name does not exist.')
 
         if region.state != ResourceState.Created:
-            raise cherrypy.HTTPError(400, 'Can only create a zone with a region in the following state: %s'.format(
-                ResourceState.Created))
+            raise cherrypy.HTTPError(400, 'Can only create a zone with a region in the following state: {0}'.format(
+                ResourceState.Created.value))
 
         zone = Zone()
         zone.name = request.name

deli/kubernetes/resources/model.py

@@ -175,7 +175,7 @@ def wait_for_crd(cls):
                     if cond.type == "NamesAccepted":
                         if cond.status == "False":
                             raise ValueError(
-                                "Failed to create CRD %s: name conflict: %s".format(name, cond.message))
+                                "Failed to create CRD {0}: name conflict: {1}".format(name, cond.message))
             except ApiException as e:
                 # If it doesn't exist just wait, k8s may be slow
                 if e.status != 404:
@@ -295,7 +295,7 @@ def project(self, value):
 
     def create(self):
         if self.project_name is None:
-            raise ValueError("Project must be set to create %s".format(self.__class__.__name__))
+            raise ValueError("Project must be set to create {0}".format(self.__class__.__name__))
 
         crd_api = client.CustomObjectsApi()
         self._raw = crd_api.create_namespaced_custom_object(GROUP, self.version(), "sandwich-" + self.project_name,

deli/kubernetes/resources/v1alpha1/instance/controller.py

@@ -94,7 +94,7 @@ def creating(self, model: Instance):
                 # old_vm = self.vmware.get_vm(vmware_client, str(model.vm_id), datacenter)
                 # if old_vm is not None:
                 #     self.logger.info(
-                #         "A backing for the vm %s / %s already exists so it is going to be deleted".format(
+                #         "A backing for the vm {0} / {1} already exists so it is going to be deleted".format(
                 #             model.project.name,
                 #             model.name))
                 #     self.vmware.power_off_vm(vmware_client, old_vm, hard=True)

docker-compose.yaml

@@ -40,6 +40,8 @@ services:
     image: redis:alpine
     ports:
       - "6379:6379"
+    networks:
+      - sandwich
 
 networks:
   sandwich:

docker/manager/.env-sample

@@ -19,6 +19,14 @@ VCENTER_PORT=
 VCENTER_USERNAME=
 VCENTER_PASSWORD=
 
+####################
+# REDIS            #
+####################
+
+# Redis URL to connect to
+# Used to cache various things
+REDIS_URL=
+
 ####################
 # Menu             #
 ####################