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

commit e7aeca5b00af0c1fb06daca10c9387661705df8b
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 4 16:05:27 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/gcp/edge_terminate.py                 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/edge_terminate.py 
b/infrastructure-provisioning/src/general/scripts/gcp/edge_terminate.py
index 6b929e8..8080988 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_terminate.py
@@ -32,7 +32,7 @@ import traceback
 import logging
 
 
-def terminate_edge_node(user_name, service_base_name, region, zone):
+def terminate_edge_node(user_name, service_base_name, region, zone, 
project_name, endpoint_name):
     print("Terminating Dataengine-service clusters")
     try:
         labels = [
@@ -51,8 +51,8 @@ def terminate_edge_node(user_name, service_base_name, region, 
zone):
         sys.exit(1)
 
     print("Terminating EDGE and notebook instances")
-    base = '{}-{}'.format(service_base_name, user_name)
-    keys = ['edge', 'ps', 'ip', 'bucket', 'subnet']
+    base = '{}-{}-{}'.format(service_base_name, project_name, endpoint_name)
+    keys = ['edge', 'ps', 'static-ip', 'bucket', 'subnet']
     targets = ['{}-{}'.format(base, k) for k in keys]
     try:
         instances = GCPMeta.get_list_instances(zone, base)
@@ -141,6 +141,8 @@ if __name__ == "__main__":
     edge_conf = dict()
     edge_conf['service_base_name'] = (os.environ['conf_service_base_name'])
     edge_conf['edge_user_name'] = (os.environ['edge_user_name'])
+    edge_conf['project_name'] = (os.environ['project_name']).replace('_', 
'-').lower()
+    edge_conf['endpoint_name'] = os.environ['endpoint_name'].replace('_', 
'-').lower()
     edge_conf['region'] = os.environ['gcp_region']
     edge_conf['zone'] = os.environ['gcp_zone']
 
@@ -149,7 +151,8 @@ if __name__ == "__main__":
         print('[TERMINATE EDGE]')
         try:
             terminate_edge_node(edge_conf['edge_user_name'], 
edge_conf['service_base_name'],
-                                edge_conf['region'], edge_conf['zone'])
+                                edge_conf['region'], edge_conf['zone'], 
edge_conf['project_name'],
+                                edge_conf['endpoint_name'])
         except Exception as err:
             traceback.print_exc()
             dlab.fab.append_result("Failed to terminate edge.", str(err))


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

Reply via email to