In subcloud show, display region_name as default

In this commit, the dcmanager subcloud show command was updated
to display region_name as default.

Test Plan:
PASS: run dcmanager subcloud show <subcloud name> and verify that
region name is displayed
PASS: run dcmanager subcloud show <subcloud name> -d and verify that
region name is displayed

Closes-bug: 2054803

Change-Id: I4481b34a9406d84c28f0230385eee79b9cc82753
Signed-off-by: Christopher de Oliveira Souza <Christopher.DeOliveiraSouza@windriver.com>

distributedcloud-client/dcmanagerclient/api/v1/subcloud_manager.py

@@ -108,8 +108,6 @@ class subcloud_manager(base.ResourceManager):
             resource[0].oam_floating_ip = json_object['oam_floating_ip']
             resource[0].deploy_config_sync_status = \
                 json_object['deploy_config_sync_status']
-            resource[0].region_name = \
-                json_object['region_name']
         return resource
 
     def add_subcloud(self, **kwargs):

distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py

@@ -82,7 +82,7 @@ def basic_detail_format(subcloud=None):
         'backup_status',
         'backup_datetime',
         'prestage_status',
-        'prestage_versions'
+        'prestage_versions',
     )
 
     if subcloud:
@@ -107,9 +107,13 @@ def basic_detail_format(subcloud=None):
             subcloud.backup_status,
             subcloud.backup_datetime,
             subcloud.prestage_status,
-            subcloud.prestage_versions
+            subcloud.prestage_versions,
         )
 
+        if subcloud.region_name is not None:
+            columns += ('region_name',)
+            data += (subcloud.region_name,)
+
     else:
         data = (tuple('<none>' for _ in range(len(columns))),)
 
@@ -135,10 +139,6 @@ def detail_format(subcloud=None):
             columns += ('deploy_config_sync_status',)
             data += (subcloud.deploy_config_sync_status,)
 
-        if subcloud.region_name is not None:
-            columns += ('region_name',)
-            data += (subcloud.region_name,)
-
     return columns, data
 
 

distributedcloud-client/dcmanagerclient/tests/base.py

@@ -89,7 +89,8 @@ SUBCLOUD_RESOURCE = api_base.Subcloud(
     backup_status=BACKUP_STATUS,
     backup_datetime=BACKUP_DATETIME,
     prestage_status=PRESTAGE_STATUS,
-    prestage_versions=PRESTAGE_VERSIONS)
+    prestage_versions=PRESTAGE_VERSIONS,
+    region_name=REGION_NAME)
 
 # Subcloud CLI resource object with peerid rehome data
 SUBCLOUD_RESOURCE_WITH_PEERID = api_base.Subcloud(
@@ -186,8 +187,31 @@ SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID = (
     BACKUP_STATUS,
     BACKUP_DATETIME,
     PRESTAGE_STATUS,
-    PRESTAGE_VERSIONS
-)
+    PRESTAGE_VERSIONS)
+
+SUBCLOUD_FIELD_RESULT_LIST_SUBCLOUD_SHOW = (
+    ID,
+    NAME,
+    DESCRIPTION,
+    LOCATION,
+    SOFTWARE_VERSION,
+    MANAGEMENT_STATE,
+    AVAILABILITY_STATUS,
+    DEPLOY_STATUS,
+    MANAGEMENT_SUBNET,
+    MANAGEMENT_START_IP,
+    MANAGEMENT_END_IP,
+    MANAGEMENT_GATEWAY_IP,
+    SYSTEMCONTROLLER_GATEWAY_IP,
+    DEFAULT_SUBCLOUD_GROUP_ID,
+    SUBCLOUD_PEERGROUP_ID,
+    TIME_NOW,
+    TIME_NOW,
+    BACKUP_STATUS,
+    BACKUP_DATETIME,
+    PRESTAGE_STATUS,
+    PRESTAGE_VERSIONS,
+    REGION_NAME)
 
 EMPTY_SUBCLOUD_FIELD_RESULT = (('<none>',) * len(SUBCLOUD_FIELD_RESULT_LIST),)
 EMPTY_SUBCLOUD_FIELD_RESULT_WITH_PEERID_REHOME_DATA = \

distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py

@@ -78,7 +78,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest):
             return_value = [base.SUBCLOUD_RESOURCE]
         actual_call = self.call(subcloud_cmd.ShowSubcloud, app_args=[base.ID])
         self.assertEqual(
-            base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID,
+            base.SUBCLOUD_FIELD_RESULT_LIST_SUBCLOUD_SHOW,
             actual_call[1])
 
     def test_show_subcloud_with_additional_detail(self):
@@ -87,16 +87,14 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest):
             base.EXTERNAL_OAM_FLOATING_ADDRESS
         SUBCLOUD_WITH_ADDITIONAL_DETAIL.deploy_config_sync_status =  \
             base.DEPLOY_CONFIG_SYNC_STATUS
-        SUBCLOUD_WITH_ADDITIONAL_DETAIL.region_name = \
-            base.REGION_NAME
         self.client.subcloud_manager.subcloud_additional_details.\
             return_value = [SUBCLOUD_WITH_ADDITIONAL_DETAIL]
         actual_call = self.call(subcloud_cmd.ShowSubcloud,
                                 app_args=[base.ID, '--detail'])
         self.assertEqual(
-            base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID +
+            base.SUBCLOUD_FIELD_RESULT_LIST_SUBCLOUD_SHOW +
             (base.EXTERNAL_OAM_FLOATING_ADDRESS,
-             base.DEPLOY_CONFIG_SYNC_STATUS, base.REGION_NAME),
+             base.DEPLOY_CONFIG_SYNC_STATUS),
             actual_call[1])
 
     def test_show_subcloud_negative(self):
@@ -317,7 +315,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest):
                     '--release', base.SOFTWARE_VERSION,
                 ])
         self.assertEqual(
-            base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID,
+            base.SUBCLOUD_FIELD_RESULT_LIST_SUBCLOUD_SHOW,
             actual_call[1])
 
     @mock.patch('getpass.getpass', return_value='testpassword')