You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2020/03/02 09:51:20 UTC
[incubator-dlab] branch DLAB-1546 updated: [DLAB-1546]: added name
convention changes
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new 0d58ec2 [DLAB-1546]: added name convention changes
0d58ec2 is described below
commit 0d58ec27b132d8a097f8299121a6a6c0b0c3f987
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Mar 2 11:51:09 2020 +0200
[DLAB-1546]: added name convention changes
---
.../src/general/scripts/azure/ssn_configure.py | 21 ++++----
.../src/general/scripts/azure/ssn_prepare.py | 61 +++++++++++-----------
2 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 52500eb..df01ae1 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -40,19 +40,20 @@ if __name__ == "__main__":
filename=local_log_filepath)
def clear_resources():
- if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
- if 'azure_vpc_name' not in os.environ:
- AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
- if 'azure_subnet_name' not in os.environ:
- AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
- ssn_conf['subnet_name'])
- if 'azure_security_group_name' not in os.environ:
- AzureActions.remove_security_group(ssn_conf['resource_group_name'], ssn_conf['security_group_name'])
+ AzureActions.remove_instance(ssn_conf['resource_group_name'], ssn_conf['instance_name'])
for datalake in AzureMeta.list_datalakes(ssn_conf['resource_group_name']):
if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
AzureActions.delete_datalake_store(ssn_conf['resource_group_name'], datalake.name)
- AzureActions.remove_instance(ssn_conf['resource_group_name'], ssn_conf['instance_name'])
+ if 'azure_security_group_name' not in os.environ:
+ AzureActions.remove_security_group(ssn_conf['resource_group_name'], ssn_conf['security_group_name'])
+ if 'azure_subnet_name' not in os.environ:
+ AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
+ ssn_conf['subnet_name'])
+ if 'azure_vpc_name' not in os.environ:
+ AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
+ if 'azure_resource_group_name' not in os.environ:
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
+
try:
AzureMeta = dlab.meta_lib.AzureMeta()
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
index f09d1a0..3181ab5 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
@@ -130,7 +130,7 @@ if __name__ == "__main__":
dlab.fab.append_result("Failed to create VPC.", str(err))
try:
if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
except Exception as err:
dlab.fab.append_result("Resources hasn't been removed.", str(err))
sys.exit(1)
@@ -150,10 +150,10 @@ if __name__ == "__main__":
traceback.print_exc()
dlab.fab.append_result("Failed to create Subnet.", str(err))
try:
- if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
if 'azure_vpc_name' not in os.environ:
AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
+ if 'azure_resource_group_name' not in os.environ:
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
except Exception as err:
print("Resources hasn't been removed: {}".format(str(err)))
dlab.fab.append_result("Resources hasn't been removed.", str(err))
@@ -171,10 +171,10 @@ if __name__ == "__main__":
except Exception as err:
traceback.print_exc()
try:
- if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
if 'azure_vpc_name' not in os.environ:
AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
+ if 'azure_resource_group_name' not in os.environ:
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
except Exception as err:
print("Resources hasn't been removed: " + str(err))
dlab.fab.append_result("Resources hasn't been removed.", str(err))
@@ -242,13 +242,13 @@ if __name__ == "__main__":
traceback.print_exc()
dlab.fab.append_result("Error creating Security group", str(err))
try:
- if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
- if 'azure_vpc_name' not in os.environ:
- AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
if 'azure_subnet_name' not in os.environ:
AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
ssn_conf['subnet_name'])
+ if 'azure_vpc_name' not in os.environ:
+ AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
+ if 'azure_resource_group_name' not in os.environ:
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
except Exception as err:
print("Resources hasn't been removed: " + str(err))
dlab.fab.append_result("Resources hasn't been removed.", str(err))
@@ -281,18 +281,18 @@ if __name__ == "__main__":
except Exception as err:
traceback.print_exc()
dlab.fab.append_result("Failed to create Data Lake Store.", str(err))
- if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
- if 'azure_vpc_name' not in os.environ:
- AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
- if 'azure_subnet_name' not in os.environ:
- AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
- ssn_conf['subnet_name'])
- if 'azure_security_group_name' not in os.environ:
- AzureActions.remove_security_group(ssn_conf['resource_group_name'], ssn_conf['security_group_name'])
for datalake in AzureMeta.list_datalakes(ssn_conf['resource_group_name']):
if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
AzureActions.delete_datalake_store(ssn_conf['resource_group_name'], datalake.name)
+ if 'azure_security_group_name' not in os.environ:
+ AzureActions.remove_security_group(ssn_conf['resource_group_name'], ssn_conf['security_group_name'])
+ if 'azure_subnet_name' not in os.environ:
+ AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
+ ssn_conf['subnet_name'])
+ if 'azure_vpc_name' not in os.environ:
+ AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
+ if 'azure_resource_group_name' not in os.environ:
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
sys.exit(1)
if os.environ['conf_os_family'] == 'debian':
@@ -319,20 +319,21 @@ if __name__ == "__main__":
except Exception as err:
traceback.print_exc()
dlab.fab.append_result("Failed to create instance.", str(err))
- if 'azure_resource_group_name' not in os.environ:
- AzureActions.remove_resource_group(ssn_conf['service_base_name'], ssn_conf['region'])
- if 'azure_vpc_name' not in os.environ:
- AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
- if 'azure_subnet_name' not in os.environ:
- AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
- ssn_conf['subnet_name'])
- if 'azure_security_group_name' not in os.environ:
- AzureActions.remove_security_group(ssn_conf['resource_group_name'], ssn_conf['security_group_name'])
- for datalake in AzureMeta.list_datalakes(ssn_conf['resource_group_name']):
- if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
- AzureActions.delete_datalake_store(ssn_conf['resource_group_name'], datalake.name)
try:
AzureActions.remove_instance(ssn_conf['resource_group_name'], ssn_conf['instance_name'])
except:
print("The instance {} hasn't been created".format(ssn_conf['instance_name']))
+ for datalake in AzureMeta.list_datalakes(ssn_conf['resource_group_name']):
+ if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
+ AzureActions.delete_datalake_store(ssn_conf['resource_group_name'], datalake.name)
+ if 'azure_security_group_name' not in os.environ:
+ AzureActions.remove_security_group(ssn_conf['resource_group_name'], ssn_conf['security_group_name'])
+ if 'azure_subnet_name' not in os.environ:
+ AzureActions.remove_subnet(ssn_conf['resource_group_name'], ssn_conf['vpc_name'],
+ ssn_conf['subnet_name'])
+ if 'azure_vpc_name' not in os.environ:
+ AzureActions.remove_vpc(ssn_conf['resource_group_name'], ssn_conf['vpc_name'])
+ if 'azure_resource_group_name' not in os.environ:
+ AzureActions.remove_resource_group(ssn_conf['resource_group_name'], ssn_conf['region'])
+
sys.exit(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org