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 e7399ab  [DLAB-1546]: added name convention changes
e7399ab is described below

commit e7399abfd74a6c7c459dc6b8deac20b272f9a87a
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Mar 2 13:24:58 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/aws/common_notebook_configure_dataengine.py | 6 +++---
 .../src/general/scripts/aws/dataengine-service_prepare.py           | 4 ++--
 .../general/scripts/azure/common_notebook_configure_dataengine.py   | 2 +-
 .../src/general/scripts/gcp/dataengine-service_prepare.py           | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
index 8de85cd..c80328b 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
@@ -34,10 +34,10 @@ from fabric.api import *
 
 
 def clear_resources():
-    remove_ec2(notebook_config['tag_name'], 
notebook_config['master_node_name'])
+    dlab.actions_lib.remove_ec2(notebook_config['tag_name'], 
notebook_config['master_node_name'])
     for i in range(notebook_config['instance_count'] - 1):
         slave_name = notebook_config['slave_node_name'] + '{}'.format(i + 1)
-        remove_ec2(notebook_config['tag_name'], slave_name)
+        dlab.actions_lib.remove_ec2(notebook_config['tag_name'], slave_name)
 
 
 if __name__ == "__main__":
@@ -70,7 +70,7 @@ if __name__ == "__main__":
         notebook_config['cluster_name'] = 
"{}-{}-{}-de-{}".format(notebook_config['service_base_name'],
                                                                   
notebook_config['project_name'],
                                                                   
notebook_config['endpoint_name'],
-                                                                  
notebook_config['exploratory_name'])
+                                                                  
notebook_config['computational_name'])
         notebook_config['master_node_name'] = notebook_config['cluster_name'] 
+ '-m'
         notebook_config['slave_node_name'] = notebook_config['cluster_name'] + 
'-s'
         notebook_config['notebook_name'] = os.environ['notebook_instance_name']
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
index 8bb1bce..9031aed 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -95,8 +95,8 @@ if __name__ == "__main__":
             emr_conf['tag_name'], 
os.environ['notebook_instance_name']).get('Private')
         emr_conf['role_service_name'] = os.environ['emr_service_role']
         emr_conf['role_ec2_name'] = os.environ['emr_ec2_role']
-        emr_conf['tags'] = 'Name={0}-{1}-{5}-des-{2},' \
-                           '{0}-tag={0}-{1}-{5}-des-{2},' \
+        emr_conf['tags'] = 'Name={0}-{1}-{5}-des-{3},' \
+                           '{0}-tag={0}-{1}-{5}-des-{3},' \
                            'Notebook={4},' \
                            'State=not-configured,' \
                            'ComputationalName={3},' \
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
 
b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
index 0015782..2e697eb 100644
--- 
a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
+++ 
b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
@@ -73,7 +73,7 @@ if __name__ == "__main__":
         notebook_config['cluster_name'] = 
'{}-{}-{}-de-{}'.format(notebook_config['service_base_name'],
                                                                   
notebook_config['project_name'],
                                                                   
notebook_config['endpoint_name'],
-                                                                  
notebook_config['exploratory_name'])
+                                                                  
notebook_config['computational_name'])
         notebook_config['master_node_name'] = notebook_config['cluster_name'] 
+ '-m'
         notebook_config['slave_node_name'] = notebook_config['cluster_name'] + 
'-s'
         notebook_config['notebook_name'] = os.environ['notebook_instance_name']
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 0e46c80..6afa054 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
@@ -68,11 +68,12 @@ if __name__ == "__main__":
         dataproc_conf['region'] = os.environ['gcp_region']
         dataproc_conf['zone'] = os.environ['gcp_zone']
         dataproc_conf['subnet'] = 
'{0}-{1}-{2}-subnet'.format(dataproc_conf['service_base_name'],
-                                                              
dataproc_conf['project_name'], dataproc_conf['endpoint_name'])
+                                                              
dataproc_conf['project_name'],
+                                                              
dataproc_conf['endpoint_name'])
         dataproc_conf['cluster_name'] = 
'{0}-{1}-{2}-des-{3}'.format(dataproc_conf['service_base_name'],
                                                                      
dataproc_conf['project_name'],
                                                                      
dataproc_conf['endpoint_name'],
-                                                                     
dataproc_conf['exploratory_name'])
+                                                                     
dataproc_conf['computational_name'])
         dataproc_conf['cluster_tag'] = 
'{0}-{1}-{2}-ps'.format(dataproc_conf['service_base_name'],
                                                                
dataproc_conf['project_name'],
                                                                
dataproc_conf['endpoint_name'])


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

Reply via email to