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

commit 83eda0358efff53899d021ada6baf74eb24607aa
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Mar 6 12:54:19 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../scripts/aws/dataengine-service_configure.py       | 13 +++++--------
 .../src/general/scripts/aws/dataengine_configure.py   | 14 +++++---------
 .../src/general/scripts/aws/deeplearning_configure.py | 17 ++++++++---------
 .../src/general/scripts/aws/jupyter_configure.py      | 15 ++++++---------
 .../src/general/scripts/aws/jupyterlab_configure.py   | 14 ++++++--------
 .../src/general/scripts/aws/rstudio_configure.py      | 15 ++++++---------
 .../general/scripts/aws/tensor-rstudio_configure.py   | 19 ++++++++-----------
 .../src/general/scripts/aws/tensor_configure.py       | 17 ++++++++---------
 .../src/general/scripts/aws/zeppelin_configure.py     | 14 ++++++--------
 9 files changed, 58 insertions(+), 80 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index da9aec8..026b4b0 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -223,12 +223,8 @@ if __name__ == "__main__":
                                                                    
emr_conf['project_name'], emr_conf['endpoint_name'])
         emr_conf['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_private_ip_address(
             emr_conf['tag_name'], emr_conf['edge_instance_name'])
-        if emr_conf['network_type'] == 'private':
-            emr_conf['edge_instance_ip'] = 
dlab.meta_lib.get_instance_ip_address(
-                emr_conf['tag_name'], 
emr_conf['edge_instance_name']).get('Private')
-        else:
-            emr_conf['edge_instance_ip'] = 
dlab.meta_lib.get_instance_ip_address(
-                emr_conf['tag_name'], 
emr_conf['edge_instance_name']).get('Public')
+        emr_conf['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(emr_conf['tag_name'],
+                                                                               
  emr_conf['edge_instance_name'])
         emr_conf['user_keyname'] = emr_conf['project_name']
         emr_conf['os_user'] = os.environ['conf_os_user']
         emr_conf['initial_user'] = 'ec2-user'
@@ -257,8 +253,9 @@ if __name__ == "__main__":
         logging.info('[SUMMARY]')
         ip_address = 
emr_conf['cluster_master_instances'][0].get('PrivateIpAddress')
         emr_master_url = "http://"; + ip_address + ":8088"
-        emr_master_acces_url = "https://"; + emr_conf['edge_instance_ip'] + 
"/{}/".format(
-            '{}_{}'.format(emr_conf['exploratory_name'], 
emr_conf['computational_name']))
+        emr_master_acces_url = 
"https://{}/{}_{}/".format(emr_conf['edge_instance_hostname'],
+                                                          
emr_conf['exploratory_name'],
+                                                          
emr_conf['computational_name'])
         logging.info('[SUMMARY]')
         print('[SUMMARY]')
         print("Service base name: {}".format(emr_conf['service_base_name']))
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
index 8eba4a8..e0a4f0c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -203,13 +203,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(data_engine['tag_name'], edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(data_engine['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if data_engine['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(data_engine['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(data_engine['tag_name'],
-                                                                     
edge_instance_name).get('Public')
-
+        data_engine['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(data_engine['tag_name'],
+                                                                               
     edge_instance_name)
         if os.environ['conf_os_family'] == 'debian':
             data_engine['initial_user'] = 'ubuntu'
             data_engine['sudo_group'] = 'sudo'
@@ -384,8 +379,9 @@ if __name__ == "__main__":
         ip_address = 
dlab.meta_lib.get_instance_ip_address(data_engine['tag_name'],
                                                            
data_engine['master_node_name']).get('Private')
         spark_master_url = "http://"; + ip_address + ":8080"
-        spark_master_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(data_engine['exploratory_name'] +
-                                                                               
 '_' + data_engine['computational_name'])
+        spark_master_access_url = 
"https://{}/{}_{}/".format(data_engine['edge_instance_hostname'],
+                                                             
data_engine['exploratory_name'],
+                                                             
data_engine['computational_name'])
         logging.info('[SUMMARY]')
         print('[SUMMARY]')
         print("Service base name: {}".format(data_engine['service_base_name']))
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index 91a6f44..a2ca856 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -93,12 +93,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
     except Exception as err:
@@ -308,9 +304,12 @@ if __name__ == "__main__":
         dns_name = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
notebook_config['instance_name'])
         tensor_board_url = 'http://' + ip_address + ':6006'
         jupyter_url = 'http://' + ip_address + 
':8888/{}/'.format(notebook_config['exploratory_name'])
-        jupyter_notebook_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        jupyter_ungit_access_url = "https://"; + edge_instance_ip + 
"/{}-ungit/".format(notebook_config['exploratory_name'])
-        tensorboard_access_url = "https://"; + edge_instance_ip + 
"/{}-tensor/".format(notebook_config['exploratory_name'])
+        jupyter_notebook_access_url = 
"https://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                              
notebook_config['exploratory_name'])
+        jupyter_ungit_access_url = 
"https://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                                 
notebook_config['exploratory_name'])
+        tensorboard_access_url = 
"https://{}/{}-tensor/".format(notebook_config['edge_instance_hostname'],
+                                                                
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
index e539e3c..cc53b22 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -93,12 +93,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
     except Exception as err:
@@ -321,9 +317,10 @@ if __name__ == "__main__":
         dns_name = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
notebook_config['instance_name'])
         jupyter_ip_url = "http://"; + ip_address + 
":8888/{}/".format(notebook_config['exploratory_name'])
         jupyter_dns_url = "http://"; + dns_name + 
":8888/{}/".format(notebook_config['exploratory_name'])
-        jupyter_notebook_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        jupyter_ungit_access_url = "https://"; + edge_instance_ip + 
"/{}-ungit/".format(
-            notebook_config['exploratory_name'])
+        jupyter_notebook_access_url = 
"https://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                              
notebook_config['exploratory_name'])
+        jupyter_ungit_access_url = 
"https://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                                 
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
index 01db01e..d828df5 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -93,12 +93,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
     except Exception as err:
@@ -340,8 +336,10 @@ if __name__ == "__main__":
         dns_name = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
notebook_config['instance_name'])
         jupyter_ip_url = "http://"; + ip_address + 
":8888/{}/".format(notebook_config['exploratory_name'])
         jupyter_dns_url = "http://"; + dns_name + 
":8888/{}/".format(notebook_config['exploratory_name'])
-        jupyter_notebook_acces_url = "http://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        jupyter_ungit_acces_url = "http://"; + edge_instance_ip + 
"/{}-ungit/".format(notebook_config['exploratory_name'])
+        jupyter_notebook_acces_url = 
"http://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                            
notebook_config['exploratory_name'])
+        jupyter_ungit_acces_url = 
"http://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                               
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index e7dec6e..dd2a93c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -94,12 +94,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
         notebook_config['rstudio_pass'] = dlab.fab.id_generator()
@@ -300,9 +296,10 @@ if __name__ == "__main__":
         dns_name = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
notebook_config['instance_name'])
         rstudio_ip_url = "http://"; + ip_address + ":8787/"
         rstudio_dns_url = "http://"; + dns_name + ":8787/"
-        rstudio_notebook_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        rstudio_ungit_access_url = "https://"; + edge_instance_ip + 
"/{}-ungit/".format(
-            notebook_config['exploratory_name'])
+        rstudio_notebook_access_url = 
"https://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                              
notebook_config['exploratory_name'])
+        rstudio_ungit_access_url = 
"https://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                                 
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
 
b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
index 836d76f..6baaf45 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -95,12 +95,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
         notebook_config['rstudio_pass'] = dlab.fab.id_generator()
@@ -303,11 +299,12 @@ if __name__ == "__main__":
         tensorboard_url = "http://"; + ip_address + ":6006/"
         rstudio_ip_url = "http://"; + ip_address + ":8787/"
         rstudio_dns_url = "http://"; + dns_name + ":8787/"
-        rstudio_notebook_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        tensorboard_access_url = "https://"; + edge_instance_ip + 
"/{}-tensor/".format(
-            notebook_config['exploratory_name'])
-        rstudio_ungit_access_url = "https://"; + edge_instance_ip + 
"/{}-ungit/".format(
-            notebook_config['exploratory_name'])
+        rstudio_notebook_access_url = 
"https://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                              
notebook_config['exploratory_name'])
+        tensorboard_access_url = 
"https://{}/{}-tensor/".format(notebook_config['edge_instance_hostname'],
+                                                                
notebook_config['exploratory_name'])
+        rstudio_ungit_access_url = 
"https://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                                 
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
index fd2b78b..3cf3a46 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -95,12 +95,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
     except Exception as err:
@@ -297,9 +293,12 @@ if __name__ == "__main__":
         dns_name = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
notebook_config['instance_name'])
         tensorboard_url = "http://"; + ip_address + ":6006/"
         jupyter_ip_url = "http://"; + ip_address + 
":8888/{}/".format(notebook_config['exploratory_name'])
-        jupyter_notebook_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        tensorboard_access_url = "https://"; + edge_instance_ip + 
"/{}-tensor/".format(notebook_config['exploratory_name'])
-        jupyter_ungit_access_url = "https://"; + edge_instance_ip + 
"/{}-ungit/".format(notebook_config['exploratory_name'])
+        jupyter_notebook_access_url = 
"https://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                              
notebook_config['exploratory_name'])
+        tensorboard_access_url = 
"https://{}/{}-tensor/".format(notebook_config['edge_instance_hostname'],
+                                                                
notebook_config['exploratory_name'])
+        jupyter_ungit_access_url = 
"https://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                                 
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
index 7b6ae73..dbdae70 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -101,12 +101,8 @@ if __name__ == "__main__":
         edge_instance_hostname = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
edge_instance_name)
         edge_instance_private_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
                                                                          
edge_instance_name).get('Private')
-        if notebook_config['network_type'] == 'private':
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Private')
-        else:
-            edge_instance_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'],
-                                                                     
edge_instance_name).get('Public')
+        notebook_config['edge_instance_hostname'] = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'],
+                                                                               
         edge_instance_name)
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_ip = 
dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], 
edge_instance_name).get('Private')
     except Exception as err:
@@ -319,8 +315,10 @@ if __name__ == "__main__":
         dns_name = 
dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], 
notebook_config['instance_name'])
         zeppelin_ip_url = "http://"; + ip_address + ":8080/"
         zeppelin_dns_url = "http://"; + dns_name + ":8080/"
-        zeppelin_notebook_access_url = "https://"; + edge_instance_ip + 
"/{}/".format(notebook_config['exploratory_name'])
-        zeppelin_ungit_access_url = "https://"; + edge_instance_ip + 
"/{}-ungit/".format(notebook_config['exploratory_name'])
+        zeppelin_notebook_access_url = 
"https://{}/{}/".format(notebook_config['edge_instance_hostname'],
+                                                               
notebook_config['exploratory_name'])
+        zeppelin_ungit_access_url = 
"https://{}/{}-ungit/".format(notebook_config['edge_instance_hostname'],
+                                                                  
notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
         print('[SUMMARY]')
         logging.info('[SUMMARY]')


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

Reply via email to