fix: dev: SDK-364: Oracle Multi AD changes required in qds-sdk

qubole · Jul 29, 2019 · afd612a · afd612a
1 parent c75e31f
commit afd612a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,3 +15,4 @@ install:
 # command to run tests
 script: py.test
 env: BOTO_CONFIG=/tmp/nowhere
+dist: trusty
diff --git a/qds_sdk/cloud/oracle_bmc_cloud.py b/qds_sdk/cloud/oracle_bmc_cloud.py
@@ -1,5 +1,6 @@
 from qds_sdk.cloud.cloud import Cloud
 import json
+import ast
 
 class OracleBmcCloud(Cloud):
     '''
@@ -112,11 +113,8 @@ def set_network_config(self,
         self.network_config['subnet_id'] = subnet_id
         self.network_config['compartment_id'] = compartment_id
         self.network_config['image_id'] = image_id
-        if availability_domain_info_map and availability_domain_info_map.strip():
-            try:
-                self.network_config['availability_domain_info_map'] = json.loads(availability_domain_info_map.strip())
-            except Exception as e:
-                raise Exception("Invalid JSON string for availability domain info map: %s" % e.message)
+        if availability_domain_info_map:
+            self.network_config['availability_domain_info_map'] = availability_domain_info_map
 
     def set_storage_config(self,
                            storage_tenant_id=None,
@@ -133,6 +131,12 @@ def set_storage_config(self,
         self.storage_config['block_volume_size'] = block_volume_size
 
     def set_cloud_config_from_arguments(self, arguments):
+        if arguments.availability_domain_info_map:
+            try:
+                arguments.availability_domain_info_map = ast.literal_eval(arguments.availability_domain_info_map)
+                assert isinstance(arguments.availability_domain_info_map, list)
+            except Exception as e:
+                raise Exception("Invalid List format for availability_domain_info_map: %s" % e.message)
         self.set_cloud_config(compute_tenant_id=arguments.compute_tenant_id,
                               compute_user_id=arguments.compute_user_id,
                               compute_key_finger_print=arguments.compute_key_finger_print,
@@ -239,4 +243,4 @@ def create_parser(self, argparser):
                                     dest="block_volume_size",
                                     default=None,
                                     help="size (in GB) of each block volume to be mounted to an instance",
-                                    type=int)
+                                    type=int)
diff --git a/tests/test_clusterv2.py b/tests/test_clusterv2.py
@@ -148,7 +148,7 @@ def test_oracle_bmc_network_config(self):
     def test_oracle_bmc_network_config_az_info_map(self):
         sys.argv = ['qds.py', '--version', 'v2', '--cloud', 'ORACLE_BMC', 'cluster', 'create', '--label', 'test_label',
                     '--compartment-id', 'abc-compartment', '--image-id', 'abc-image', '--vcn-id', 'vcn-1',
-                    '--availability-domain-info-map', '{"availability_domain": "AD-1", "subnet_id": "subnet-1"}']
+                    '--availability-domain-info-map', str([{"availability_domain": "AD-1", "subnet_id": "subnet-1"}])]
         Qubole.cloud = None
         print_command()
         Connection._api_call = Mock(return_value={})
@@ -159,8 +159,8 @@ def test_oracle_bmc_network_config_az_info_map(self):
                                                                                'compartment_id': 'abc-compartment',
                                                                                'image_id': 'abc-image',
                                                                                'availability_domain_info_map':
-                                                                                   {'availability_domain': 'AD-1',
-                                                                                    'subnet_id': 'subnet-1'}}},
+                                                                                   [{'availability_domain': 'AD-1',
+                                                                                    'subnet_id': 'subnet-1'}]}},
                                                                      'cluster_info': {'label': ['test_label']}})
 
     def test_oracle_bmc_location_config(self):