Merge pull request #8 from sandwichcloud/fixinstancetoimage

fix converting instances to images

Author: rmb938

deli_counter/http/mounts/root/mount.py

@@ -33,7 +33,6 @@ def validate_token(self):
 
         fernets = []
         for key in settings.AUTH_FERNET_KEYS:
-            self.logger.info("FK: " + key)
             fernets.append(Fernet(key))
         fernet = MultiFernet(fernets)
 

deli_counter/http/mounts/root/routes/v1/images.py

@@ -33,8 +33,17 @@ def create(self):
         with cherrypy.request.db_session() as session:
             project = cherrypy.request.project
 
+            region = session.query(Region).filter(Region.id == request.region_id).first()
+            if region is None:
+                raise cherrypy.HTTPError(404, "A region with the requested id does not exist.")
+
+            if region.state != RegionState.CREATED:
+                raise cherrypy.HTTPError(412,
+                                         "The requested region is not in the following state: %s" %
+                                         RegionState.CREATED.value)
+
             image = session.query(Image).filter(Image.project_id == project.id).filter(
-                Image.name == request.name).first()
+                Image.name == request.name).filter(Image.region_id == region.id).first()
 
             if image is not None:
                 raise cherrypy.HTTPError(409, 'An image with the requested name already exists.')
@@ -45,15 +54,6 @@ def create(self):
             if image is not None:
                 raise cherrypy.HTTPError(409, 'An image with the requested file already exists.')
 
-            region = session.query(Region).filter(Region.id == request.region_id).first()
-            if region is None:
-                raise cherrypy.HTTPError(404, "A region with the requested id does not exist.")
-
-            if region.state != RegionState.CREATED:
-                raise cherrypy.HTTPError(412,
-                                         "The requested region is not in the following state: %s" %
-                                         RegionState.CREATED.value)
-
             image = Image()
             image.name = request.name
             image.file_name = request.file_name
@@ -105,7 +105,9 @@ def list(self, region_id, limit: int, marker: uuid.UUID):
     @cherrypy.tools.resource_object(id_param="image_id", cls=Image)
     @cherrypy.tools.enforce_policy(policy_name="images:delete")
     def delete(self, image_id):
-        cherrypy.response.status = 202
+        cherrypy.response.status = 204
+        # Fix for https://github.com/cherrypy/cherrypy/issues/1657
+        del cherrypy.response.headers['Content-Type']
         with cherrypy.request.db_session() as session:
             image: Image = session.merge(cherrypy.request.resource_object, load=False)
 

deli_counter/http/mounts/root/routes/v1/instance.py

@@ -194,7 +194,9 @@ def list(self, image_id, region_id, zone_id, limit: int, marker: uuid.UUID):
     @cherrypy.tools.resource_object(id_param="instance_id", cls=Instance)
     @cherrypy.tools.enforce_policy(policy_name="instances:delete")
     def delete(self, instance_id: uuid.UUID):
-        cherrypy.response.status = 202
+        cherrypy.response.status = 204
+        # Fix for https://github.com/cherrypy/cherrypy/issues/1657
+        del cherrypy.response.headers['Content-Type']
         with cherrypy.request.db_session() as session:
             instance: Instance = session.merge(cherrypy.request.resource_object, load=False)
 
@@ -302,8 +304,13 @@ def action_image(self, instance_id: uuid.UUID):
                 raise cherrypy.HTTPError(409, "Can only image an instance in the following state: %s" %
                                          InstanceState.STOPPED.value)
 
-            region = session.query(Region).join(Zone, Region.id == Zone.region_id).filter(
-                Zone.id == instance.zone_id).one()
+            region = session.query(Region).filter(Region.id == instance.region_id).one()
+
+            image = session.query(Image).filter(Image.project_id == instance.project_id).filter(
+                Image.name == request.name).filter(Image.region_id == region.id).first()
+
+            if image is not None:
+                raise cherrypy.HTTPError(409, 'An image with the requested name already exists.')
 
             instance.state = InstanceState.IMAGING
 
@@ -317,12 +324,10 @@ def action_image(self, instance_id: uuid.UUID):
             session.add(image)
             session.flush()
 
-            # Delete vm without actually deleting the backing
-            create_task(session, instance, delete_instance, instance_id=instance.id, delete_backing=False)
-
-            # Convert the vm to a template
-            create_task(session, image, convert_vm, image_id=image.id, from_instance=True)
+            # Clone the vm to a template
+            create_task(session, image, convert_vm, image_id=image.id, instance_id=instance.id)
 
+            instance.current_task_id = image.current_task_id
             session.commit()
 
             return ResponseImage.from_database(image)

deli_counter/test/test_images.py

@@ -98,7 +98,7 @@ def test_delete(self, wsgi, app):
         # Test correct
         with patch('ingredients_tasks.tasks.image.delete_image.apply_async') as apply_async_mock:
             apply_async_mock.return_value = None
-            self.delete(wsgi, "/v1/images/%s" % image.id, token=token, status=202)
+            self.delete(wsgi, "/v1/images/%s" % image.id, token=token, status=204)
         # Check to make sure it's in deleting state
         with app.database.session() as session:
             image = session.query(Image).filter(Image.id == image.id).first()

deli_counter/test/test_instances.py

@@ -82,7 +82,7 @@ def test_delete(self, wsgi, app):
         # Test correct
         with patch('ingredients_tasks.tasks.instance.delete_instance.apply_async') as apply_async_mock:
             apply_async_mock.return_value = None
-            self.delete(wsgi, "/v1/instances/%s" % instance.id, token=token, status=202)
+            self.delete(wsgi, "/v1/instances/%s" % instance.id, token=token, status=204)
         # Check to make sure it's in deleting state
         with app.database.session() as session:
             image = session.query(Instance).filter(Instance.id == instance.id).first()

requirements.txt

@@ -5,5 +5,5 @@ requests==2.18.4 # Apache 2.0
 PyGithub==1.35 # LGPL
 cryptography==2.1.4 # Apache 2.0 or BSD
 ingredients.http==0.0.12 # MIT
-ingredients.tasks==0.0.8 # MIT
+ingredients.tasks==0.0.9 # MIT
 ingredients.db==0.0.11 # MIT