Merge "Remove upgrade-strategy command"
This commit is contained in:
Zuul
Gerrit Code Review
commit
b723090265
@ -42,7 +42,6 @@ from dcmanagerclient.api.v1.sw_patch_manager import SwPatchManager
|
||||
from dcmanagerclient.api.v1.sw_prestage_manager import SwPrestageManager
|
||||
from dcmanagerclient.api.v1.sw_strategy_manager import SwStrategyManager
|
||||
from dcmanagerclient.api.v1.sw_update_options_manager import SwUpdateOptionsManager
|
||||
from dcmanagerclient.api.v1.sw_upgrade_manager import SwUpgradeManager
|
||||
from dcmanagerclient.api.v1.system_peer_manager import SystemPeerManager
|
||||
|
||||
_DEFAULT_DCMANAGER_URL = "http://localhost:8119/v1.0"
|
||||
@ -139,7 +138,6 @@ class Client:
|
||||
self.sw_patch_manager = SwPatchManager(self.http_client)
|
||||
self.sw_prestage_manager = SwPrestageManager(self.http_client)
|
||||
self.sw_update_options_manager = SwUpdateOptionsManager(self.http_client)
|
||||
self.sw_upgrade_manager = SwUpgradeManager(self.http_client)
|
||||
self.strategy_step_manager = StrategyStepManager(self.http_client)
|
||||
self.sw_strategy_manager = SwStrategyManager(self.http_client)
|
||||
self.phased_subcloud_deploy_manager = PhasedSubcloudDeployManager(
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright (c) 2017 Ericsson AB.
|
||||
# Copyright (c) 2020-2021, 2024 Wind River Systems, Inc.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
from dcmanagerclient.api.v1.sw_update_manager import SwUpdateManager
|
||||
|
||||
SW_UPDATE_TYPE_UPGRADE = "upgrade"
|
||||
|
||||
|
||||
class SwUpgradeManager(SwUpdateManager):
|
||||
def __init__(self, http_client):
|
||||
super().__init__(http_client, update_type=SW_UPDATE_TYPE_UPGRADE)
|
||||
@ -1,74 +0,0 @@
|
||||
# Copyright (c) 2017 Ericsson AB.
|
||||
# Copyright (c) 2020-2024 Wind River Systems, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
from dcmanagerclient.commands.v1 import sw_update_manager
|
||||
|
||||
|
||||
class SwUpgradeManagerMixin:
|
||||
"""This Mixin provides the update manager used for software upgrades."""
|
||||
|
||||
def get_sw_update_manager(self):
|
||||
sw_upgrade_manager = self.app.client_manager.sw_upgrade_manager
|
||||
return sw_upgrade_manager
|
||||
|
||||
|
||||
class CreateSwUpgradeStrategy(
|
||||
SwUpgradeManagerMixin, sw_update_manager.CreateSwUpdateStrategy
|
||||
):
|
||||
"""Create a software upgrade strategy."""
|
||||
|
||||
def add_force_argument(self, parser):
|
||||
parser.add_argument(
|
||||
"--force",
|
||||
required=False,
|
||||
action="store_true",
|
||||
help=(
|
||||
"Allow upgrade with the subcloud group "
|
||||
"rather than a single subcloud name/ID"
|
||||
),
|
||||
)
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super().get_parser(prog_name)
|
||||
|
||||
return parser
|
||||
|
||||
# override validate_force_params defined in CreateSwUpdateStrategy
|
||||
def validate_force_params(self, parsed_args):
|
||||
pass
|
||||
|
||||
|
||||
class ShowSwUpgradeStrategy(
|
||||
SwUpgradeManagerMixin, sw_update_manager.ShowSwUpdateStrategy
|
||||
):
|
||||
"""Show the details of a software upgrade strategy for a subcloud."""
|
||||
|
||||
|
||||
class DeleteSwUpgradeStrategy(
|
||||
SwUpgradeManagerMixin, sw_update_manager.DeleteSwUpdateStrategy
|
||||
):
|
||||
"""Delete software upgrade strategy from the database."""
|
||||
|
||||
|
||||
class ApplySwUpgradeStrategy(
|
||||
SwUpgradeManagerMixin, sw_update_manager.ApplySwUpdateStrategy
|
||||
):
|
||||
"""Apply a software upgrade strategy."""
|
||||
|
||||
|
||||
class AbortSwUpgradeStrategy(
|
||||
SwUpgradeManagerMixin, sw_update_manager.AbortSwUpdateStrategy
|
||||
):
|
||||
"""Abort a software upgrade strategy."""
|
||||
@ -47,7 +47,6 @@ from dcmanagerclient.commands.v1 import sw_patch_manager as spm
|
||||
from dcmanagerclient.commands.v1 import sw_prestage_manager as spr
|
||||
from dcmanagerclient.commands.v1 import sw_update_manager as swum
|
||||
from dcmanagerclient.commands.v1 import sw_update_options_manager as suom
|
||||
from dcmanagerclient.commands.v1 import sw_upgrade_manager as supm
|
||||
from dcmanagerclient.commands.v1 import system_peer_manager as sp
|
||||
|
||||
|
||||
@ -507,7 +506,6 @@ class DCManagerShell(app.App):
|
||||
"sw_patch_manager": self.client.sw_patch_manager,
|
||||
"sw_prestage_manager": self.client.sw_prestage_manager,
|
||||
"sw_update_options_manager": self.client.sw_update_options_manager,
|
||||
"sw_upgrade_manager": self.client.sw_upgrade_manager,
|
||||
"system_peer_manager": self.client.system_peer_manager,
|
||||
}
|
||||
|
||||
@ -640,11 +638,6 @@ class DCManagerShell(app.App):
|
||||
"system-peer list-subcloud-peer-groups": list_system_peer_groups,
|
||||
"system-peer show": sp.ShowSystemPeer,
|
||||
"system-peer update": sp.UpdateSystemPeer,
|
||||
"upgrade-strategy abort": supm.AbortSwUpgradeStrategy,
|
||||
"upgrade-strategy apply": supm.ApplySwUpgradeStrategy,
|
||||
"upgrade-strategy create": supm.CreateSwUpgradeStrategy,
|
||||
"upgrade-strategy delete": supm.DeleteSwUpgradeStrategy,
|
||||
"upgrade-strategy show": supm.ShowSwUpgradeStrategy,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#
|
||||
|
||||
import mock
|
||||
|
||||
from dcmanagerclient.tests import base_shell_test as base
|
||||
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2020-2021, 2024 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
from dcmanagerclient.commands.v1 import sw_upgrade_manager as cli_cmd
|
||||
from dcmanagerclient.tests import base
|
||||
from dcmanagerclient.tests.v1.mixins import UpdateStrategyMixin
|
||||
|
||||
|
||||
class TestSwUpgradeStrategy(UpdateStrategyMixin, base.BaseCommandTest):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.sw_update_manager = self.app.client_manager.sw_upgrade_manager
|
||||
self.create_command = cli_cmd.CreateSwUpgradeStrategy
|
||||
self.show_command = cli_cmd.ShowSwUpgradeStrategy
|
||||
self.delete_command = cli_cmd.DeleteSwUpgradeStrategy
|
||||
self.apply_command = cli_cmd.ApplySwUpgradeStrategy
|
||||
self.abort_command = cli_cmd.AbortSwUpgradeStrategy
|
||||
Loading…
x
Reference in New Issue
Block a user