Merge pull request #2 from mbelang/master

Fixed instance rebuild

Author: Marx314

almanach/adapters/api_route_v1.py

@@ -134,6 +134,7 @@ def rebuild_instance(instance_id):
         instance_id=instance_id,
         distro=instance['distro'],
         version=instance['version'],
+        os_type=instance['os_type'],
         rebuild_date=instance['rebuild_date'],
     )
 

almanach/adapters/bus_adapter.py

@@ -178,7 +178,8 @@ def _instance_rebuilt(self, notification):
         instance_id = payload.get("instance_id")
         distro = payload.get("image_meta").get("distro")
         version = payload.get("image_meta").get("version")
-        self.controller.rebuild_instance(instance_id, distro, version, date)
+        os_type = payload.get("image_meta").get("os_type")
+        self.controller.rebuild_instance(instance_id, distro, version, os_type, date)
 
     def _volume_type_create(self, notification):
         volume_types = notification.get("payload").get("volume_types")

almanach/core/controller.py

@@ -86,16 +86,18 @@ def resize_instance(self, instance_id, flavor, resize_date):
             logging.error("Trying to resize an instance with id '%s' not in the database yet." % instance_id)
             raise e
 
-    def rebuild_instance(self, instance_id, distro, version, rebuild_date):
+    def rebuild_instance(self, instance_id, distro, version, os_type, rebuild_date):
         rebuild_date = self._validate_and_parse_date(rebuild_date)
         instance = self.database_adapter.get_active_entity(instance_id)
-        logging.info("instance %s rebuilded in project %s to os %s %s on %s" % (instance_id, instance.project_id,
-                                                                                distro, version, rebuild_date))
+        logging.info("instance %s rebuilded in project %s to os %s %s %s on %s" % (instance_id, instance.project_id,
+                                                                                   os_type, distro, version,
+                                                                                   rebuild_date))
         if instance.os.distro != distro or instance.os.version != version:
             self.database_adapter.close_active_entity(instance_id, rebuild_date)
 
             instance.os.distro = distro
             instance.os.version = version
+            instance.os.os_type = os_type
             instance.start = rebuild_date
             instance.end = None
             instance.last_event = rebuild_date

tests/adapters/test_bus_adapter.py

@@ -122,6 +122,7 @@ def test_on_message_with_rebuild_instance(self):
                 notification['payload']['instance_id'],
                 notification['payload']['image_meta']['distro'],
                 notification['payload']['image_meta']['version'],
+                notification['payload']['image_meta']['os_type'],
                 notification['timestamp'],
             ) \
             .once()

tests/api_test.py

@@ -775,13 +775,15 @@ def test_rebuild_instance(self):
         data = {
             'distro': 'A_DISTRIBUTION',
             'version': 'A_VERSION',
+            'os_type': 'AN_OS_TYPE',
             'rebuild_date': 'UPDATE_DATE',
         }
         self.controller.should_receive('rebuild_instance') \
             .with_args(
                 instance_id=instance_id,
                 distro=data.get('distro'),
                 version=data.get('version'),
+                os_type=data.get('os_type'),
                 rebuild_date=data.get('rebuild_date')) \
             .once()
 
@@ -817,6 +819,7 @@ def test_rebuild_instance_bad_date_format_returns_bad_request_code(self):
         data = {
             'distro': 'A_DISTRIBUTION',
             'version': 'A_VERSION',
+            'os_type': 'AN_OS_TYPE',
             'rebuild_date': 'A_BAD_UPDATE_DATE',
         }
 

tests/core/test_controller.py

@@ -556,8 +556,20 @@ def test_instance_rebuilded(self):
          .should_receive("insert_entity")
          .once())
 
-        self.controller.rebuild_instance("an_instance_id", "some_distro", "some_version", "2015-10-21T16:25:00.000000Z")
-        self.controller.rebuild_instance("an_instance_id", i.os.distro, i.os.version, "2015-10-21T16:25:00.000000Z")
+        self.controller.rebuild_instance(
+            "an_instance_id",
+            "some_distro",
+            "some_version",
+            "some_type",
+            "2015-10-21T16:25:00.000000Z"
+        )
+        self.controller.rebuild_instance(
+            "an_instance_id",
+            i.os.distro,
+            i.os.version,
+            i.os.os_type,
+            "2015-10-21T16:25:00.000000Z"
+        )
 
     def test_rename_volume(self):
         fake_volume = a(volume().with_display_name('old_volume_name'))