Change create_disk function to use size_kb instead of plan.disk_offer…

…ing.size_kb
globocom · Nov 3, 2016 · a9358fb · a9358fb
1 parent 596f69d
commit a9358fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/dbaas/workflow/steps/mysql/flipperfox_migration/create_nfs.py b/dbaas/workflow/steps/mysql/flipperfox_migration/create_nfs.py
@@ -22,10 +22,11 @@ def do(self, workflow_dict):
 
                 LOG.info("Creating nfsaas disk...")
 
+                databaseinfra = workflow_dict['databaseinfra']
                 disk = create_disk(
                     environment=workflow_dict['environment'],
                     host=instance.hostname,
-                    plan=workflow_dict['target_plan']
+                    size_kb=databaseinfra.disk_offering.size_kb
                 )
 
                 if not disk:

diff --git a/dbaas/workflow/steps/util/deploy/create_nfs.py b/dbaas/workflow/steps/util/deploy/create_nfs.py
@@ -28,9 +28,11 @@ def do(self, workflow_dict):
                     )
                     continue
 
+                plan = workflow_dict['plan']
                 disk = create_disk(
-                    workflow_dict['environment'], instance.hostname,
-                    workflow_dict['plan']
+                    environment=workflow_dict['environment'],
+                    host=instance.hostname,
+                    size_kb=plan.disk_offering.size_kb
                 )
                 if not disk:
                     return False

diff --git a/dbaas/workflow/steps/util/nfsaas_utils.py b/dbaas/workflow/steps/util/nfsaas_utils.py
@@ -19,12 +19,12 @@ def get_faas_provider(environment):
     return Provider(dbaas_api, HostAttr)
 
 
-def create_disk(environment, host, plan):
+def create_disk(environment, host, size_kb):
     provider = get_faas_provider(environment=environment)
 
     LOG.info("Creating NFS disk...")
     disk = provider.create_export(
-        host=host, size_kb=plan.disk_offering.size_kb
+        host=host, size_kb=size_kb
     )
 
     LOG.info(

diff --git a/dbaas/workflow/steps/util/region_migration/create_nfs.py b/dbaas/workflow/steps/util/region_migration/create_nfs.py
@@ -17,7 +17,8 @@ def do(self, workflow_dict):
         try:
             workflow_dict['disks'] = []
 
-            driver = workflow_dict['databaseinfra'].get_driver()
+            databaseinfra = workflow_dict['databaseinfra']
+            driver = databaseinfra.get_driver()
             non_database_instances = driver.get_non_database_instances()
 
             for instance in workflow_dict['target_instances']:
@@ -31,7 +32,7 @@ def do(self, workflow_dict):
                 disk = create_disk(
                     environment=workflow_dict['target_environment'],
                     host=instance.hostname,
-                    plan=workflow_dict['target_plan']
+                    size_kb=databaseinfra.disk_offering.size_kb
                 )
 
                 if not disk: