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 40fdff7 [DLAB-1546]: added name convention changes
40fdff7 is described below
commit 40fdff780cffd3af8e30f713c71ab0dee76113bd
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Mar 2 15:38:46 2020 +0200
[DLAB-1546]: added name convention changes
---
.../scripts/gcp/common_notebook_configure_dataengine-service.py | 6 +++---
.../general/scripts/gcp/common_notebook_configure_dataengine.py | 8 ++++----
.../src/general/scripts/gcp/common_prepare_notebook.py | 9 +++++----
.../src/general/scripts/gcp/common_stop_notebook.py | 4 ++--
.../src/general/scripts/gcp/common_terminate_notebook.py | 4 ++--
.../src/general/scripts/gcp/dataengine-service_configure.py | 8 ++++----
.../src/general/scripts/gcp/dataengine-service_prepare.py | 8 ++++----
.../src/general/scripts/gcp/dataengine-service_terminate.py | 4 ++--
.../src/general/scripts/gcp/dataengine_configure.py | 8 ++++----
.../src/general/scripts/gcp/dataengine_prepare.py | 8 ++++----
.../src/general/scripts/gcp/dataengine_start.py | 8 ++++----
.../src/general/scripts/gcp/dataengine_stop.py | 8 ++++----
.../src/general/scripts/gcp/dataengine_terminate.py | 8 ++++----
.../src/general/scripts/gcp/deeplearning_configure.py | 6 +++---
.../src/general/scripts/gcp/edge_configure.py | 4 ++--
.../src/general/scripts/gcp/edge_start.py | 4 ++--
infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py | 4 ++--
.../src/general/scripts/gcp/jupyter_configure.py | 6 +++---
.../src/general/scripts/gcp/jupyterlab_configure.py | 6 +++---
.../src/general/scripts/gcp/project_prepare.py | 4 ++--
.../src/general/scripts/gcp/project_terminate.py | 4 ++--
.../src/general/scripts/gcp/rstudio_configure.py | 6 +++---
.../src/general/scripts/gcp/ssn_configure.py | 2 +-
.../src/general/scripts/gcp/ssn_prepare.py | 2 +-
.../src/general/scripts/gcp/ssn_terminate.py | 2 +-
.../src/general/scripts/gcp/superset_configure.py | 6 +++---
.../src/general/scripts/gcp/tensor-rstudio_configure.py | 6 +++---
.../src/general/scripts/gcp/tensor_configure.py | 6 +++---
.../src/general/scripts/gcp/zeppelin_configure.py | 6 +++---
29 files changed, 83 insertions(+), 82 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
index 417a856..0c08cde 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
@@ -56,9 +56,9 @@ if __name__ == "__main__":
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['tag_name'] = notebook_config['service_base_name'] + '-tag'
notebook_config['bucket_name'] =
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
@@ -83,7 +83,7 @@ if __name__ == "__main__":
"project_tag": notebook_config['project_tag'],
"endpoint_tag": notebook_config['endpoint_tag'],
"product": "dlab",
- "computational_name": (os.environ['computational_name'])
+ "computational_name": (os.environ['computational_name'].replace('_',
'-'))
}
try:
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
index 73a8c60..46dad3a 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
@@ -55,19 +55,19 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
notebook_config = dict()
if 'exploratory_name' in os.environ:
- notebook_config['exploratory_name'] =
os.environ['exploratory_name']
+ notebook_config['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
notebook_config['exploratory_name'] = ''
if 'computational_name' in os.environ:
- notebook_config['computational_name'] =
os.environ['computational_name']
+ notebook_config['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
notebook_config['computational_name'] = ''
notebook_config['service_base_name'] =
os.environ['conf_service_base_name']
notebook_config['region'] = os.environ['gcp_region']
notebook_config['zone'] = os.environ['gcp_zone']
notebook_config['user_name'] = os.environ['edge_user_name']
- notebook_config['project_name'] = os.environ['project_name']
- notebook_config['endpoint_name'] = os.environ['endpoint_name']
+ notebook_config['project_name'] =
os.environ['project_name'].replace('_', '-')
+ notebook_config['endpoint_name'] =
os.environ['endpoint_name'].replace('_', '-')
notebook_config['cluster_name'] =
"{}-{}-{}-de-{}".format(notebook_config['service_base_name'],
notebook_config['project_name'],
notebook_config['endpoint_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index e6ddc00..cc9cadb 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -47,9 +47,9 @@ if __name__ == "__main__":
notebook_config = dict()
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = os.environ['endpoint_name']
+ notebook_config['endpoint_name'] =
os.environ['endpoint_name'].replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['region'] = os.environ['gcp_region']
notebook_config['zone'] = os.environ['gcp_zone']
@@ -77,8 +77,9 @@ if __name__ == "__main__":
notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
except:
notebook_config['exploratory_name'] = ''
- notebook_config['subnet_name'] =
'{0}-{1}-subnet'.format(notebook_config['service_base_name'],
-
notebook_config['project_name'])
+ notebook_config['subnet_name'] =
'{0}-{1}-{2}-subnet'.format(notebook_config['service_base_name'],
+
notebook_config['project_name'],
+
notebook_config['endpoint_tag'])
notebook_config['instance_size'] =
os.environ['gcp_notebook_instance_size']
notebook_config['ssh_key_path'] =
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
notebook_config['notebook_service_account_name'] =
'{}-{}-{}-ps-sa'.format(notebook_config['service_base_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_stop_notebook.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_stop_notebook.py
index 5bbc8fc..e72a680 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_stop_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_stop_notebook.py
@@ -97,8 +97,8 @@ if __name__ == "__main__":
notebook_config = dict()
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
notebook_config['bucket_name'] =
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_terminate_notebook.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_terminate_notebook.py
index b70bc4e..e62faf5 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_terminate_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_terminate_notebook.py
@@ -90,8 +90,8 @@ if __name__ == "__main__":
notebook_config = dict()
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['notebook_name'] = os.environ['notebook_instance_name']
notebook_config['bucket_name'] =
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
index 7476d12..d06e7b1 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -128,17 +128,17 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
dataproc_conf = dict()
if 'exploratory_name' in os.environ:
- dataproc_conf['exploratory_name'] = os.environ['exploratory_name']
+ dataproc_conf['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
dataproc_conf['exploratory_name'] = ''
if 'computational_name' in os.environ:
- dataproc_conf['computational_name'] =
os.environ['computational_name']
+ dataproc_conf['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
dataproc_conf['computational_name'] = ''
dataproc_conf['service_base_name'] =
(os.environ['conf_service_base_name'])
dataproc_conf['edge_user_name'] = (os.environ['edge_user_name'])
- dataproc_conf['project_name'] = (os.environ['project_name'])
- dataproc_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ dataproc_conf['project_name'] =
(os.environ['project_name']).replace('_', '-')
+ dataproc_conf['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
dataproc_conf['key_name'] = os.environ['conf_key_name']
dataproc_conf['key_path'] =
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
dataproc_conf['region'] = os.environ['gcp_region']
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
index 6afa054..5fe8e61 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
@@ -48,20 +48,20 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
dataproc_conf = dict()
if 'exploratory_name' in os.environ:
- dataproc_conf['exploratory_name'] = os.environ['exploratory_name']
+ dataproc_conf['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
dataproc_conf['exploratory_name'] = ''
if 'computational_name' in os.environ:
- dataproc_conf['computational_name'] =
os.environ['computational_name']
+ dataproc_conf['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
dataproc_conf['computational_name'] = ''
if
os.path.exists('/response/.dataproc_creating_{}'.format(dataproc_conf['exploratory_name'])):
time.sleep(30)
dataproc_conf['service_base_name'] =
(os.environ['conf_service_base_name'])
dataproc_conf['edge_user_name'] = (os.environ['edge_user_name'])
- dataproc_conf['project_name'] = (os.environ['project_name'])
+ dataproc_conf['project_name'] =
(os.environ['project_name']).replace('_', '-')
dataproc_conf['project_tag'] = dataproc_conf['project_name']
- dataproc_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ dataproc_conf['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
dataproc_conf['endpoint_tag'] = dataproc_conf['endpoint_name']
dataproc_conf['key_name'] = os.environ['conf_key_name']
dataproc_conf['key_path'] =
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_terminate.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_terminate.py
index 5975eb2..5d221d5 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_terminate.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_terminate.py
@@ -67,8 +67,8 @@ if __name__ == "__main__":
dataproc_conf = dict()
dataproc_conf['service_base_name'] = os.environ['conf_service_base_name']
dataproc_conf['edge_user_name'] = (os.environ['edge_user_name'])
- dataproc_conf['project_name'] = (os.environ['project_name'])
- dataproc_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ dataproc_conf['project_name'] = (os.environ['project_name']).replace('_',
'-')
+ dataproc_conf['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
dataproc_conf['dataproc_name'] = os.environ['dataproc_cluster_name']
dataproc_conf['gcp_project_id'] = os.environ['gcp_project_id']
dataproc_conf['gcp_region'] = os.environ['gcp_region']
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
index 43f31f8..e5fa0d3 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
@@ -149,8 +149,8 @@ if __name__ == "__main__":
data_engine = dict()
data_engine['service_base_name'] =
(os.environ['conf_service_base_name'])
data_engine['edge_user_name'] = (os.environ['edge_user_name'])
- data_engine['project_name'] = (os.environ['project_name'])
- data_engine['endpoint_name'] = os.environ['endpoint_name']
+ data_engine['project_name'] =
(os.environ['project_name']).replace('_', '-')
+ data_engine['endpoint_name'] =
os.environ['endpoint_name'].replace('_', '-')
data_engine['endpoint_tag'] = data_engine['endpoint_name']
data_engine['region'] = os.environ['gcp_region']
data_engine['zone'] = os.environ['gcp_zone']
@@ -162,11 +162,11 @@ if __name__ == "__main__":
except KeyError:
data_engine['vpc_name'] =
'{}-vpc'.format(data_engine['service_base_name'])
if 'exploratory_name' in os.environ:
- data_engine['exploratory_name'] = os.environ['exploratory_name']
+ data_engine['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
data_engine['exploratory_name'] = ''
if 'computational_name' in os.environ:
- data_engine['computational_name'] =
os.environ['computational_name']
+ data_engine['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
data_engine['computational_name'] = ''
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
index df3ab49..1e75647 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
@@ -47,9 +47,9 @@ if __name__ == "__main__":
data_engine = dict()
data_engine['service_base_name'] =
(os.environ['conf_service_base_name'])
data_engine['edge_user_name'] = (os.environ['edge_user_name'])
- data_engine['project_name'] = (os.environ['project_name'])
+ data_engine['project_name'] =
(os.environ['project_name']).replace('_', '-')
data_engine['project_tag'] = data_engine['project_name']
- data_engine['endpoint_name'] = os.environ['endpoint_name']
+ data_engine['endpoint_name'] =
os.environ['endpoint_name'].replace('_', '-')
data_engine['endpoint_tag'] = data_engine['endpoint_name']
data_engine['region'] = os.environ['gcp_region']
data_engine['zone'] = os.environ['gcp_zone']
@@ -74,11 +74,11 @@ if __name__ == "__main__":
except KeyError:
data_engine['vpc_name'] =
'{}-vpc'.format(data_engine['service_base_name'])
if 'exploratory_name' in os.environ:
- data_engine['exploratory_name'] = os.environ['exploratory_name']
+ data_engine['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
data_engine['exploratory_name'] = ''
if 'computational_name' in os.environ:
- data_engine['computational_name'] =
os.environ['computational_name']
+ data_engine['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
data_engine['computational_name'] = ''
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
index 68cbce1..3d40cbe 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_start.py
@@ -58,18 +58,18 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
data_engine = dict()
if 'exploratory_name' in os.environ:
- data_engine['exploratory_name'] = os.environ['exploratory_name']
+ data_engine['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
data_engine['exploratory_name'] = ''
if 'computational_name' in os.environ:
- data_engine['computational_name'] = os.environ['computational_name']
+ data_engine['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
data_engine['computational_name'] = ''
data_engine['service_base_name'] = os.environ['conf_service_base_name']
data_engine['zone'] = os.environ['gcp_zone']
data_engine['user_name'] = os.environ['edge_user_name']
- data_engine['project_name'] = os.environ['project_name']
- data_engine['endpoint_name'] = os.environ['endpoint_name']
+ data_engine['project_name'] = os.environ['project_name'].replace('_', '-')
+ data_engine['endpoint_name'] = os.environ['endpoint_name'].replace('_',
'-')
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_stop.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_stop.py
index b5275cc..6f9f0d9 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_stop.py
@@ -57,18 +57,18 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
data_engine = dict()
if 'exploratory_name' in os.environ:
- data_engine['exploratory_name'] = os.environ['exploratory_name']
+ data_engine['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
data_engine['exploratory_name'] = ''
if 'computational_name' in os.environ:
- data_engine['computational_name'] = os.environ['computational_name']
+ data_engine['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
data_engine['computational_name'] = ''
data_engine['service_base_name'] = os.environ['conf_service_base_name']
data_engine['zone'] = os.environ['gcp_zone']
data_engine['user_name'] = os.environ['edge_user_name']
- data_engine['project_name'] = os.environ['project_name']
- data_engine['endpoint_name'] = os.environ['endpoint_name']
+ data_engine['project_name'] = os.environ['project_name'].replace('_', '-')
+ data_engine['endpoint_name'] = os.environ['endpoint_name'].replace('_',
'-')
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_terminate.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_terminate.py
index 1966f4d..7a073f9 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_terminate.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_terminate.py
@@ -64,18 +64,18 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
data_engine = dict()
if 'exploratory_name' in os.environ:
- data_engine['exploratory_name'] = os.environ['exploratory_name']
+ data_engine['exploratory_name'] =
os.environ['exploratory_name'].replace('_', '-')
else:
data_engine['exploratory_name'] = ''
if 'computational_name' in os.environ:
- data_engine['computational_name'] = os.environ['computational_name']
+ data_engine['computational_name'] =
os.environ['computational_name'].replace('_', '-')
else:
data_engine['computational_name'] = ''
data_engine['service_base_name'] = os.environ['conf_service_base_name']
data_engine['zone'] = os.environ['gcp_zone']
data_engine['user_name'] = os.environ['edge_user_name']
- data_engine['project_name'] = os.environ['project_name']
- data_engine['endpoint_name'] = os.environ['endpoint_name']
+ data_engine['project_name'] = os.environ['project_name'].replace('_', '-')
+ data_engine['endpoint_name'] = os.environ['endpoint_name'].replace('_',
'-')
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
index 3615dfb..a47c681 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
@@ -44,16 +44,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index c7e8f42..66d5715 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -65,8 +65,8 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
edge_conf = dict()
edge_conf['service_base_name'] = (os.environ['conf_service_base_name'])
- edge_conf['project_name'] = (os.environ['project_name'])
- edge_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ edge_conf['project_name'] = (os.environ['project_name']).replace('_',
'-')
+ edge_conf['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
edge_conf['key_name'] = os.environ['conf_key_name']
edge_conf['user_keyname'] = edge_conf['project_name']
try:
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
index 0cc15b6..599aae4 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_start.py
@@ -44,8 +44,8 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
edge_conf = dict()
edge_conf['service_base_name'] = (os.environ['conf_service_base_name'])
- edge_conf['project_name'] = (os.environ['project_name'])
- edge_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ edge_conf['project_name'] = (os.environ['project_name']).replace('_', '-')
+ edge_conf['endpoint_name'] = (os.environ['endpoint_name']).replace('_',
'-')
edge_conf['instance_name'] =
'{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
edge_conf['project_name'], edge_conf['endpoint_name'])
edge_conf['region'] = os.environ['gcp_region']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
index fe9a2f61..e0e1410 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_stop.py
@@ -44,8 +44,8 @@ if __name__ == "__main__":
edge_conf = dict()
edge_conf['service_base_name'] = (os.environ['conf_service_base_name'])
edge_conf['zone'] = os.environ['gcp_zone']
- edge_conf['project_name'] = (os.environ['project_name'])
- edge_conf['endpoint_name'] = os.environ['endpoint_name']
+ edge_conf['project_name'] = (os.environ['project_name']).replace('_', '-')
+ edge_conf['endpoint_name'] = os.environ['endpoint_name'].replace('_', '-')
edge_conf['instance_name'] =
'{0}-{1}-{2}-edge'.format(edge_conf['service_base_name'],
edge_conf['project_name'], edge_conf['endpoint_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
index 3c287ad..604d295 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
@@ -44,16 +44,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
index 6331a67..20932dd 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
@@ -44,16 +44,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index d629add..9c29ee9 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -50,10 +50,10 @@ if __name__ == "__main__":
project_conf['ps_unique_index'] = str(uuid.uuid4())[:5]
project_conf['service_base_name'] =
(os.environ['conf_service_base_name'])
project_conf['key_name'] = os.environ['conf_key_name']
- project_conf['project_name'] = (os.environ['project_name'])
+ project_conf['project_name'] =
(os.environ['project_name']).replace('_', '-')
project_conf['user_keyname'] = project_conf['project_name']
project_conf['project_tag'] = (project_conf['project_name'])
- project_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ project_conf['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
project_conf['endpoint_tag'] = project_conf['endpoint_name']
try:
if os.environ['gcp_vpc_name'] == '':
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
index 6c62f8a..9138164 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
@@ -145,8 +145,8 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
project_conf = dict()
project_conf['service_base_name'] = (os.environ['conf_service_base_name'])
- project_conf['project_name'] = (os.environ['project_name'])
- project_conf['endpoint_name'] = (os.environ['endpoint_name'])
+ project_conf['project_name'] = (os.environ['project_name']).replace('_',
'-')
+ project_conf['endpoint_name'] = (os.environ['endpoint_name']).replace('_',
'-')
project_conf['project_tag'] = project_conf['project_name']
project_conf['region'] = os.environ['gcp_region']
project_conf['zone'] = os.environ['gcp_zone']
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
index 04ce339..5a25e39 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
@@ -45,16 +45,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 3a2026d..a946d43 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
ssn_conf['ssn_unique_index'] = args.ssn_unique_index
ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] =
dlab.fab.replace_multi_symbols(
- os.environ['conf_service_base_name'][:20], '-', True)
+ os.environ['conf_service_base_name'.replace('_', '-')][:20], '-',
True)
ssn_conf['instance_name'] =
'{}-ssn'.format(ssn_conf['service_base_name'])
ssn_conf['role_name'] =
'{}-{}-ssn-role'.format(ssn_conf['service_base_name'],
ssn_conf['ssn_unique_index'])
ssn_conf['region'] = os.environ['gcp_region']
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
index 46d8bd3..8b0d7ae 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
@@ -54,7 +54,7 @@ if __name__ == "__main__":
print('[DERIVING NAMES]')
ssn_conf['ssn_unique_index'] = args.ssn_unique_index
ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] =
dlab.fab.replace_multi_symbols(
- os.environ['conf_service_base_name'][:20], '-', True)
+ os.environ['conf_service_base_name'].replace('_', '-')[:20],
'-', True)
ssn_conf['region'] = os.environ['gcp_region']
ssn_conf['zone'] = os.environ['gcp_zone']
ssn_conf['instance_name'] =
'{}-ssn'.format(ssn_conf['service_base_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
index 0e8af9e..429f638 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_terminate.py
@@ -42,7 +42,7 @@ if __name__ == "__main__":
print('Generating infrastructure names and tags')
ssn_conf = dict()
ssn_conf['service_base_name'] = dlab.fab.replace_multi_symbols(
- os.environ['conf_service_base_name'][:20], '-', True)
+ os.environ['conf_service_base_name'].replace('_', '-')[:20], '-', True)
ssn_conf['region'] = os.environ['gcp_region']
ssn_conf['zone'] = os.environ['gcp_zone']
pre_defined_vpc = False
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
index 12892ed..0f54247 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
@@ -46,16 +46,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
index 5a0fa0d..314e9e0 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
@@ -49,16 +49,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
index bab0c2f..e5fffeb 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
@@ -45,16 +45,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
index 2d2310b..19c0ef4 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
@@ -45,16 +45,16 @@ if __name__ == "__main__":
GCPActions = dlab.actions_lib.GCPActions()
notebook_config = dict()
try:
- notebook_config['exploratory_name'] =
(os.environ['exploratory_name'])
+ notebook_config['exploratory_name'] =
(os.environ['exploratory_name']).replace('_', '-')
except:
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] =
(os.environ['conf_service_base_name'])
notebook_config['instance_type'] =
os.environ['gcp_notebook_instance_size']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] = (os.environ['edge_user_name'])
- notebook_config['project_name'] = (os.environ['project_name'])
+ notebook_config['project_name'] =
(os.environ['project_name']).replace('_', '-')
notebook_config['project_tag'] = notebook_config['project_name']
- notebook_config['endpoint_name'] = (os.environ['endpoint_name'])
+ notebook_config['endpoint_name'] =
(os.environ['endpoint_name']).replace('_', '-')
notebook_config['endpoint_tag'] = notebook_config['endpoint_name']
notebook_config['instance_name'] =
'{0}-{1}-{2}-nb-{3}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]