starlingx
/
distcloud-client
Code Issues Proposed changes

Merge "Fix dcmanager complete execution"

This commit is contained in:
Zuul 2024-05-03 14:46:00 +00:00 committed by Gerrit Code Review
parent 238428ea0d e55e4a5c49
commit 328252a2fa
3 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
distributedcloud-client/dcmanagerclient/commands/v1/subcloud_deploy_manager.py
View File

@ -164,33 +164,33 @@ class SubcloudDeployShow(base.DCManagerShowOne):
class DeprecatedSubcloudDeployShow(SubcloudDeployShow):
def _raise_deprecation_message(self):
deprecation_msg = (
"This command has been deprecated. Please use "
"subcloud deploy show instead."
)
raise exceptions.DCManagerClientException(deprecation_msg)
DEPRECATION_MESSAGE = ("This command has been deprecated. Please use "
"subcloud deploy show instead.")
def get_parser(self, _):
self._raise_deprecation_message()
def get_parser(self, prog_name):
parser = super().get_parser(prog_name)
parser.add_argument_group(
title="Notice", description=self.DEPRECATION_MESSAGE
)
return parser
def _get_resources(self, _):
self._raise_deprecation_message()
raise exceptions.DCManagerClientException(self.DEPRECATION_MESSAGE)
class DeprecatedSubcloudDeployUpload(SubcloudDeployUpload):
def _raise_deprecation_message(self):
deprecation_msg = (
"This command has been deprecated. Please use "
"subcloud deploy upload instead."
)
raise exceptions.DCManagerClientException(deprecation_msg)
DEPRECATION_MESSAGE = ("This command has been deprecated. Please use "
"subcloud deploy upload instead.")
def get_parser(self, _):
self._raise_deprecation_message()
def get_parser(self, prog_name):
parser = super().get_parser(prog_name)
parser.add_argument_group(
title="Notice", description=self.DEPRECATION_MESSAGE
)
return parser
def _get_resources(self, _):
self._raise_deprecation_message()
raise exceptions.DCManagerClientException(self.DEPRECATION_MESSAGE)
class SubcloudDeployDelete(command.Command):

60
distributedcloud-client/dcmanagerclient/commands/v1/subcloud_manager.py
View File

@ -750,41 +750,41 @@ class UpdateSubcloud(base.DCManagerShowOne):
class ReconfigSubcloud(base.DCManagerShowOne):
"""Reconfigure a subcloud."""
def _raise_deprecation_message(self):
deprecation_msg = (
"This command has been deprecated. Please use "
"'subcloud deploy config' instead."
)
raise exceptions.DCManagerClientException(deprecation_msg)
DEPRECATION_MESSAGE = ("This command has been deprecated. Please use "
"'subcloud deploy config' instead.")
def _get_format_function(self):
return detail_format
def get_parser(self, _):
self._raise_deprecation_message()
def get_parser(self, prog_name):
parser = super().get_parser(prog_name)
parser.add_argument_group(
title="Notice", description=self.DEPRECATION_MESSAGE
)
return parser
def _get_resources(self, _):
self._raise_deprecation_message()
def _get_resources(self, parsed_args):
raise exceptions.DCManagerClientException(self.DEPRECATION_MESSAGE)
class ReinstallSubcloud(base.DCManagerShowOne):
"""Reinstall a subcloud."""
def _raise_deprecation_message(self):
deprecation_msg = (
"This command has been deprecated. Please use "
"'subcloud redeploy' instead."
)
raise exceptions.DCManagerClientException(deprecation_msg)
DEPRECATION_MESSAGE = ("This command has been deprecated. Please use "
"'subcloud redeploy' instead.")
def _get_format_function(self):
return detail_format
def get_parser(self, _):
self._raise_deprecation_message()
def get_parser(self, prog_name):
parser = super().get_parser(prog_name)
parser.add_argument_group(
title="Notice", description=self.DEPRECATION_MESSAGE
)
return parser
def _get_resources(self, _):
self._raise_deprecation_message()
def _get_resources(self, parsed_args):
raise exceptions.DCManagerClientException(self.DEPRECATION_MESSAGE)
class RedeploySubcloud(base.DCManagerShowOne):
@ -925,21 +925,21 @@ class RedeploySubcloud(base.DCManagerShowOne):
class RestoreSubcloud(base.DCManagerShowOne):
"""Restore a subcloud."""
def _raise_deprecation_message(self):
deprecation_msg = (
"This command has been deprecated. Please use "
"subcloud-backup restore instead."
)
raise exceptions.DCManagerClientException(deprecation_msg)
DEPRECATION_MESSAGE = ("This command has been deprecated. Please use "
"subcloud-backup restore instead.")
def _get_format_function(self):
return detail_format
def get_parser(self, _):
self._raise_deprecation_message()
def get_parser(self, prog_name):
parser = super().get_parser(prog_name)
parser.add_argument_group(
title="Notice", description=self.DEPRECATION_MESSAGE
)
return parser
def _get_resources(self, _):
self._raise_deprecation_message()
def _get_resources(self, parsed_args):
raise exceptions.DCManagerClientException(self.DEPRECATION_MESSAGE)
class PrestageSubcloud(base.DCManagerShowOne):

24
distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_manager.py
View File

@ -431,21 +431,17 @@ class TestCLISubcloudManagerV1(base.BaseCommandTest):
@mock.patch("getpass.getpass", return_value="testpassword")
def test_restore_subcloud(self, _mock_getpass):
with tempfile.NamedTemporaryFile() as f:
file_path = os.path.abspath(f.name)
e = self.assertRaises(
DCManagerClientException,
self.call,
subcloud_cmd.RestoreSubcloud,
)
e = self.assertRaises(
DCManagerClientException,
self.call,
subcloud_cmd.RestoreSubcloud,
app_args=[base.ID, "--restore-values", file_path],
)
deprecation_msg = (
"This command has been deprecated. Please use "
"subcloud-backup restore instead."
)
self.assertTrue(deprecation_msg in str(e))
deprecation_msg = (
"This command has been deprecated. Please use "
"subcloud-backup restore instead."
)
self.assertTrue(deprecation_msg in str(e))
def test_prestage_with_subcloud_id(self):
self.client.subcloud_manager.prestage_subcloud.return_value = [