Merge pull request #843 from globocom/dev

dev > master

Author: Iagohtavares

dbaas/logical/static/js/migrate.js

@@ -70,14 +70,15 @@
             */
             migrate_database: function(database_id, new_environment_id, new_offering_id, hosts_zones) {
                 var self = this;
-                if (new_offering_id===0 && hosts_zones===0) {
+                if (new_offering_id===0) {
                     $.ajax({
                         "url": "/admin/logical/database/" + database_id + "/migrate/",
                         "type": "POST",
                         "data": {
                             "database_id": database_id,
                             "new_environment_region": new_environment_id,
                             "is_region_migrate": true,
+                            "hosts_zones": JSON.stringify(hosts_zones)
                         },
                     }).complete(function() {
                         location.reload();

dbaas/logical/templates/logical/database/details/migrate_tab.html

@@ -336,9 +336,14 @@ <h3>Regions</h3>
 
     $("#migrate_region_btn_modal").click(function() {
       var $select = $("#migrate_region");
-      window.MigrateManager.migrate_database({{database.id}}, $("#migrate_region").val(), 0, 0);
+      var hosts_zones_region = {}
+      $(".host-zone").each(function(id, obj) {
+        hosts_zones_region[obj.dataset['hostId'].toString()] = obj.value;
+      })
+      window.MigrateManager.migrate_database({{database.id}}, $("#migrate_region").val(), 0, hosts_zones_region);
     });
 
+
     $("#full_rollback_migrate_stage_btn_modal").click(function() {
       //window.MigrateManager.full_rollback_migrate_stage({{database.id}}, 10);
       window.MigrateManager.full_rollback_migrate_stage({{database.id}}, {{current_stage|add:"-1"}});
@@ -366,6 +371,15 @@ <h3>Regions</h3>
     });
     $("#migrate_environment").change()
 
+    $("#migrate_region").on("change", function() {
+      var $environment = $(this);
+      control_migrate_button();
+      load_offerings($environment.val())
+      load_zones($environment.val());
+      load_region($environment.val());
+    });
+    $("#migrate_region").change()
+
     function check_offering(new_offering, old_offering, modal_id){
       $.ajax({
           url: "/logical/check_offering_sizes/",

dbaas/logical/views.py

@@ -2302,33 +2302,31 @@ def database_migrate(request, context, database):
             hp = Provider(database.infra.instances.first(), environment)
             hp_zones = sorted(hp.list_zones())
 
-            if len(hp_zones) > 0:
-                zone = hp_zones[0]['name']
-
-            instances = database.infra.instances.all().order_by('shard', 'id')
-            for instance in instances:
-                host_id = instance.hostname.id
-                break
-
-            if environment not in current_offering.environments.all():
-                messages.add_message(
-                    request, messages.ERROR, "There is no offering {} to {} environment".format(current_offering, environment)
-                )
-                return
+            hp_zones_list = []
+            for hp_zone in hp_zones:
+                hp_zones_list.append(hp_zone.get('name'))
 
             hosts_zones = OrderedDict()
-            host = get_object_or_404(Host, pk=host_id)
-            hosts_zones[host] = zone
+            data = json.loads(request.POST.get('hosts_zones'))
+            for host_id, zone in data.items():
+                if zone not in hp_zones_list and database.infra.migration_stage == database.infra.NOT_STARTED:
+                    error = "Zone {} isn't available in {} environment".format(zone, environment)
+                    messages.add_message(request, messages.ERROR, error)
+                    return
 
-            if not database.infra.migration_stage == database.infra.NOT_STARTED:
-                error = "Zone {} isn't available in {} environment".format(zone, environment)
-                messages.add_message(request, messages.ERROR, error)
-                return
+                host = get_object_or_404(Host, pk=host_id)
+                hosts_zones[host] = zone
+                if environment not in current_offering.environments.all():
+                    messages.add_message(
+                        request, messages.ERROR,
+                        "There is no offering {} to {} environment".format(current_offering, environment)
+                    )
+                    return
 
-            if hosts_zones and 'gcp' in environment.name:
-                TaskRegister.region_migrate(database, environment, current_offering, request.user, hosts_zones, flag_region)
-            else:
+            if not hosts_zones and not ('gcp' in environment.name):
                 messages.add_message(request, messages.ERROR, "There is no host to migrate")
+            else:
+                TaskRegister.region_migrate(database, environment, current_offering, request.user, hosts_zones, flag_region)
         return
 
     hosts = set()