Merged Image and CloudImage into one model

nuwang · nuwang · commit f4d6cf13bb65 · 2019-03-12T02:02:02.000+05:30
diff --git a/django-cloudlaunch/cloudlaunch/admin.py b/django-cloudlaunch/cloudlaunch/admin.py
@@ -32,9 +32,9 @@ class AppCategoryAdmin(admin.ModelAdmin):
 
 
 class CloudImageAdmin(admin.ModelAdmin):
-    model = models.CloudImage
-    list_display = ('name', 'cloud', 'image_id')
-    list_filter = ('name', 'cloud')
+    model = models.Image
+    list_display = ('name', 'region', 'image_id')
+    list_filter = ('name', 'region')
     ordering = ('name',)
 
 
@@ -67,33 +67,34 @@ class AppDeploymentsAdmin(admin.ModelAdmin):
 
 class UsageAdmin(admin.ModelAdmin):
     models = models.Usage
-    # Enable column-based display&filtering of entries
-    list_display = ('added', 'target_cloud', 'instance_type', 'application',
-                    'user')
-    # Enable filtering of displayed entries
-    list_filter = ('added', 'app_deployment__target_cloud', 'user',
-                   'app_deployment__application_version__application__name')
-    # Enable hierarchical navigation by date
-    date_hierarchy = 'added'
-    ordering = ('-added',)
-    # Add search
-    search_fields = ['user']
 
-    def application(self, obj):
+    def deployment_target(self, obj):
         if obj.app_deployment:
-            return obj.app_deployment.application_version.application.name
+            return obj.app_deployment.deployment_target
         return None
+    deployment_target.short_description = 'Deployment Target'
 
-    def target_cloud(self, obj):
+    def application(self, obj):
         if obj.app_deployment:
-            return obj.app_deployment.target_cloud.name
+            return obj.app_deployment.application_version.application.name
         return None
-    target_cloud.short_description = 'Target cloud'
 
     def instance_type(self, obj):
         app_config = ast.literal_eval(obj.app_config)
         return app_config.get('config_cloudlaunch', {}).get('instanceType')
 
+    # Enable column-based display&filtering of entries
+    list_display = ('added', 'deployment_target', 'instance_type', 'application',
+                    'user')
+    # Enable filtering of displayed entries
+    list_filter = ('added', 'app_deployment__deployment_target', 'user',
+                   'app_deployment__application_version__application__name')
+    # Enable hierarchical navigation by date
+    date_hierarchy = 'added'
+    ordering = ('-added',)
+    # Add search
+    search_fields = ['user']
+
 
 class PublicKeyInline(admin.StackedInline):
     model = models.PublicKey
@@ -107,7 +108,7 @@ class UserProfileAdmin(djcloudbridge.admin.UserProfileAdmin):
 admin.site.register(models.Application, AppAdmin)
 admin.site.register(models.AppCategory, AppCategoryAdmin)
 admin.site.register(models.ApplicationDeployment, AppDeploymentsAdmin)
-admin.site.register(models.CloudImage, CloudImageAdmin)
+admin.site.register(models.Image, CloudImageAdmin)
 admin.site.register(models.Usage, UsageAdmin)
 
 # Add public key to existing UserProfile
diff --git a/django-cloudlaunch/cloudlaunch/migrations/0009_merge_image_and_cloud_image.py b/django-cloudlaunch/cloudlaunch/migrations/0009_merge_image_and_cloud_image.py
@@ -0,0 +1,51 @@
+# Generated by Django 2.1.7 on 2019-03-10 08:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+import smart_selects.db_fields
+
+
+def copy_cloud_image_data(apps, schema_editor):
+    Image = apps.get_model('cloudlaunch', 'Image')
+    CloudImage = apps.get_model('cloudlaunch', 'CloudImage')
+    Region = apps.get_model('djcloudbridge', 'Region')
+
+    for cloud_image in CloudImage.objects.all():
+        image = Image.objects.get(id=cloud_image.image_ptr_id)
+        image.region = Region.objects.get(cloud=cloud_image.cloud)
+        image.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djcloudbridge', '0007_delete_cloudold'),
+        ('cloudlaunch', '0008_match_djcloudbridge_and_introduce_targets'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='image',
+            name='region',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
+                                    to='djcloudbridge.Region'),
+        ),
+        migrations.AlterField(
+            model_name='applicationversioncloudconfig',
+            name='image',
+            field=smart_selects.db_fields.ChainedForeignKey(chained_field='target',
+                                                            chained_model_field='target__zone__region',
+                                                            on_delete=django.db.models.deletion.CASCADE,
+                                                            to='cloudlaunch.Image'),
+        ),
+        migrations.RunPython(copy_cloud_image_data),
+        migrations.AlterField(
+            model_name='image',
+            name='region',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                    to='djcloudbridge.Region'),
+        ),
+        migrations.DeleteModel(
+            name='CloudImage',
+        ),
+    ]
diff --git a/django-cloudlaunch/cloudlaunch/models.py b/django-cloudlaunch/cloudlaunch/models.py
@@ -16,24 +16,17 @@
 
 
 class Image(cb_models.DateNameAwareModel):
-    """
-    A base Image model used by a virtual appliance.
-
-    Applications will use Images and the same application may be available
-    on multiple infrastructures so we need this base class so a single
-    application field can be used to retrieve all images across
-    infrastructures.
-    """
     image_id = models.CharField(max_length=50, verbose_name="Image ID")
     description = models.CharField(max_length=255, blank=True, null=True)
+    region = models.ForeignKey(cb_models.Region, on_delete=models.CASCADE,
+                               null=False)
 
-
-class CloudImage(Image):
-    cloud = models.ForeignKey(cb_models.Cloud, on_delete=models.CASCADE,
-                              blank=True, null=True)
+    # Cannot be unique together because Azure images are global, not regional
+    # class Meta:
+    #     unique_together = (("region", "image_id"),)
 
     def __str__(self):
-        return "{0} (on {1})".format(self.name, self.cloud.name)
+        return "{0} (on {1})".format(self.name, self.region)
 
 
 class DeploymentTarget(PolymorphicModel):
@@ -42,6 +35,9 @@ class Meta:
         verbose_name = "Deployment Target"
         verbose_name_plural = "Deployment Targets"
 
+    def __str__(self):
+        return "{0}: {1}".format(self._meta.verbose_name, self.id)
+
 
 class HostDeploymentTarget(DeploymentTarget):
 
@@ -68,6 +64,9 @@ class Meta:
         verbose_name = "Cloud"
         verbose_name_plural = "Clouds"
 
+    def __str__(self):
+        return "{0}: {1}".format(self._meta.verbose_name, self.target_zone)
+
 
 class AppCategory(models.Model):
     """Categories an app can be associated with."""
@@ -223,11 +222,34 @@ def compute_merged_config(self):
             default_appwide_config, default_version_config)
         return jsonmerge.merge(default_combined_config, default_cloud_config)
 
+    def to_dict(self):
+        """
+        Serialize the supplied model to a dict.
+
+        A subset of the the model fields is returned as used by current
+        plugins but more fields can be serialized as needed.
+
+        @rtype: ``dict``
+        @return: A serialized version of the supplied model.
+        """
+        return {
+            'id': self.id,
+            'default_launch_config': self.default_launch_config,
+            'target': self.target.pk,
+            'application_version': self.application_version.pk
+        }
+
 
 class ApplicationVersionCloudConfig(ApplicationVersionTargetConfig):
-    image = ChainedForeignKey(CloudImage, chained_field="target",
+    image = ChainedForeignKey(Image, chained_field="target",
                               chained_model_field="target__zone__region")
 
+    def to_dict(self):
+        return {
+            **super(ApplicationVersionCloudConfig, self).to_dict(),
+            **{'image_id': self.image.image_id}
+        }
+
 
 class ApplicationDeployment(cb_models.DateNameAwareModel):
     """Application deployment details."""
