From cc6ad938c8dd6b9eb95d1b31172333ede55b08a0 Mon Sep 17 00:00:00 2001 From: ZengTaoxu Date: Tue, 30 Aug 2022 10:59:21 +0800 Subject: [PATCH 1/3] [NetworkManager] FIx az network manager resources delete behavior --- src/network-manager/HISTORY.rst | 4 ++++ .../azext_network_manager/custom.py | 24 +++++++++---------- src/network-manager/setup.py | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/network-manager/HISTORY.rst b/src/network-manager/HISTORY.rst index cca22bf5823..b2f4b0f2f06 100644 --- a/src/network-manager/HISTORY.rst +++ b/src/network-manager/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +0.5.3 ++++++ +* Fix issue for https://github.com/Azure/azure-cli/issues/23707 + 0.5.2 +++++ * 'az network manager connection management-group': reopen the set of commands. diff --git a/src/network-manager/azext_network_manager/custom.py b/src/network-manager/azext_network_manager/custom.py index 7e6709a9ead..8f6763a8f94 100644 --- a/src/network-manager/azext_network_manager/custom.py +++ b/src/network-manager/azext_network_manager/custom.py @@ -91,8 +91,8 @@ def network_manager_update(instance, def network_manager_delete(client, resource_group_name, network_manager_name, - force=None): - if force is None or force is False: + force=False): + if force is False: print("The \'--force\' flag was not provided for the delete operation. " "If this resource or any of its child resources are part of a deployed configuration, " "this delete will fail.") @@ -328,8 +328,8 @@ def network_manager_connect_config_delete(client, resource_group_name, network_manager_name, configuration_name, - force=None): - if force is None or force is False: + force=False): + if force is False: print("The \'--force\' flag was not provided for the delete operation. " "If this resource or any of its child resources are part of a deployed configuration, " "this delete will fail.") @@ -395,8 +395,8 @@ def network_manager_group_delete(client, resource_group_name, network_manager_name, network_group_name, - force=None): - if force is None or force is False: + force=False): + if force is False: print("The \'--force\' flag was not provided for the delete operation. " "If this resource or any of its child resources are part of a deployed configuration, " "this delete will fail.") @@ -534,8 +534,8 @@ def network_manager_security_admin_config_delete(client, resource_group_name, network_manager_name, configuration_name, - force=None): - if force is None or force is False: + force=False): + if force is False: print("The \'--force\' flag was not provided for the delete operation. " "If this resource or any of its child resources are part of a deployed configuration, " "this delete will fail.") @@ -610,8 +610,8 @@ def network_manager_admin_rule_collection_delete(client, network_manager_name, configuration_name, rule_collection_name, - force=None): - if force is None or force is False: + force=False): + if force is False: print("The \'--force\' flag was not provided for the delete operation. " "If this resource or any of its child resources are part of a deployed configuration, " "this delete will fail.") @@ -740,8 +740,8 @@ def network_manager_admin_rule_delete(client, configuration_name, rule_collection_name, rule_name, - force=None): - if force is None or force is False: + force=False): + if force is False: print("The \'--force\' flag was not provided for the delete operation. " "If this resource or any of its child resources are part of a deployed configuration, " "this delete will fail.") diff --git a/src/network-manager/setup.py b/src/network-manager/setup.py index 9fecabe5bcc..972cf48484e 100644 --- a/src/network-manager/setup.py +++ b/src/network-manager/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '0.5.2' +VERSION = '0.5.3' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers From 3d14c642d2691f68b8704e5f037991ef417500af Mon Sep 17 00:00:00 2001 From: necusjz Date: Tue, 30 Aug 2022 11:32:56 +0800 Subject: [PATCH 2/3] Update src/network-manager/HISTORY.rst --- src/network-manager/HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network-manager/HISTORY.rst b/src/network-manager/HISTORY.rst index b2f4b0f2f06..6a704c38fa0 100644 --- a/src/network-manager/HISTORY.rst +++ b/src/network-manager/HISTORY.rst @@ -4,7 +4,7 @@ Release History =============== 0.5.3 +++++ -* Fix issue for https://github.com/Azure/azure-cli/issues/23707 +* Fix force delete behavior. 0.5.2 +++++ From 01e79864450c5c786051192805e9093dc18334c4 Mon Sep 17 00:00:00 2001 From: ZengTaoxu Date: Tue, 30 Aug 2022 13:23:54 +0800 Subject: [PATCH 3/3] Update HISTORY.rst --- src/network-manager/HISTORY.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network-manager/HISTORY.rst b/src/network-manager/HISTORY.rst index b2f4b0f2f06..6a704c38fa0 100644 --- a/src/network-manager/HISTORY.rst +++ b/src/network-manager/HISTORY.rst @@ -4,7 +4,7 @@ Release History =============== 0.5.3 +++++ -* Fix issue for https://github.com/Azure/azure-cli/issues/23707 +* Fix force delete behavior. 0.5.2 +++++