From 5c82ba1e6a7d972eeae4ff0082371b06bc2b5fc9 Mon Sep 17 00:00:00 2001 From: twang4 Date: Thu, 2 Nov 2023 14:01:16 +0800 Subject: [PATCH] Remove rehome_data from subcloud show Remove rehome_data from command: dcmanager subcloud show SUBCLOUD Test Plan: PASS - dcmanager subclouds show SUBCLOUD can show items without rehome_data Story: 2010852 Task: 49035 Change-Id: I62d73757196f499839c1cc9c0b8a9e616388cf7b Signed-off-by: Wang Tao --- .../commands/v1/subcloud_manager.py | 2 -- .../dcmanagerclient/tests/base.py | 8 ++--- .../tests/v1/test_phased_subcloud_deploy.py | 22 ++++++------ .../tests/v1/test_subcloud_group_manager.py | 2 +- .../tests/v1/test_subcloud_manager.py | 36 +++++++++---------- .../v1/test_subcloud_peer_group_manager.py | 4 +-- .../dcmanagerclient/utils.py | 2 -- 7 files changed, 35 insertions(+), 41 deletions(-) diff --git a/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py b/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py index 1b64319..4482080 100644 --- a/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py +++ b/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py @@ -77,7 +77,6 @@ def detail_format(subcloud=None): 'systemcontroller_gateway_ip', 'group_id', 'peer_group_id', - 'rehome_data', 'created_at', 'updated_at', 'backup_status', @@ -101,7 +100,6 @@ def detail_format(subcloud=None): subcloud.systemcontroller_gateway_ip, subcloud.group_id, subcloud.peer_group_id, - subcloud.rehome_data, subcloud.created_at, subcloud.updated_at, subcloud.backup_status, diff --git a/distributedcloud-client/dcmanagerclient/tests/base.py b/distributedcloud-client/dcmanagerclient/tests/base.py index 8347517..db8f56d 100644 --- a/distributedcloud-client/dcmanagerclient/tests/base.py +++ b/distributedcloud-client/dcmanagerclient/tests/base.py @@ -87,7 +87,7 @@ SUBCLOUD_RESOURCE = api_base.Subcloud( backup_datetime=BACKUP_DATETIME) # Subcloud CLI resource object with peerid rehome data -SUBCLOUD_RESOURCE_WITH_PEERID_REHOME_DATA = api_base.Subcloud( +SUBCLOUD_RESOURCE_WITH_PEERID = api_base.Subcloud( mock, subcloud_id=ID, name=NAME, @@ -104,7 +104,6 @@ SUBCLOUD_RESOURCE_WITH_PEERID_REHOME_DATA = api_base.Subcloud( systemcontroller_gateway_ip=SYSTEMCONTROLLER_GATEWAY_IP, group_id=DEFAULT_SUBCLOUD_GROUP_ID, peer_group_id=SUBCLOUD_PEERGROUP_ID, - rehome_data=SUBCLOUD_REHOME_DATA, created_at=TIME_NOW, updated_at=TIME_NOW, backup_status=BACKUP_STATUS, @@ -133,7 +132,7 @@ SUBCLOUD_FIELD_RESULT_LIST = ( ) # Subcloud result values returned from various API calls (e.g. subcloud show) -SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA = ( +SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID = ( ID, NAME, DESCRIPTION, @@ -149,7 +148,6 @@ SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA = ( SYSTEMCONTROLLER_GATEWAY_IP, DEFAULT_SUBCLOUD_GROUP_ID, SUBCLOUD_PEERGROUP_ID, - SUBCLOUD_REHOME_DATA, TIME_NOW, TIME_NOW, BACKUP_STATUS, @@ -158,7 +156,7 @@ SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA = ( EMPTY_SUBCLOUD_FIELD_RESULT = (('',) * len(SUBCLOUD_FIELD_RESULT_LIST),) EMPTY_SUBCLOUD_FIELD_RESULT_WITH_PEERID_REHOME_DATA = \ - (('',) * len(SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA),) + (('',) * len(SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID),) # Subcloud result values returned from subcloud list command SUBCLOUD_LIST_RESULT = ( diff --git a/distributedcloud-client/dcmanagerclient/tests/v1/test_phased_subcloud_deploy.py b/distributedcloud-client/dcmanagerclient/tests/v1/test_phased_subcloud_deploy.py index ac4cc46..43b1b41 100644 --- a/distributedcloud-client/dcmanagerclient/tests/v1/test_phased_subcloud_deploy.py +++ b/distributedcloud-client/dcmanagerclient/tests/v1/test_phased_subcloud_deploy.py @@ -45,7 +45,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): '--release', base.SOFTWARE_VERSION, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_subcloud_deploy_bootstrap(self): @@ -62,7 +62,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): '--bootstrap-values', bootstrap_file_path, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_install_subcloud(self): @@ -77,7 +77,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): base.NAME, '--install-values', file_path, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_install_subcloud_with_release(self): @@ -94,7 +94,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): '--release', base.SOFTWARE_VERSION, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_install_subcloud_without_install_values(self): @@ -105,7 +105,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): cmd.InstallPhasedSubcloudDeploy, app_args=[base.NAME]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_install_file_does_not_exist(self): @@ -133,7 +133,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): cmd.ConfigPhasedSubcloudDeploy, app_args=[base.NAME, '--deploy-config', file_path]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_configure_file_does_not_exist(self): @@ -157,7 +157,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): cmd.CompletePhasedSubcloudDeploy, app_args=[base.NAME]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_abort_subcloud(self): @@ -167,7 +167,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): cmd.AbortPhasedSubcloudDeploy, app_args=[base.NAME]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_subcloud_deploy_resume_all_parameters(self): @@ -192,7 +192,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): '--release', base.SOFTWARE_VERSION, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_subcloud_deploy_resume_missing_files(self): @@ -244,7 +244,7 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): cmd.PhasedSubcloudDeployResume, app_args=[base.NAME]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_subcloud_deploy_resume_no_files_only_release(self): @@ -257,5 +257,5 @@ class TestCLIPhasedSubcloudDeployManagerV1(base.BaseCommandTest): '--release', base.SOFTWARE_VERSION, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) diff --git a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_group_manager.py b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_group_manager.py index 67b2e08..42bcf3f 100644 --- a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_group_manager.py +++ b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_group_manager.py @@ -85,7 +85,7 @@ class TestCLISubcloudGroupManagerV1(base.BaseCommandTest): self.client.subcloud_group_manager.subcloud_group_list_subclouds.\ assert_called_once_with(ID) self.assertEqual([ - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA], + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID], actual_call[1]) def test_delete_subcloud_group_by_id(self): diff --git a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py index 1527db4..e31bc2e 100644 --- a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py +++ b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py @@ -54,7 +54,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_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_show_subcloud_with_additional_detail(self): @@ -70,7 +70,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): actual_call = self.call(subcloud_cmd.ShowSubcloud, app_args=[base.ID, '--detail']) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA + + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID + (base.EXTERNAL_OAM_FLOATING_ADDRESS, base.DEPLOY_CONFIG_SYNC_STATUS, base.REGION_NAME), actual_call[1]) @@ -104,10 +104,10 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--release', base.SOFTWARE_VERSION, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call1[1]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call2[1]) @mock.patch('getpass.getpass', return_value='testpassword') @@ -125,7 +125,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--migrate', ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) @mock.patch('getpass.getpass', return_value='testpassword') @@ -151,7 +151,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): @mock.patch('getpass.getpass', return_value='testpassword') def test_add_migrate_subcloud_with_name_change(self, getpass): SUBCLOUD_RESOURCE = copy.\ - copy(base.SUBCLOUD_RESOURCE_WITH_PEERID_REHOME_DATA) + copy(base.SUBCLOUD_RESOURCE_WITH_PEERID) SUBCLOUD_RESOURCE.name = base.NAME_SC2 self.client.subcloud_manager.add_subcloud.\ return_value = [SUBCLOUD_RESOURCE] @@ -167,14 +167,14 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--name', base.NAME_SC2 ]) SUBCLOUD_FIELD_RESULT = base.\ - SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA + SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID RESULT_LIST = list(SUBCLOUD_FIELD_RESULT) RESULT_LIST[1] = base.NAME_SC2 self.assertEqual(tuple(RESULT_LIST), actual_call[1]) def test_rename_subcloud(self): SUBCLOUD_RENAMED = copy.\ - copy(base.SUBCLOUD_RESOURCE_WITH_PEERID_REHOME_DATA) + copy(base.SUBCLOUD_RESOURCE_WITH_PEERID) SUBCLOUD_RENAMED.name = base.NAME_SC2 self.client.subcloud_manager.update_subcloud.\ return_value = [SUBCLOUD_RENAMED] @@ -184,7 +184,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): subcloud_cmd.UpdateSubcloud, app_args=[base.ID, '--name', base.NAME_SC2]) results_by_id = \ - list(base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA) + list(base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID) results_by_id[1] = base.NAME_SC2 # Rename by name @@ -193,7 +193,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): app_args=[base.NAME, '--name', base.NAME_SC2]) SUBCLOUD_FIELD_RESULT = base.\ - SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA + SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID results_by_name = list(SUBCLOUD_FIELD_RESULT) results_by_name[1] = base.NAME_SC2 @@ -218,7 +218,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): actual_call = self.call( subcloud_cmd.UnmanageSubcloud, app_args=[base.ID]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_unmanage_subcloud_without_subcloud_id(self): @@ -231,7 +231,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): actual_call = self.call( subcloud_cmd.ManageSubcloud, app_args=[base.ID]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) def test_manage_subcloud_without_subcloud_id(self): @@ -258,7 +258,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--bootstrap-values', bootstrap_file_path, '--peer-group', 'peer group']) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) @mock.patch('getpass.getpass', return_value='testpassword') @@ -284,7 +284,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--release', base.SOFTWARE_VERSION, ]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) @mock.patch('getpass.getpass', return_value='testpassword') @@ -296,7 +296,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): subcloud_cmd.RedeploySubcloud, app_args=[base.ID]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call[1]) @mock.patch('getpass.getpass', return_value='testpassword') @@ -355,7 +355,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--sysadmin-password', 'testpassword', '--force']) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call_without_release[1]) def test_prestage_without_subcloudID(self): @@ -375,7 +375,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): '--force', '--release', base.SOFTWARE_VERSION]) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA + + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID + (base.SOFTWARE_VERSION,), actual_call_with_release[1]) @@ -387,7 +387,7 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest): app_args=[base.ID, '--sysadmin-password', 'testpassword']) self.assertEqual( - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA, + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID, actual_call_without_release[1]) self.assertRaises(SystemExit, self.call, subcloud_cmd.MigrateSubcloud, app_args=[]) diff --git a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_peer_group_manager.py b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_peer_group_manager.py index b44930d..e315e97 100644 --- a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_peer_group_manager.py +++ b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_peer_group_manager.py @@ -73,12 +73,12 @@ class TestCLISubcloudPeerGroupManager(base.BaseCommandTest): def test_list_subcloud_peer_group_subclouds(self): self.client.subcloud_peer_group_manager.\ subcloud_peer_group_list_subclouds.return_value = \ - [base.SUBCLOUD_RESOURCE_WITH_PEERID_REHOME_DATA] + [base.SUBCLOUD_RESOURCE_WITH_PEERID] actual_call = self.call( subcloud_peer_group_cmd.ListSubcloudPeerGroupSubclouds, app_args=[base.ID]) self.assertEqual([ - base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID_REHOME_DATA], + base.SUBCLOUD_FIELD_RESULT_LIST_WITH_PEERID], actual_call[1]) def test_add_subcloud_peer_group(self): diff --git a/distributedcloud-client/dcmanagerclient/utils.py b/distributedcloud-client/dcmanagerclient/utils.py index 97abf27..9f5c3f6 100644 --- a/distributedcloud-client/dcmanagerclient/utils.py +++ b/distributedcloud-client/dcmanagerclient/utils.py @@ -121,7 +121,6 @@ def subcloud_detail_format(subcloud=None): 'systemcontroller_gateway_ip', 'group_id', 'peer_group_id', - 'rehome_data', 'created_at', 'updated_at', 'backup_status', @@ -145,7 +144,6 @@ def subcloud_detail_format(subcloud=None): subcloud.systemcontroller_gateway_ip, subcloud.group_id, subcloud.peer_group_id, - subcloud.rehome_data, subcloud.created_at, subcloud.updated_at, subcloud.backup_status,