Fix Listing of MHS instances via OCI SDK

Change-Id: I6283ffc8c96715cae888e0402f790e069dccab54

Author: mzinner

mds_plugin/mysql_database_service.py

@@ -109,7 +109,7 @@ def format_mysql_shapes(items) -> str:
         items = [items]
 
     # return objects in READABLE text output
-    out = (core.fixed_len('Shape Name', 32, ' ') + 
+    out = (core.fixed_len('Shape Name', 32, ' ') +
         core.fixed_len('CPU Count', 12, ' ', align_right=True) +
         core.fixed_len('Memory Size', 12, '\n', align_right=True))
     id = 1
@@ -604,9 +604,10 @@ def list_db_systems(**kwargs):
 
         # Get the list of shapes, cSpell:ignore ANALYTICSCLUSTER
         all_shapes = mds_client.list_shapes(compartment_id=compartment_id,
-            is_supported_for=['ANALYTICSCLUSTER','HEATWAVECLUSTER']).data
+            is_supported_for=['DBSYSTEM','HEATWAVECLUSTER']).data
         hw_shapes = [s.name for s in all_shapes if "HEATWAVECLUSTER" in s.is_supported_for]
-        analytics_shapes = [s.name for s in all_shapes if "ANALYTICSCLUSTER" in s.is_supported_for]
+        # Support for "ANALYTICSCLUSTER" has been removed from the SDK
+        analytics_shapes = [] #[s.name for s in all_shapes if "ANALYTICSCLUSTER" in s.is_supported_for]
 
         # Initialize the DbSystem client
         db_sys = core.get_oci_db_system_client(config=config)
@@ -826,8 +827,8 @@ def update_db_system(**kwargs):
         db_system_id (str): OCID of the DbSystem.
         ignore_current (bool): Whether to not default to the current bastion.
         new_name (str): The new name
-        new_description (str): The new description 
-        new_freeform_tags (str): The new freeform_tags formatted as string 
+        new_description (str): The new description
+        new_freeform_tags (str): The new freeform_tags formatted as string
         compartment_id (str): OCID of the parent compartment
         config (dict): An OCI config object or None
         config_profile (str): The name of an OCI config profile
@@ -1760,7 +1761,7 @@ def change_lifecycle_state(**kwargs):
 
             # If the function should wait till the bastion reaches the correct
             # lifecycle state
-            
+
             if await_completion:
                 if db_system_action:
                     await_lifecycle_state(
@@ -1877,7 +1878,7 @@ def await_hw_cluster_lifecycle_state(db_system_id, action_state, action_name, co
                         s = f" {req.percent_complete:.0f}% completed."
                 except:
                     pass
-                    
+
                 print(f'Waiting for HeatWave Cluster to {action_name}...{s}')
             time.sleep(5)
         cycles += 1
@@ -1989,7 +1990,7 @@ def create_hw_cluster(**kwargs):
 
             if not shape_name and interactive:
                 shape = get_db_system_shape(
-                    is_supported_for="HEATWAVECLUSTER", 
+                    is_supported_for="HEATWAVECLUSTER",
                     compartment_id=db_system.compartment_id,
                     config=config, config_profile=config_profile,
                     interactive=True,
@@ -2013,12 +2014,12 @@ def create_hw_cluster(**kwargs):
 
             if await_completion:
                 await_hw_cluster_lifecycle_state(db_system_id=db_system.id, action_state='ACTIVE',
-                    action_name="start", config=config, interactive=interactive, 
+                    action_name="start", config=config, interactive=interactive,
                     work_request_id=work_request_id)
             elif interactive:
                 print(f"The HeatWave Cluster of the MySQL DB System '{db_system.display_name}' is being "
                       "created.")
-                
+
         except oci.exceptions.ServiceError as e:
             if raise_exceptions:
                 raise
@@ -2125,7 +2126,7 @@ def update_hw_cluster(**kwargs):
 
             if not shape_name and interactive:
                 shape = get_db_system_shape(
-                    is_supported_for="HEATWAVECLUSTER", 
+                    is_supported_for="HEATWAVECLUSTER",
                     compartment_id=db_system.compartment_id,
                     config=config, config_profile=config_profile,
                     interactive=True,