Merge pull request #233 from globocom/CleanRegionMigrationCode

Clean region migration code

Author: ricardosdias

dbaas/logical/admin/database.py

@@ -227,34 +227,6 @@ def get_capacity_html(self, database):
 
     get_capacity_html.short_description = "Capacity"
 
-    def get_actions(self, request):
-        actions = super(DatabaseAdmin, self).get_actions(request)
-        if request.user.team_set.filter(role__name="role_dba"):
-            actions['multiple_initialize_migration'] = (self.multiple_initialize_migration,
-                                                        'multiple_initialize_migration',
-                                                        'Initialize Migration')
-
-        return actions
-
-    def multiple_initialize_migration(self, queryset, request, instances):
-        from region_migration.models import DatabaseRegionMigration
-        url = reverse(
-            'admin:region_migration_databaseregionmigration_changelist')
-
-        for database in instances:
-            region_migration = DatabaseRegionMigration(database=database,
-                                                       current_step=0,
-                                                       )
-            try:
-                region_migration.save()
-            except IntegrityError:
-                pass
-
-        self.message_user(
-            request, "Migration for selected database(s) started!", level=messages.SUCCESS)
-
-        return HttpResponseRedirect(url)
-
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         """
         filter teams for the ones that the user is associated, unless the user has ther
@@ -485,7 +457,7 @@ def delete_view(self, request, object_id, extra_context=None):
             url = reverse('admin:logical_database_changelist')
             return HttpResponseRedirect(url)
 
-        if database.has_migration_started():
+        if database.has_flipperfox_migration_started():
             self.message_user(
                 request, "Database {} cannot be deleted because it is beeing migrated.".format(database.name), level=messages.ERROR)
             url = reverse('admin:logical_database_changelist')
@@ -513,7 +485,7 @@ def delete_model(modeladmin, request, obj):
             url = reverse('admin:logical_database_changelist')
             return HttpResponseRedirect(url)
 
-        if database.has_migration_started():
+        if database.has_flipperfox_migration_started():
             modeladmin.message_user(
                 request, "Database {} cannot be deleted because it is beeing migrated.".format(database.name), level=messages.ERROR)
             url = reverse('admin:logical_database_changelist')
@@ -896,7 +868,7 @@ def restore_snapshot(self, request, database_id):
             )
             return HttpResponseRedirect(url)
 
-        if database.has_migration_started():
+        if database.has_flipperfox_migration_started():
             self.message_user(
                 request,
                 "Database {} cannot be restored because it is beeing migrated.".format(database.name),
@@ -944,44 +916,6 @@ def database_log_view(self, request, database_id):
                                   locals(),
                                   context_instance=RequestContext(request))
 
-    def initialize_migration(self, request, database_id):
-        from region_migration.models import DatabaseRegionMigration
-
-        database = Database.objects.get(id=database_id)
-        url = reverse('admin:logical_database_change', args=[database_id])
-
-        region_migration = DatabaseRegionMigration(database=database, current_step=0,)
-
-        if database.is_in_quarantine:
-            self.message_user(request, "Database in quarantine and cannot be migrated", level=messages.ERROR)
-            return HttpResponseRedirect(url)
-
-        if database.status != Database.ALIVE or not database.database_status.is_alive:
-            self.message_user(request, "Database is dead and cannot be migrated", level=messages.ERROR)
-            return HttpResponseRedirect(url)
-
-        if not request.user.team_set.filter(role__name="role_dba"):
-            self.message_user(
-                request,
-                "You have no permissions to migrate {}. Please, contact your DBA".format(database.name),
-                level=messages.ERROR
-            )
-            return HttpResponseRedirect(url)
-
-        url = reverse('admin:region_migration_databaseregionmigration_changelist')
-
-        if database.has_migration_started():
-            self.message_user(request, "Database {} is already migrating".format(database.name), level=messages.ERROR)
-            return HttpResponseRedirect(url)
-
-        try:
-            region_migration.save()
-            self.message_user(request, "Migration for {} started!".format(database.name), level=messages.SUCCESS)
-        except IntegrityError, e:
-            self.message_user(request, "Database {} is already migrating!".format(database.name), level=messages.ERROR)
-
-        return HttpResponseRedirect(url)
-
     def initialize_flipperfox_migration(self, request, database_id):
         from flipperfox_migration.models import DatabaseFlipperFoxMigration
 
@@ -1031,7 +965,7 @@ def mongodb_engine_version_upgrade(self, request, database_id):
             self.message_user(request, "Database is dead and cannot be upgraded!", level=messages.ERROR)
             return HttpResponseRedirect(url)
 
-        if database.has_migration_started():
+        if database.has_flipperfox_migration_started():
             self.message_user(
                 request,
                 "Database {} is being migrated and cannot be upgraded!".format(database.name),
@@ -1105,10 +1039,6 @@ def get_urls(self):
                 self.admin_site.admin_view(self.restore_snapshot),
                 name="database_restore_snapshot"),
 
-            url(r'^/?(?P<database_id>\d+)/initialize_migration/$',
-                self.admin_site.admin_view(self.initialize_migration),
-                name="database_initialize_migration"),
-
             url(r'^/?(?P<database_id>\d+)/initialize_flipperfox_migration/$',
                 self.admin_site.admin_view(self.initialize_flipperfox_migration),
                 name="database_initialize_flipperfox_migration"),

dbaas/logical/models.py

@@ -408,9 +408,6 @@ def get_lognit_url(self):
     def get_restore_url(self):
         return "/admin/logical/database/{}/restore/".format(self.id)
 
-    def get_migration_url(self):
-        return "/admin/logical/database/{}/initialize_migration/".format(self.id)
-
     def get_mongodb_engine_version_upgrade_url(self):
         return "/admin/logical/database/{}/mongodb_engine_version_upgrade/".format(self.id)
 
@@ -463,32 +460,10 @@ def is_beeing_used_elsewhere(self, task_id=None):
 
         return False
 
-    def has_migration_started(self,):
-        from region_migration.models import DatabaseRegionMigrationDetail
-        try:
-            migration = self.migration.get()
-        except ObjectDoesNotExist:
-            return False
-
-        if migration.is_migration_finished():
-            return False
-
-        if migration.current_step > 0:
-            return True
-
-        status_to_check = [DatabaseRegionMigrationDetail.WAITING,
-                           DatabaseRegionMigrationDetail.RUNNING]
-
-        details = migration.details.filter(status__in=status_to_check)
-        if details:
-            return True
-
-        return False
-
     def has_flipperfox_migration_started(self,):
         from flipperfox_migration.models import DatabaseFlipperFoxMigrationDetail
         try:
-            migration = self.migration.get()
+            migration = self.flipperfoxmigration.get()
         except ObjectDoesNotExist:
             return False
 

dbaas/logical/tests/test_database.py

@@ -44,7 +44,6 @@ def test_create_database(self):
 
         self.assertTrue(database.pk)
 
-    @skip("aovid this test due to region migration")
     def test_create_duplicate_database_error(self):
 
         database = Database(name="bleble", databaseinfra=self.databaseinfra,
@@ -55,7 +54,8 @@ def test_create_duplicate_database_error(self):
         self.assertTrue(database.pk)
 
         self.assertRaises(IntegrityError, Database(name="bleble",
-                                                   databaseinfra=self.databaseinfra).save)
+                                                   databaseinfra=self.databaseinfra,
+                                                   environment=self.environment).save)
 
     def test_slugify_database_name_with_spaces(self):
 

dbaas/logical/validators.py

@@ -34,7 +34,7 @@ def check_is_database_enabled(database_id, operation):
     if database.is_beeing_used_elsewhere():
         raise BusyDatabaseError(url)
 
-    if database.has_migration_started():
+    if database.has_flipperfox_migration_started():
         url = reverse('admin:logical_database_changelist')
         raise MigrationDatabaseError(operation, database.name, url)