This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-2321
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git


The following commit(s) were added to refs/heads/DATALAB-2321 by this push:
     new 5b3b39d  [DATALAB-2321]: added output
5b3b39d is described below

commit 5b3b39d21e76d81554e8778d1f4a6c4ed1a62800
Author: leonidfrolov <[email protected]>
AuthorDate: Mon May 17 17:02:01 2021 +0300

    [DATALAB-2321]: added output
---
 .../src/general/scripts/azure/ssn_terminate.py                     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py 
b/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py
index 87fa6de..b5f2e18 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_terminate.py
@@ -118,10 +118,9 @@ def terminate_ssn_node(resource_group_name, 
service_base_name, vpc_name, region)
         print("Removing subnets in predefined VPC")
         try:
             for subnet in AzureMeta.list_subnets(resource_group_name, 
os.environ['azure_vpc_name']):
-                print('========1')
-                print(str(subnet)[str(subnet).find("'name': ") + 8 : 
str(subnet).find("', 'etag':")])
-                if "'name': '{}".format(service_base_name) in subnet['name']:
-                    AzureActions.remove_subnet(resource_group_name, 
os.environ['azure_vpc_name'], subnet['name'])
+                subnet_name = str(subnet)[str(subnet).find("'name': '") + 9 : 
str(subnet).find("', 'etag':")]
+                if service_base_name in subnet_name:
+                    AzureActions.remove_subnet(resource_group_name, 
os.environ['azure_vpc_name'], subnet_name)
                     print("Subnet {} has been removed from VPC 
{}".format(i['name'], os.environ['azure_vpc_name']))
         except Exception as err:
             datalab.fab.append_result("Failed to remove subnets in predefined 
VPC", str(err))

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to