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

commit d1d33c1932be45c9afddb62bf26adf5283fef3b5
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Feb 20 11:49:27 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/lib/os/fab.py                      |  11 +-
 .../src/general/scripts/aws/ssn_configure.py       | 255 +++----------
 .../src/general/scripts/aws/ssn_prepare.py         | 407 ++++++++++-----------
 .../src/general/scripts/azure/ssn_configure.py     | 188 +++++-----
 .../src/general/scripts/azure/ssn_prepare.py       |  89 ++---
 .../src/general/scripts/gcp/ssn_configure.py       | 224 ++++--------
 .../src/general/scripts/gcp/ssn_prepare.py         | 180 ++++-----
 7 files changed, 563 insertions(+), 791 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py 
b/infrastructure-provisioning/src/general/lib/os/fab.py
index a1e1a16..e36970b 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -119,6 +119,12 @@ def configuring_notebook(dataengine_service_version):
 def append_result(error, exception=''):
     ts = time.time()
     st = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S')
+    if exception:
+        error_message = "[Error-{}]: {}. Exception: {}".format(st, error, 
str(exception))
+        print(error_message)
+    else:
+        error_message = "[Error-{}]: {}.".format(st, error)
+        print(error_message)
     with open('/root/result.json', 'a+') as f:
         text = f.read()
     if len(text) == 0:
@@ -127,10 +133,7 @@ def append_result(error, exception=''):
             f.write(res)
     with open("/root/result.json") as f:
         data = json.load(f)
-    if exception:
-        data['error'] = data['error'] + " [Error-" + st + "]:" + error + " 
Exception: " + str(exception)
-    else:
-        data['error'] = data['error'] + " [Error-" + st + "]:" + error
+    data['error'] = data['error'] + error_message
     with open("/root/result.json", 'w') as f:
         json.dump(data, f)
     print(data)
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 16187aa..1c63fe6 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -21,13 +21,6 @@
 #
 # 
******************************************************************************
 
-# from dlab.fab import *
-# from dlab.actions_lib import *
-# import sys, os, json
-# from fabric.api import *
-# from dlab.ssn_lib import *
-# import traceback
-
 import logging
 import sys
 import os
@@ -45,49 +38,64 @@ if __name__ == "__main__":
     logging.basicConfig(format='%(levelname)-8s [%(asctime)s]  %(message)s',
                         level=logging.DEBUG,
                         filename=local_log_filepath)
+
     ssn_conf = dict()
     ssn_conf['instance'] = 'ssn'
 
+    def clear_resources():
+        if ssn_conf['domain_created']:
+            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
+                                                    
os.environ['ssn_hosted_zone_name'],
+                                                    
os.environ['ssn_subdomain'])
+        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
+        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
+        dlab.actions_lib.remove_s3(ssn_conf['instance'])
+        if ssn_conf['pre_defined_sg']:
+            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
+        if ssn_conf['pre_defined_subnet']:
+            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
+                                                      
ssn_conf['service_base_name'])
+            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
+        if ssn_conf['pre_defined_vpc']:
+            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
+            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
+            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
+        if ssn_conf['pre_defined_vpc2']:
+            dlab.actions_lib.remove_peering('*')
+            try:
+                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
+            except:
+                print("There are no VPC Endpoints")
+            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
+            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+
     try:
         logging.info('[DERIVING NAMES]')
         print('[DERIVING NAMES]')
         ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
dlab.fab.replace_multi_symbols(
             os.environ['conf_service_base_name'].lower()[:20], '-', True)
+        if 'ssn_hosted_zone_id' in os.environ and 'ssn_hosted_zone_name' in 
os.environ and \
+                'ssn_subdomain' in os.environ:
+            ssn_conf['domain_created'] = True
+        else:
+            ssn_conf['domain_created'] = False
+        ssn_conf['pre_defined_vpc'] = False
+        ssn_conf['pre_defined_subnet'] = False
+        ssn_conf['pre_defined_sg'] = False
+        ssn_conf['billing_enabled'] = True
         ssn_conf['role_name'] = 
'{}-ssn-role'.format(ssn_conf['service_base_name'])
         ssn_conf['role_profile_name'] = 
'{}-ssn-profile'.format(ssn_conf['service_base_name'])
         ssn_conf['policy_name'] = 
'{}-ssn-policy'.format(ssn_conf['service_base_name'])
-        ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
         ssn_conf['tag_name'] = '{}-tag'.format(ssn_conf['service_base_name'])
         ssn_conf['tag2_name'] = 
'{}-secondary-tag'.format(ssn_conf['service_base_name'])
         ssn_conf['user_tag'] = 
"{0}:{0}-ssn-role".format(ssn_conf['service_base_name'])
         ssn_conf['instance_name'] = 
'{}-ssn'.format(ssn_conf['service_base_name'])
         ssn_conf['region'] = os.environ['aws_region']
-        ssn_conf['zone_full'] = os.environ['aws_region'] + 
os.environ['aws_zone']
         ssn_conf['ssn_image_name'] = 
os.environ['aws_{}_image_name'.format(os.environ['conf_os_family'])]
-        ssn_conf['ssn_ami_id'] = 
dlab.meta_lib.get_ami_id(ssn_conf['ssn_image_name'])
-        ssn_conf['policy_path'] = '/root/files/ssn_policy.json'
-        ssn_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
-        ssn_conf['vpc2_cidr'] = os.environ['conf_vpc2_cidr']
-        ssn_conf['vpc_name'] = '{}-vpc'.format(ssn_conf['service_base_name'])
-        ssn_conf['vpc2_name'] = '{}-vpc2'.format(ssn_conf['service_base_name'])
-        ssn_conf['subnet_name'] = 
'{}-ssn-subnet'.format(ssn_conf['service_base_name'])
-        ssn_conf['allowed_ip_cidr'] = list()
-        for cidr in os.environ['conf_allowed_ip_cidr'].split(','):
-            ssn_conf['allowed_ip_cidr'].append({"CidrIp": cidr.replace(' ', 
'')})
+        ssn_conf['subnet_name'] = 
'{}-subnet'.format(ssn_conf['service_base_name'])
         ssn_conf['sg_name'] = '{}-ssn-sg'.format(ssn_conf['service_base_name'])
         ssn_conf['network_type'] = os.environ['conf_network_type']
-        ssn_conf['all_ip_cidr'] = '0.0.0.0/0'
-        ssn_conf['elastic_ip_name'] = 
'{0}-ssn-static-ip'.format(ssn_conf['service_base_name'])
-        ssn_conf['pre_defined_vpc'] = False
-        ssn_conf['pre_defined_subnet'] = False
-        ssn_conf['pre_defined_sg'] = False
-        ssn_conf['billing_enabled'] = True
         ssn_conf['dlab_ssh_user'] = os.environ['conf_os_user']
-        if 'ssn_hosted_zone_id' in os.environ and 'ssn_hosted_zone_name' in 
os.environ and \
-                'ssn_subdomain' in os.environ:
-            ssn_conf['domain_created'] = True
-        else:
-            ssn_conf['domain_created'] = False
 
         try:
             if os.environ['aws_vpc_id'] == '':
@@ -140,7 +148,8 @@ if __name__ == "__main__":
         except KeyError:
             os.environ['aws_report_path'] = ''
     except Exception as err:
-        print('Error: {0}'.format(err))
+        dlab.fab.append_result("Failed to generate variables dictionary.", 
str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -182,31 +191,7 @@ if __name__ == "__main__":
             raise Exception
     except Exception as err:
         dlab.fab.append_result("Failed creating ssh user 'dlab'.", str(err))
-        if ssn_conf['domain_created']:
-            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
-                                                    
os.environ['ssn_hosted_zone_name'],
-                                                    
os.environ['ssn_subdomain'])
-        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
-        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
-        dlab.actions_lib.remove_s3(ssn_conf['instance'])
-        if ssn_conf['pre_defined_sg']:
-            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
-        if ssn_conf['pre_defined_subnet']:
-            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                      
ssn_conf['service_base_name'])
-            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-        if ssn_conf['pre_defined_vpc']:
-            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-        if ssn_conf['pre_defined_vpc2']:
-            dlab.actions_lib.remove_peering('*')
-            try:
-                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-            except:
-                print("There are no VPC Endpoints")
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -224,31 +209,7 @@ if __name__ == "__main__":
             raise Exception
     except Exception as err:
         dlab.fab.append_result("Failed installing software: pip, packages.", 
str(err))
-        if ssn_conf['domain_created']:
-            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
-                                                    
os.environ['ssn_hosted_zone_name'],
-                                                    
os.environ['ssn_subdomain'])
-        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
-        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
-        dlab.actions_lib.remove_s3(ssn_conf['instance'])
-        if ssn_conf['pre_defined_sg']:
-            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
-        if ssn_conf['pre_defined_subnet']:
-            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                      
ssn_conf['service_base_name'])
-            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-        if ssn_conf['pre_defined_vpc']:
-            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-        if ssn_conf['pre_defined_vpc2']:
-            dlab.actions_lib.remove_peering('*')
-            try:
-                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-            except:
-                print("There are no VPC Endpoints")
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -273,31 +234,7 @@ if __name__ == "__main__":
             raise Exception
     except Exception as err:
         dlab.fab.append_result("Failed configuring ssn.", str(err))
-        if ssn_conf['domain_created']:
-            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
-                                                    
os.environ['ssn_hosted_zone_name'],
-                                                    
os.environ['ssn_subdomain'])
-        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
-        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
-        dlab.actions_lib.remove_s3(ssn_conf['instance'])
-        if ssn_conf['pre_defined_sg']:
-            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
-        if ssn_conf['pre_defined_subnet']:
-            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                      
ssn_conf['service_base_name'])
-            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-        if ssn_conf['pre_defined_vpc']:
-            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-        if ssn_conf['pre_defined_vpc2']:
-            dlab.actions_lib.remove_peering('*')
-            try:
-                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-            except:
-                print("There are no VPC Endpoints")
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -330,58 +267,10 @@ if __name__ == "__main__":
             raise Exception
     except Exception as err:
         dlab.fab.append_result("Unable to configure docker.", str(err))
-        if ssn_conf['domain_created']:
-            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
-                                                    
os.environ['ssn_hosted_zone_name'],
-                                                    
os.environ['ssn_subdomain'])
-        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
-        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
-        dlab.actions_lib.remove_s3(ssn_conf['instance'])
-        if ssn_conf['pre_defined_sg']:
-            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
-        if ssn_conf['pre_defined_subnet']:
-            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                      
ssn_conf['service_base_name'])
-            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-        if ssn_conf['pre_defined_vpc']:
-            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-        if ssn_conf['pre_defined_vpc2']:
-            dlab.actions_lib.remove_peering('*')
-            try:
-                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-            except:
-                print("There are no VPC Endpoints")
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+        clear_resources()
         sys.exit(1)
 
     try:
-        # mongo_parameters = {
-        #     "aws_region": os.environ['aws_region'],
-        #     "aws_vpc_id": os.environ['aws_vpc_id'],
-        #     "aws_subnet_id": os.environ['aws_subnet_id'],
-        #     "conf_service_base_name": service_base_name,
-        #     "aws_security_groups_ids": 
os.environ['aws_security_groups_ids'].replace(" ", ""),
-        #     "conf_os_family": os.environ['conf_os_family'],
-        #     "conf_tag_resource_id": os.environ['conf_tag_resource_id'],
-        #     "conf_key_dir": os.environ['conf_key_dir'],
-        #     "ssn_instance_size": os.environ['aws_ssn_instance_size'],
-        #     "edge_instance_size": os.environ['aws_edge_instance_size']
-        # }
-        # if os.environ['conf_duo_vpc_enable'] == 'true':
-        #     secondary_parameters = {
-        #         "aws_notebook_vpc_id": os.environ['aws_vpc2_id'],
-        #         "aws_notebook_subnet_id": os.environ['aws_subnet_id'],
-        #         "aws_peering_id": os.environ['aws_peering_id']
-        #     }
-        # else:
-        #     secondary_parameters = {
-        #         "aws_notebook_vpc_id": os.environ['aws_vpc_id'],
-        #         "aws_notebook_subnet_id": os.environ['aws_subnet_id'],
-        #     }
-        # mongo_parameters.update(secondary_parameters)
         cloud_params = [
             {
                 'key': 'KEYCLOAK_REDIRECT_URI',
@@ -658,32 +547,7 @@ if __name__ == "__main__":
             raise Exception
     except Exception as err:
         dlab.fab.append_result("Unable to configure UI.", str(err))
-        print(err)
-        if ssn_conf['domain_created']:
-            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
-                                                    
os.environ['ssn_hosted_zone_name'],
-                                                    
os.environ['ssn_subdomain'])
-        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
-        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
-        dlab.actions_lib.remove_s3(ssn_conf['instance'])
-        if ssn_conf['pre_defined_sg']:
-            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
-        if ssn_conf['pre_defined_subnet']:
-            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                      
ssn_conf['service_base_name'])
-            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-        if ssn_conf['pre_defined_vpc']:
-            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-        if ssn_conf['pre_defined_vpc2']:
-            dlab.actions_lib.remove_peering('*')
-            try:
-                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-            except:
-                print("There are no VPC Endpoints")
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -747,30 +611,7 @@ if __name__ == "__main__":
         if os.environ['conf_lifecycle_stage'] == 'prod':
             params += "--key_id {}".format(os.environ['aws_access_key'])
             local("~/scripts/{}.py {}".format('ssn_finalize', params))
-    except:
-        if ssn_conf['domain_created']:
-            
dlab.actions_lib.remove_route_53_record(os.environ['ssn_hosted_zone_id'],
-                                                    
os.environ['ssn_hosted_zone_name'],
-                                                    
os.environ['ssn_subdomain'])
-        dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
-        dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
-        dlab.actions_lib.remove_s3(ssn_conf['instance'])
-        if ssn_conf['pre_defined_sg']:
-            dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
-        if ssn_conf['pre_defined_subnet']:
-            
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                      
ssn_conf['service_base_name'])
-            dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-        if ssn_conf['pre_defined_vpc']:
-            dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc_id'])
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-        if ssn_conf['pre_defined_vpc2']:
-            dlab.actions_lib.remove_peering('*')
-            try:
-                
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-            except:
-                print("There are no VPC Endpoints")
-            dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-            dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+    except Exception as err:
+        dlab.fab.append_result("Error with writing results.", str(err))
+        clear_resources()
         sys.exit(1)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py 
b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
index aa76b95..b4f7723 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
@@ -21,12 +21,6 @@
 #
 # 
******************************************************************************
 
-# from dlab.fab import *
-# from dlab.actions_lib import *
-# import sys, os
-# from fabric.api import *
-# from dlab.ssn_lib import *
-
 import logging
 import sys
 import os
@@ -41,7 +35,7 @@ import json
 
 if __name__ == "__main__":
     local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], 
os.environ['request_id'])
-    local_log_filepath = "/logs/" + os.environ['conf_resource'] +  "/" + 
local_log_filename
+    local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + 
local_log_filename
     logging.basicConfig(format='%(levelname)-8s [%(asctime)s]  %(message)s',
                         level=logging.DEBUG,
                         filename=local_log_filepath)
@@ -59,9 +53,8 @@ if __name__ == "__main__":
         else:
             dlab.actions_lib.create_aws_config_files()
     except Exception as err:
-        print('Error: {0}'.format(err))
         logging.info('Unable to create configuration')
-        dlab.fab.append_result("Unable to create configuration")
+        dlab.fab.append_result("Unable to create configuration", err)
         traceback.print_exc()
         sys.exit(1)
 
@@ -73,7 +66,6 @@ if __name__ == "__main__":
         ssn_conf['role_name'] = 
'{}-ssn-role'.format(ssn_conf['service_base_name'])
         ssn_conf['role_profile_name'] = 
'{}-ssn-profile'.format(ssn_conf['service_base_name'])
         ssn_conf['policy_name'] = 
'{}-ssn-policy'.format(ssn_conf['service_base_name'])
-        ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
         ssn_conf['tag_name'] = '{}-tag'.format(ssn_conf['service_base_name'])
         ssn_conf['tag2_name'] = 
'{}-secondary-tag'.format(ssn_conf['service_base_name'])
         ssn_conf['user_tag'] = 
"{0}:{0}-ssn-role".format(ssn_conf['service_base_name'])
@@ -87,7 +79,7 @@ if __name__ == "__main__":
         ssn_conf['vpc2_cidr'] = os.environ['conf_vpc2_cidr']
         ssn_conf['vpc_name'] = '{}-vpc'.format(ssn_conf['service_base_name'])
         ssn_conf['vpc2_name'] = '{}-vpc2'.format(ssn_conf['service_base_name'])
-        ssn_conf['subnet_name'] = 
'{}-ssn-subnet'.format(ssn_conf['service_base_name'])
+        ssn_conf['subnet_name'] = 
'{}-subnet'.format(ssn_conf['service_base_name'])
         ssn_conf['allowed_ip_cidr'] = list()
         for cidr in os.environ['conf_allowed_ip_cidr'].split(','):
             ssn_conf['allowed_ip_cidr'].append({"CidrIp": cidr.replace(' 
','')})
@@ -95,220 +87,220 @@ if __name__ == "__main__":
         ssn_conf['network_type'] = os.environ['conf_network_type']
         ssn_conf['all_ip_cidr'] = '0.0.0.0/0'
         ssn_conf['elastic_ip_name'] = 
'{0}-ssn-static-ip'.format(ssn_conf['service_base_name'])
+    except Exception as err:
+        dlab.fab.append_result("Failed to generate variables dictionary.", 
str(err))
+        sys.exit(1)
 
-        if dlab.meta_lib.get_instance_by_name(ssn_conf['tag_name'], 
ssn_conf['instance_name']):
-            print("Service base name should be unique and less or equal 12 
symbols. Please try again.")
-            sys.exit(1)
+    if dlab.meta_lib.get_instance_by_name(ssn_conf['tag_name'], 
ssn_conf['instance_name']):
+        print("Service base name should be unique and less or equal 20 
symbols. Please try again.")
+        sys.exit(1)
 
+    try:
+        if not os.environ['aws_vpc_id']:
+            raise KeyError
+    except KeyError:
         try:
-            if not os.environ['aws_vpc_id']:
-                raise KeyError
-        except KeyError:
+            ssn_conf['pre_defined_vpc'] = True
+            logging.info('[CREATE VPC AND ROUTE TABLE]')
+            print('[CREATE VPC AND ROUTE TABLE]')
+            params = "--vpc {} --region {} --infra_tag_name {} 
--infra_tag_value {} --vpc_name {}".format(
+                ssn_conf['vpc_cidr'], ssn_conf['region'], 
ssn_conf['tag_name'], ssn_conf['service_base_name'],
+                ssn_conf['vpc_name'])
             try:
-                ssn_conf['pre_defined_vpc'] = True
-                logging.info('[CREATE VPC AND ROUTE TABLE]')
-                print('[CREATE VPC AND ROUTE TABLE]')
-                params = "--vpc {} --region {} --infra_tag_name {} 
--infra_tag_value {} --vpc_name {}".format(
-                    ssn_conf['vpc_cidr'], ssn_conf['region'], 
ssn_conf['tag_name'], ssn_conf['service_base_name'],
-                    ssn_conf['vpc_name'])
-                try:
-                    local("~/scripts/{}.py {}".format('ssn_create_vpc', 
params))
-                except:
-                    traceback.print_exc()
-                    raise Exception
-                os.environ['aws_vpc_id'] = 
dlab.meta_lib.get_vpc_by_tag(ssn_conf['tag_name'],
-                                                                        
ssn_conf['service_base_name'])
-            except Exception as err:
-                print('Error: {0}'.format(err))
-                dlab.fab.append_result("Failed to create VPC. Exception:" + 
str(err))
-                sys.exit(1)
+                local("~/scripts/{}.py {}".format('ssn_create_vpc', params))
+            except:
+                traceback.print_exc()
+                raise Exception
+            os.environ['aws_vpc_id'] = 
dlab.meta_lib.get_vpc_by_tag(ssn_conf['tag_name'],
+                                                                    
ssn_conf['service_base_name'])
+        except Exception as err:
+            dlab.fab.append_result("Failed to create VPC", str(err))
+            sys.exit(1)
 
-        ssn_conf['allowed_vpc_cidr_ip_ranges'] = list()
-        for cidr in dlab.meta_lib.get_vpc_cidr_by_id(os.environ['aws_vpc_id']):
-            ssn_conf['allowed_vpc_cidr_ip_ranges'].append({"CidrIp": cidr})
+    ssn_conf['allowed_vpc_cidr_ip_ranges'] = list()
+    for cidr in dlab.meta_lib.get_vpc_cidr_by_id(os.environ['aws_vpc_id']):
+        ssn_conf['allowed_vpc_cidr_ip_ranges'].append({"CidrIp": cidr})
 
+    try:
+        if os.environ['conf_duo_vpc_enable'] == 'true' and not 
os.environ['aws_vpc2_id']:
+            raise KeyError
+    except KeyError:
         try:
-            if os.environ['conf_duo_vpc_enable'] == 'true' and not 
os.environ['aws_vpc2_id']:
-                raise KeyError
-        except KeyError:
+            ssn_conf['pre_defined_vpc2'] = True
+            logging.info('[CREATE SECONDARY VPC AND ROUTE TABLE]')
+            print('[CREATE SECONDARY VPC AND ROUTE TABLE]')
+            params = "--vpc {} --region {} --infra_tag_name {} 
--infra_tag_value {} --secondary " \
+                     "--vpc_name {}".format(ssn_conf['vpc2_cidr'], 
ssn_conf['region'], ssn_conf['tag2_name'],
+                                            ssn_conf['service_base_name'], 
ssn_conf['vpc2_name'])
             try:
-                ssn_conf['pre_defined_vpc2'] = True
-                logging.info('[CREATE SECONDARY VPC AND ROUTE TABLE]')
-                print('[CREATE SECONDARY VPC AND ROUTE TABLE]')
-                params = "--vpc {} --region {} --infra_tag_name {} 
--infra_tag_value {} --secondary " \
-                         "--vpc_name {}".format(ssn_conf['vpc2_cidr'], 
ssn_conf['region'], ssn_conf['tag2_name'],
-                                                ssn_conf['service_base_name'], 
ssn_conf['vpc2_name'])
-                try:
-                    local("~/scripts/{}.py {}".format('ssn_create_vpc', 
params))
-                except:
-                    traceback.print_exc()
-                    raise Exception
-                os.environ['aws_vpc2_id'] = 
dlab.meta_lib.get_vpc_by_tag(ssn_conf['tag2_name'],
-                                                                         
ssn_conf['service_base_name'])
-            except Exception as err:
-                print('Error: {0}'.format(err))
-                dlab.fab.append_result("Failed to create secondary VPC. 
Exception:" + str(err))
-                if ssn_conf['pre_defined_vpc']:
-                    
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                              
ssn_conf['service_base_name'])
-                    dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-                sys.exit(1)
+                local("~/scripts/{}.py {}".format('ssn_create_vpc', params))
+            except:
+                traceback.print_exc()
+                raise Exception
+            os.environ['aws_vpc2_id'] = 
dlab.meta_lib.get_vpc_by_tag(ssn_conf['tag2_name'],
+                                                                     
ssn_conf['service_base_name'])
+        except Exception as err:
+            dlab.fab.append_result("Failed to create secondary VPC.", str(err))
+            if ssn_conf['pre_defined_vpc']:
+                
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
+                                                          
ssn_conf['service_base_name'])
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
+            sys.exit(1)
 
+    try:
+        if os.environ['aws_subnet_id'] == '':
+            raise KeyError
+    except KeyError:
         try:
-            if os.environ['aws_subnet_id'] == '':
-                raise KeyError
-        except KeyError:
+            ssn_conf['pre_defined_subnet'] = True
+            logging.info('[CREATE SUBNET]')
+            print('[CREATE SUBNET]')
+            params = "--vpc_id {0} --username {1} --infra_tag_name {2} 
--infra_tag_value {3} --prefix {4} " \
+                     "--ssn {5} --zone {6} --subnet_name {7}".format(
+                      os.environ['aws_vpc_id'], 'ssn', 
ssn_conf['tag_name'],ssn_conf['service_base_name'], '20',
+                      True, ssn_conf['zone_full'], ssn_conf['subnet_name'])
             try:
-                ssn_conf['pre_defined_subnet'] = True
-                logging.info('[CREATE SUBNET]')
-                print('[CREATE SUBNET]')
-                params = "--vpc_id {0} --username {1} --infra_tag_name {2} 
--infra_tag_value {3} --prefix {4} " \
-                         "--ssn {5} --zone {6} --subnet_name {7}".format(
-                          os.environ['aws_vpc_id'], 'ssn', 
ssn_conf['tag_name'],ssn_conf['service_base_name'], '20',
-                          True, ssn_conf['zone_full'], ssn_conf['subnet_name'])
+                local("~/scripts/{}.py {}".format('common_create_subnet', 
params))
+            except:
+                traceback.print_exc()
+                raise Exception
+            with open('/tmp/ssn_subnet_id', 'r') as f:
+                os.environ['aws_subnet_id'] = f.read()
+            dlab.actions_lib.enable_auto_assign_ip(os.environ['aws_subnet_id'])
+        except Exception as err:
+            dlab.fab.append_result("Failed to create Subnet.", str(err))
+            if ssn_conf['pre_defined_vpc']:
+                
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
+                                                          
ssn_conf['service_base_name'])
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
+                try:
+                    dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
+                except:
+                    print("Subnet hasn't been created.")
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
+            if ssn_conf['pre_defined_vpc2']:
                 try:
-                    local("~/scripts/{}.py {}".format('common_create_subnet', 
params))
+                    
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
                 except:
-                    traceback.print_exc()
-                    raise Exception
-                with open('/tmp/ssn_subnet_id', 'r') as f:
-                    os.environ['aws_subnet_id'] = f.read()
-                
dlab.actions_lib.enable_auto_assign_ip(os.environ['aws_subnet_id'])
-            except Exception as err:
-                print('Error: {0}'.format(err))
-                dlab.fab.append_result("Failed to create Subnet.", str(err))
-                if ssn_conf['pre_defined_vpc']:
-                    
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                              
ssn_conf['service_base_name'])
-                    dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
-                    try:
-                        
dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-                    except:
-                        print("Subnet hasn't been created.")
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-                if ssn_conf['pre_defined_vpc2']:
-                    try:
-                        
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-                    except:
-                        print("There are no VPC Endpoints")
-                    
dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
-                sys.exit(1)
+                    print("There are no VPC Endpoints")
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], 
True)
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+            sys.exit(1)
 
+    try:
+        if os.environ['conf_duo_vpc_enable'] == 'true' and 
os.environ['aws_vpc_id'] and os.environ['aws_vpc2_id']:
+            raise KeyError
+    except KeyError:
         try:
-            if os.environ['conf_duo_vpc_enable'] == 'true' and 
os.environ['aws_vpc_id'] and os.environ['aws_vpc2_id']:
-                raise KeyError
-        except KeyError:
-            try:
-                logging.info('[CREATE PEERING CONNECTION]')
-                print('[CREATE PEERING CONNECTION]')
-                os.environ['aws_peering_id'] = 
dlab.actions_lib.create_peering_connection(
-                    os.environ['aws_vpc_id'], os.environ['aws_vpc2_id'], 
ssn_conf['service_base_name'])
-                print('PEERING CONNECTION ID:' + os.environ['aws_peering_id'])
-                
dlab.actions_lib.create_route_by_id(os.environ['aws_subnet_id'], 
os.environ['aws_vpc_id'],
-                                                    
os.environ['aws_peering_id'],
-                                                    
dlab.meta_lib.get_cidr_by_vpc(os.environ['aws_vpc2_id']))
-            except Exception as err:
-                print('Error: {0}'.format(err))
-                dlab.fab.append_result("Failed to create peering connection.", 
str(err))
-                if ssn_conf['pre_defined_vpc']:
-                    dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
-                    try:
-                        
dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-                    except:
-                        print("Subnet hasn't been created.")
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-                if ssn_conf['pre_defined_vpc2']:
-                    dlab.actions_lib.remove_peering('*')
-                    try:
-                        
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-                    except:
-                        print("There are no VPC Endpoints")
-                    
dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
-                sys.exit(1)
+            logging.info('[CREATE PEERING CONNECTION]')
+            print('[CREATE PEERING CONNECTION]')
+            os.environ['aws_peering_id'] = 
dlab.actions_lib.create_peering_connection(
+                os.environ['aws_vpc_id'], os.environ['aws_vpc2_id'], 
ssn_conf['service_base_name'])
+            print('PEERING CONNECTION ID:' + os.environ['aws_peering_id'])
+            dlab.actions_lib.create_route_by_id(os.environ['aws_subnet_id'], 
os.environ['aws_vpc_id'],
+                                                os.environ['aws_peering_id'],
+                                                
dlab.meta_lib.get_cidr_by_vpc(os.environ['aws_vpc2_id']))
+        except Exception as err:
+            dlab.fab.append_result("Failed to create peering connection.", 
str(err))
+            if ssn_conf['pre_defined_vpc']:
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
+                try:
+                    dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
+                except:
+                    print("Subnet hasn't been created.")
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
+            if ssn_conf['pre_defined_vpc2']:
+                dlab.actions_lib.remove_peering('*')
+                try:
+                    
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
+                except:
+                    print("There are no VPC Endpoints")
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], 
True)
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+            sys.exit(1)
 
+    try:
+        if os.environ['aws_security_groups_ids'] == '':
+            raise KeyError
+    except KeyError:
         try:
-            if os.environ['aws_security_groups_ids'] == '':
-                raise KeyError
-        except KeyError:
+            ssn_conf['pre_defined_sg'] = True
+            logging.info('[CREATE SG FOR SSN]')
+            print('[CREATE SG FOR SSN]')
+            ssn_conf['ingress_sg_rules_template'] = dlab.meta_lib.format_sg([
+                {
+                    "PrefixListIds": [],
+                    "FromPort": 80,
+                    "IpRanges": ssn_conf['allowed_ip_cidr'],
+                    "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": []
+                },
+                {
+                    "PrefixListIds": [],
+                    "FromPort": 22,
+                    "IpRanges": ssn_conf['allowed_ip_cidr'],
+                    "ToPort": 22, "IpProtocol": "tcp", "UserIdGroupPairs": []
+                },
+                {
+                    "PrefixListIds": [],
+                    "FromPort": 443,
+                    "IpRanges": ssn_conf['allowed_ip_cidr'],
+                    "ToPort": 443, "IpProtocol": "tcp", "UserIdGroupPairs": []
+                },
+                {
+                    "PrefixListIds": [],
+                    "FromPort": -1,
+                    "IpRanges": ssn_conf['allowed_ip_cidr'],
+                    "ToPort": -1, "IpProtocol": "icmp", "UserIdGroupPairs": []
+                },
+                {
+                    "PrefixListIds": [],
+                    "FromPort": 80,
+                    "IpRanges": ssn_conf['allowed_vpc_cidr_ip_ranges'],
+                    "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": []
+                },
+                {
+                    "PrefixListIds": [],
+                    "FromPort": 443,
+                    "IpRanges": ssn_conf['allowed_vpc_cidr_ip_ranges'],
+                    "ToPort": 443, "IpProtocol": "tcp", "UserIdGroupPairs": []
+                }
+            ])
+            egress_sg_rules_template = dlab.meta_lib.format_sg([
+                {"IpProtocol": "-1", "IpRanges": [{"CidrIp": 
ssn_conf['all_ip_cidr']}], "UserIdGroupPairs": [],
+                 "PrefixListIds": []}
+            ])
+            params = "--name {} --vpc_id {} --security_group_rules '{}' 
--egress '{}' --infra_tag_name {} " \
+                     "--infra_tag_value {} --force {} --ssn {}". \
+                format(ssn_conf['sg_name'], os.environ['aws_vpc_id'],
+                       json.dumps(ssn_conf['ingress_sg_rules_template']), 
json.dumps(egress_sg_rules_template),
+                       ssn_conf['service_base_name'], ssn_conf['tag_name'], 
False, True)
             try:
-                ssn_conf['pre_defined_sg'] = True
-                logging.info('[CREATE SG FOR SSN]')
-                print('[CREATE SG FOR SSN]')
-                ssn_conf['ingress_sg_rules_template'] = 
dlab.meta_lib.format_sg([
-                    {
-                        "PrefixListIds": [],
-                        "FromPort": 80,
-                        "IpRanges": ssn_conf['allowed_ip_cidr'],
-                        "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": 
[]
-                    },
-                    {
-                        "PrefixListIds": [],
-                        "FromPort": 22,
-                        "IpRanges": ssn_conf['allowed_ip_cidr'],
-                        "ToPort": 22, "IpProtocol": "tcp", "UserIdGroupPairs": 
[]
-                    },
-                    {
-                        "PrefixListIds": [],
-                        "FromPort": 443,
-                        "IpRanges": ssn_conf['allowed_ip_cidr'],
-                        "ToPort": 443, "IpProtocol": "tcp", 
"UserIdGroupPairs": []
-                    },
-                    {
-                        "PrefixListIds": [],
-                        "FromPort": -1,
-                        "IpRanges": ssn_conf['allowed_ip_cidr'],
-                        "ToPort": -1, "IpProtocol": "icmp", 
"UserIdGroupPairs": []
-                    },
-                    {
-                        "PrefixListIds": [],
-                        "FromPort": 80,
-                        "IpRanges": ssn_conf['allowed_vpc_cidr_ip_ranges'],
-                        "ToPort": 80, "IpProtocol": "tcp", "UserIdGroupPairs": 
[]
-                    },
-                    {
-                        "PrefixListIds": [],
-                        "FromPort": 443,
-                        "IpRanges": ssn_conf['allowed_vpc_cidr_ip_ranges'],
-                        "ToPort": 443, "IpProtocol": "tcp", 
"UserIdGroupPairs": []
-                    }
-                ])
-                egress_sg_rules_template = dlab.meta_lib.format_sg([
-                    {"IpProtocol": "-1", "IpRanges": [{"CidrIp": 
ssn_conf['all_ip_cidr']}], "UserIdGroupPairs": [],
-                     "PrefixListIds": []}
-                ])
-                params = "--name {} --vpc_id {} --security_group_rules '{}' 
--egress '{}' --infra_tag_name {} " \
-                         "--infra_tag_value {} --force {} --ssn {}". \
-                    format(ssn_conf['sg_name'], os.environ['aws_vpc_id'],
-                           json.dumps(ssn_conf['ingress_sg_rules_template']), 
json.dumps(egress_sg_rules_template),
-                           ssn_conf['service_base_name'], 
ssn_conf['tag_name'], False, True)
+                local("~/scripts/{}.py 
{}".format('common_create_security_group', params))
+            except:
+                traceback.print_exc()
+                raise Exception
+            with open('/tmp/ssn_sg_id', 'r') as f:
+                os.environ['aws_security_groups_ids'] = f.read()
+        except Exception as err:
+            dlab.gab_lib.append_result("Failed creating security group for 
SSN.", str(err))
+            if ssn_conf['pre_defined_vpc']:
+                
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
+                                                          
ssn_conf['service_base_name'])
+                dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
+            if ssn_conf['pre_defined_vpc2']:
+                dlab.actions_lib.remove_peering('*')
                 try:
-                    local("~/scripts/{}.py 
{}".format('common_create_security_group', params))
+                    
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
                 except:
-                    traceback.print_exc()
-                    raise Exception
-                with open('/tmp/ssn_sg_id', 'r') as f:
-                    os.environ['aws_security_groups_ids'] = f.read()
-            except Exception as err:
-                print('Error: {0}'.format(err))
-                dlab.gab_lib.append_result("Failed creating security group for 
SSN.", str(err))
-                if ssn_conf['pre_defined_vpc']:
-                    
dlab.actions_lib.remove_internet_gateways(os.environ['aws_vpc_id'], 
ssn_conf['tag_name'],
-                                                              
ssn_conf['service_base_name'])
-                    dlab.actions_lib.remove_subnets(ssn_conf['subnet_name'])
-                    dlab.actions_lib.remove_route_tables(ssn_conf['tag_name'], 
True)
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc_id'])
-                if ssn_conf['pre_defined_vpc2']:
-                    dlab.actions_lib.remove_peering('*')
-                    try:
-                        
dlab.actions_lib.remove_vpc_endpoints(os.environ['aws_vpc2_id'])
-                    except:
-                        print("There are no VPC Endpoints")
-                    
dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], True)
-                    dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
-                sys.exit(1)
+                    print("There are no VPC Endpoints")
+                dlab.actions_lib.remove_route_tables(ssn_conf['tag2_name'], 
True)
+                dlab.actions_lib.remove_vpc(os.environ['aws_vpc2_id'])
+            sys.exit(1)
+
+    try:
         logging.info('[CREATE ROLES]')
         print('[CREATE ROLES]')
         params = "--role_name {} --role_profile_name {} --policy_name {} 
--policy_file_name {} --region {} " \
@@ -322,7 +314,6 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
         dlab.fab.append_result("Unable to create roles.", str(err))
         if ssn_conf['pre_defined_sg']:
             dlab.actions_lib.remove_sgroups(ssn_conf['tag_name'])
@@ -354,7 +345,6 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
         dlab.fab.append_result("Unable to create an endpoint.", str(err))
         dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
         if ssn_conf['pre_defined_sg']:
@@ -389,7 +379,6 @@ if __name__ == "__main__":
                 traceback.print_exc()
                 raise Exception
         except Exception as err:
-            print('Error: {0}'.format(err))
             dlab.fab.append_result("Unable to create secondary endpoint.", 
str(err))
             dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
             if ssn_conf['pre_defined_sg']:
@@ -427,7 +416,6 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
         dlab.fab.append_result("Unable to create ssn instance.", str(err))
         dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
         dlab.actions_lib.remove_s3(ssn_conf['instance'])
@@ -468,7 +456,6 @@ if __name__ == "__main__":
                 traceback.print_exc()
                 raise Exception
         except Exception as err:
-            print('Error: {0}'.format(err))
             dlab.fab.append_result("Failed to associate elastic ip.", str(err))
             dlab.actions_lib.remove_ec2(ssn_conf['tag_name'], 
ssn_conf['instance_name'])
             dlab.actions_lib.remove_all_iam_resources(ssn_conf['instance'])
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 02c4eaa..b57329a 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -21,12 +21,15 @@
 #
 # 
******************************************************************************
 
-from dlab.fab import *
-from dlab.actions_lib import *
-from dlab.meta_lib import *
-import sys, os, json
+import sys
+import os
+import json
 from fabric.api import *
-from dlab.ssn_lib import *
+import dlab.ssn_lib
+import dlab.fab
+import dlab.actions_lib
+import dlab.meta_lib
+import logging
 import traceback
 
 if __name__ == "__main__":
@@ -36,49 +39,65 @@ if __name__ == "__main__":
                         level=logging.DEBUG,
                         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'])
+        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'])
+
     try:
-        instance = 'ssn'
+        ssn_conf = dict()
+        ssn_conf['instance'] = 'ssn'
         
         logging.info('[DERIVING NAMES]')
         print('[DERIVING NAMES]')
 
-        billing_enabled = True
-
-        ssn_conf = dict()
+        ssn_conf['billing_enabled'] = True
         # We need to cut service_base_name to 12 symbols do to the Azure Name 
length limitation
-        ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
replace_multi_symbols(
-            os.environ['conf_service_base_name'].replace('_', '-')[:12], '-', 
True)
+        ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
dlab.fab.replace_multi_symbols(
+            os.environ['conf_service_base_name'].lower()[:20], '-', True)
         # Check azure predefined resources
-        ssn_conf['resource_group_name'] = 
os.environ.get('azure_resource_group_name', ssn_conf['service_base_name'])
+        ssn_conf['resource_group_name'] = 
os.environ.get('azure_resource_group_name',
+                                                         
'{}-resource-group'.format(ssn_conf['service_base_name']))
         ssn_conf['vpc_name'] = os.environ.get('azure_vpc_name', 
'{}-vpc'.format(ssn_conf['service_base_name']))
-        ssn_conf['subnet_name'] = os.environ.get('azure_subnet_name', 
'{}-ssn-subnet'.format(ssn_conf['service_base_name']))
-        ssn_conf['security_group_name'] = 
os.environ.get('azure_security_group_name', 
'{}-sg'.format(ssn_conf['service_base_name']))
+        ssn_conf['subnet_name'] = os.environ.get('azure_subnet_name', 
'{}-subnet'.format(ssn_conf['service_base_name']))
+        ssn_conf['security_group_name'] = 
os.environ.get('azure_security_group_name', '{}-sg'.format(
+            ssn_conf['service_base_name']))
         # Default variables
         ssn_conf['region'] = os.environ['azure_region']
-        ssn_conf['ssn_container_name'] = 
'{}-ssn-container'.format(ssn_conf['service_base_name']).lower()
         ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
         ssn_conf['datalake_store_name'] = 
'{}-ssn-datalake'.format(ssn_conf['service_base_name'])
         ssn_conf['datalake_shared_directory_name'] = 
'{}-shared-folder'.format(ssn_conf['service_base_name'])
         ssn_conf['instance_name'] = 
'{}-ssn'.format(ssn_conf['service_base_name'])
-        ssn_conf['ssh_key_path'] = os.environ['conf_key_dir'] + 
os.environ['conf_key_name'] + '.pem'
+        ssn_conf['ssh_key_path'] = 
'{}{}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
         ssn_conf['dlab_ssh_user'] = os.environ['conf_os_user']
         if os.environ['conf_network_type'] == 'private':
             ssn_conf['instnace_ip'] = 
AzureMeta().get_private_ip_address(ssn_conf['resource_group_name'],
-                                                                        
ssn_conf['instance_name'])
+                                                                         
ssn_conf['instance_name'])
         else:
             ssn_conf['instnace_ip'] = 
AzureMeta().get_instance_public_ip_address(ssn_conf['resource_group_name'],
-                                                                        
ssn_conf['instance_name'])
-        ssn_conf['instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(ssn_conf['instance_name'], 
ssn_conf['region'])
+                                                                               
  ssn_conf['instance_name'])
+        ssn_conf['instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(ssn_conf['instance_name'],
+                                                                               
ssn_conf['region'])
 
         if os.environ['conf_stepcerts_enabled'] == 'true':
-            step_cert_sans = ' --san {0} --san {1} 
'.format(AzureMeta().get_private_ip_address(
+            ssn_conf['step_cert_sans'] = ' --san {0} --san {1} 
'.format(AzureMeta().get_private_ip_address(
                 ssn_conf['resource_group_name'], ssn_conf['instance_name']), 
ssn_conf['instance_dns_name'])
             if os.environ['conf_network_type'] == 'public':
-                step_cert_sans += ' --san {0}'.format(
+                ssn_conf['step_cert_sans'] += ' --san {0}'.format(
                     
AzureMeta().get_instance_public_ip_address(ssn_conf['resource_group_name'],
                                                                
ssn_conf['instance_name']))
         else:
-            step_cert_sans = ''
+            ssn_conf['step_cert_sans'] = ''
 
         try:
             if os.environ['azure_offer_number'] == '':
@@ -90,62 +109,48 @@ if __name__ == "__main__":
             if os.environ['azure_region_info'] == '':
                 raise KeyError
         except KeyError:
-            billing_enabled = False
-        if not billing_enabled:
+            ssn_conf['billing_enabled'] = False
+        if not ssn_conf['billing_enabled']:
             os.environ['azure_offer_number'] = 'None'
             os.environ['azure_currency'] = 'None'
             os.environ['azure_locale'] = 'None'
             os.environ['azure_region_info'] = 'None'
         if os.environ['conf_os_family'] == 'debian':
-            initial_user = 'ubuntu'
-            sudo_group = 'sudo'
+            ssn_conf['initial_user'] = 'ubuntu'
+            ssn_conf['sudo_group'] = 'sudo'
         if os.environ['conf_os_family'] == 'redhat':
-            initial_user = 'ec2-user'
-            sudo_group = 'wheel'
+            ssn_conf['initial_user'] = 'ec2-user'
+            ssn_conf['sudo_group'] = 'wheel'
     except Exception as err:
-        print("Failed to generate variables dictionary." + str(err))
+        dlab.fab.append_result("Failed to generate variables dictionary.", 
str(err))
+        clear_resources()
         sys.exit(1)
 
-    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'])
-        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'])
-
     try:
         logging.info('[CREATING DLAB SSH USER]')
         print('[CREATING DLAB SSH USER]')
         params = "--hostname {} --keyfile {} --initial_user {} --os_user {} 
--sudo_group {}".format\
-            (ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], initial_user, 
ssn_conf['dlab_ssh_user'], sudo_group)
+            (ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], 
ssn_conf['initial_user'], ssn_conf['dlab_ssh_user'], ssn_conf['sudo_group'])
         local("~/scripts/{}.py {}".format('create_ssh_user', params))
     except Exception as err:
-        #print('Error: {0}'.format(err))
         traceback.print_exc()
         clear_resources()
-        append_result("Failed creating ssh user 'dlab-user'.", str(err))
+        dlab.fab.append_result("Failed creating ssh user 'dlab-user'.", 
str(err))
         sys.exit(1)
 
     try:
         logging.info('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
         print('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
-        params = "--hostname {} --keyfile {} --pip_packages 'backoff argparse 
fabric==1.14.0 pymongo pyyaml pycrypto azure==2.0.0' \
-            --user {} --region {}".format(ssn_conf['instnace_ip'], 
ssn_conf['ssh_key_path'],
-                                          ssn_conf['dlab_ssh_user'], 
ssn_conf['region'])
+        params = "--hostname {} --keyfile {} --pip_packages 'backoff argparse 
fabric==1.14.0 pymongo pyyaml " \
+                 "pycrypto azure==2.0.0' --user {} --region 
{}".format(ssn_conf['instnace_ip'],
+                                                                       
ssn_conf['ssh_key_path'],
+                                                                       
ssn_conf['dlab_ssh_user'],
+                                                                       
ssn_conf['region'])
         local("~/scripts/{}.py {}".format('install_prerequisites', params))
     except Exception as err:
-        #print('Error: {0}'.format(err))
         traceback.print_exc()
         clear_resources()
-        append_result("Failed installing software: pip, packages.", str(err))
+        dlab.fab.append_result("Failed installing software: pip, packages.", 
str(err))
         sys.exit(1)
 
     try:
@@ -159,13 +164,12 @@ if __name__ == "__main__":
                  "--tag_resource_id {} --step_cert_sans '{}'". \
             format(ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], 
json.dumps(additional_config),
                    ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'], 
ssn_conf['service_base_name'],
-                   step_cert_sans)
+                   ssn_conf['step_cert_sans'])
         local("~/scripts/{}.py {}".format('configure_ssn_node', params))
     except Exception as err:
-        #print('Error: {0}'.format(err))
         traceback.print_exc()
         clear_resources()
-        append_result("Failed configuring ssn.", str(err))
+        dlab.fab.append_result("Failed configuring ssn.", str(err))
         sys.exit(1)
 
     try:
@@ -180,23 +184,23 @@ if __name__ == "__main__":
                              {"name": "tensor", "tag": "latest"},
                              {"name": "deeplearning", "tag": "latest"},
                              {"name": "dataengine", "tag": "latest"}]
-        params = "--hostname {} --keyfile {} --additional_config '{}' 
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}". \
-            format(ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], 
json.dumps(additional_config),
-                   os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'], 
os.environ['ssn_dlab_path'],
-                   os.environ['conf_cloud_provider'], ssn_conf['region'])
+        params = "--hostname {} --keyfile {} --additional_config '{}' 
--os_family {} --os_user {} --dlab_path {} " \
+                 "--cloud_provider {} --region 
{}".format(ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'],
+                                                          
json.dumps(additional_config), os.environ['conf_os_family'],
+                                                          
ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
+                                                          
os.environ['conf_cloud_provider'], ssn_conf['region'])
         local("~/scripts/{}.py {}".format('configure_docker', params))
     except Exception as err:
-        #print('Error: {0}'.format(err))
         traceback.print_exc()
         clear_resources()
-        append_result("Unable to configure docker.", str(err))
+        dlab.fab.append_result("Unable to configure docker.", str(err))
         sys.exit(1)
 
     try:
         logging.info('[CONFIGURE SSN INSTANCE UI]')
         print('[CONFIGURE SSN INSTANCE UI]')
-        azure_auth_path = 
'/home/{}/keys/azure_auth.json'.format(ssn_conf['dlab_ssh_user'])
-        ldap_login = 'false'
+        ssn_conf['azure_auth_path'] = 
'/home/{}/keys/azure_auth.json'.format(ssn_conf['dlab_ssh_user'])
+        ssn_conf['ldap_login'] = 'false'
 
         cloud_params = [
             {
@@ -390,11 +394,11 @@ if __name__ == "__main__":
                     'value': ''
                 })
             if os.environ['azure_oauth2_enabled'] == 'false':
-                ldap_login = 'true'
-            tenant_id = 
json.dumps(AzureMeta().sp_creds['tenantId']).replace('"', '')
-            subscription_id = 
json.dumps(AzureMeta().sp_creds['subscriptionId']).replace('"', '')
-            datalake_application_id = os.environ['azure_application_id']
-            datalake_store_name = None
+                ssn_conf['ldap_login'] = 'true'
+            ssn_conf['tenant_id'] = 
json.dumps(AzureMeta().sp_creds['tenantId']).replace('"', '')
+            ssn_conf['subscription_id'] = 
json.dumps(AzureMeta().sp_creds['subscriptionId']).replace('"', '')
+            ssn_conf['datalake_application_id'] = 
os.environ['azure_application_id']
+            ssn_conf['datalake_store_name'] = None
         else:
             cloud_params.append(
                 {
@@ -406,30 +410,30 @@ if __name__ == "__main__":
                     'key': 'AZURE_CLIENT_ID',
                     'value': os.environ['azure_application_id']
                 })
-            tenant_id = 
json.dumps(AzureMeta().sp_creds['tenantId']).replace('"', '')
-            subscription_id = 
json.dumps(AzureMeta().sp_creds['subscriptionId']).replace('"', '')
-            datalake_application_id = os.environ['azure_application_id']
+            ssn_conf['tenant_id'] = 
json.dumps(AzureMeta().sp_creds['tenantId']).replace('"', '')
+            ssn_conf['subscription_id'] = 
json.dumps(AzureMeta().sp_creds['subscriptionId']).replace('"', '')
+            ssn_conf['datalake_application_id'] = 
os.environ['azure_application_id']
             for datalake in 
AzureMeta().list_datalakes(ssn_conf['resource_group_name']):
                 if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
-                    datalake_store_name = datalake.name
-        params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} 
--os_family {} --request_id {} \
-                 --resource {} --service_base_name {} --cloud_provider {} 
--billing_enabled {} --authentication_file {} \
-                 --offer_number {} --currency {} --locale {} --region_info {}  
--ldap_login {} --tenant_id {} \
-                 --application_id {} --datalake_store_name {} --cloud_params 
'{}' --subscription_id {}  \
-                 --validate_permission_scope {} --default_endpoint_name {}". \
-            format(ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], 
os.environ['ssn_dlab_path'],
-                   ssn_conf['dlab_ssh_user'], os.environ['conf_os_family'], 
os.environ['request_id'],
-                   os.environ['conf_resource'], ssn_conf['service_base_name'], 
os.environ['conf_cloud_provider'],
-                   billing_enabled, azure_auth_path, 
os.environ['azure_offer_number'],
-                   os.environ['azure_currency'], os.environ['azure_locale'], 
os.environ['azure_region_info'],
-                   ldap_login, tenant_id, datalake_application_id, 
datalake_store_name, json.dumps(cloud_params),
-                   subscription_id, 
os.environ['azure_validate_permission_scope'], 
ssn_conf['default_endpoint_name'])
+                    ssn_conf['datalake_store_name'] = datalake.name
+        params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} 
--os_family {} --request_id {} " \
+                 "--resource {} --service_base_name {} --cloud_provider {} 
--billing_enabled {} " \
+                 "--authentication_file {} --offer_number {} --currency {} 
--locale {} --region_info {}  " \
+                 "--ldap_login {} --tenant_id {} --application_id {} 
--datalake_store_name {} --cloud_params '{}' " \
+                 "--subscription_id {} --validate_permission_scope {} 
--default_endpoint_name {}".format(
+                  ssn_conf['instnace_ip'], ssn_conf['ssh_key_path'], 
os.environ['ssn_dlab_path'],
+                  ssn_conf['dlab_ssh_user'], os.environ['conf_os_family'], 
os.environ['request_id'],
+                  os.environ['conf_resource'], ssn_conf['service_base_name'], 
os.environ['conf_cloud_provider'],
+                  ssn_conf['billing_enabled'], ssn_conf['azure_auth_path'], 
os.environ['azure_offer_number'],
+                  os.environ['azure_currency'], os.environ['azure_locale'], 
os.environ['azure_region_info'],
+                  ssn_conf['ldap_login'], ssn_conf['tenant_id'], 
ssn_conf['datalake_application_id'],
+                  ssn_conf['datalake_store_name'], json.dumps(cloud_params), 
ssn_conf['subscription_id'],
+                  os.environ['azure_validate_permission_scope'], 
ssn_conf['default_endpoint_name'])
         local("~/scripts/{}.py {}".format('configure_ui', params))
     except Exception as err:
-        #print('Error: {0}'.format(err))
         traceback.print_exc()
         clear_resources()
-        append_result("Unable to configure UI.", str(err))
+        dlab.fab.append_result("Unable to configure UI.", str(err))
         sys.exit(1)
 
     try:
@@ -446,13 +450,14 @@ if __name__ == "__main__":
         print("Key name: {}".format(os.environ['conf_key_name']))
         print("VPC Name: {}".format(ssn_conf['vpc_name']))
         print("Subnet Name: {}".format(ssn_conf['subnet_name']))
-        print("Firewall Names: {}".format(ssn_conf['security_group_name']))
+        print("Security groups Names: 
{}".format(ssn_conf['security_group_name']))
         print("SSN instance size: 
{}".format(os.environ['azure_ssn_instance_size']))
+        ssn_conf['datalake_store_full_name'] = 'None'
         if os.environ['azure_datalake_enable'] == 'true':
             for datalake in 
AzureMeta().list_datalakes(ssn_conf['resource_group_name']):
                 if ssn_conf['datalake_store_name'] == datalake.tags["Name"]:
-                    datalake_store_name = datalake.name
-            print("DataLake store name: {}".format(datalake_store_name))
+                    ssn_conf['datalake_store_full_name'] = datalake.name
+                    print("DataLake store name: 
{}".format(ssn_conf['datalake_store_full_name']))
             print("DataLake shared directory name: 
{}".format(ssn_conf['datalake_shared_directory_name']))
         print("Region: {}".format(ssn_conf['region']))
         jenkins_url = "http://{}/jenkins".format(ssn_conf['instnace_ip'])
@@ -490,7 +495,7 @@ if __name__ == "__main__":
                        "subnet_id": ssn_conf['subnet_name'],
                        "security_id": ssn_conf['security_group_name'],
                        "instance_shape": os.environ['azure_ssn_instance_size'],
-                       "datalake_name": datalake_store_name,
+                       "datalake_name": ssn_conf['datalake_store_full_name'],
                        "datalake_shared_directory_name": 
ssn_conf['datalake_shared_directory_name'],
                        "region": ssn_conf['region'],
                        "action": "Create SSN instance"}
@@ -500,5 +505,6 @@ if __name__ == "__main__":
         params = "--instance_name {} --local_log_filepath {} --os_user {} 
--instance_hostname {}".\
             format(ssn_conf['instance_name'], local_log_filepath, 
ssn_conf['dlab_ssh_user'], ssn_conf['instnace_ip'])
         local("~/scripts/{}.py {}".format('upload_response_file', params))
-    except:
+    except Exception as err:
+        dlab.fab.append_result("Error with writing results.", str(err))
         sys.exit(1)
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py 
b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
index bb6c793..d596498 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
@@ -21,13 +21,17 @@
 #
 # 
******************************************************************************
 
-from dlab.fab import *
-from dlab.actions_lib import *
-from dlab.meta_lib import *
-import sys, os, json
+import sys
+import os
+import json
 from fabric.api import *
-from dlab.ssn_lib import *
 from Crypto.PublicKey import RSA
+import dlab.ssn_lib
+import dlab.fab
+import dlab.actions_lib
+import dlab.meta_lib
+import logging
+import traceback
 
 
 if __name__ == "__main__":
@@ -37,26 +41,31 @@ if __name__ == "__main__":
                         level=logging.DEBUG,
                         filename=local_log_filepath)
     try:
-        instance = 'ssn'
+        ssn_conf = dict()
+        ssn_conf['instance'] = 'ssn'
 
         logging.info('[DERIVING NAMES]')
         print('[DERIVING NAMES]')
-
-        ssn_conf = dict()
         # Verify vpc deployment
-        if os.environ['conf_network_type'] == 'private' and 
os.environ.get('azure_vpc_name') == None and 
os.environ.get('azure_source_vpc_name') == None:
+        if os.environ['conf_network_type'] == 'private' and not 
os.environ.get('azure_vpc_name') \
+                and not os.environ.get('azure_source_vpc_name'):
             raise Exception('Not possible to deploy private environment 
without predefined vpc or without source vpc')
-        if os.environ['conf_network_type'] == 'private' and 
os.environ.get('azure_resource_group_name') == None and 
os.environ.get('azure_source_resource_group_name') == None:
-            raise Exception('Not possible to deploy private environment 
without predefined resource_group_name or source_group_name')
+        if os.environ['conf_network_type'] == 'private' and not 
os.environ.get('azure_resource_group_name') \
+                and not os.environ.get('azure_source_resource_group_name'):
+            raise Exception('Not possible to deploy private environment 
without predefined resource_group_name '
+                            'or source_group_name')
         # We need to cut service_base_name to 12 symbols do to the Azure Name 
length limitation
-        ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
replace_multi_symbols(
-            os.environ['conf_service_base_name'].replace('_', '-')[:12], '-', 
True)
+        ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
dlab.fab.replace_multi_symbols(
+            os.environ['conf_service_base_name'].lower()[:20], '-', True)
         # Check azure predefined resources
-        ssn_conf['resource_group_name'] = 
os.environ.get('azure_resource_group_name', ssn_conf['service_base_name'])
-        ssn_conf['source_resource_group_name'] = 
os.environ.get('azure_source_resource_group_name', 
ssn_conf['resource_group_name'])
+        ssn_conf['resource_group_name'] = 
os.environ.get('azure_resource_group_name',
+                                                         
'{}-resource-group'.format(ssn_conf['service_base_name']))
+        ssn_conf['source_resource_group_name'] = os.environ.get(
+            'azure_source_resource_group_name', 
'{}-resource-group'.format(ssn_conf['service_base_name']))
         ssn_conf['vpc_name'] = os.environ.get('azure_vpc_name', 
'{}-vpc'.format(ssn_conf['service_base_name']))
-        ssn_conf['subnet_name'] = os.environ.get('azure_subnet_name', 
'{}-ssn-subnet'.format(ssn_conf['service_base_name']))
-        ssn_conf['security_group_name'] = 
os.environ.get('azure_security_group_name', 
'{}-sg'.format(ssn_conf['service_base_name']))
+        ssn_conf['subnet_name'] = os.environ.get('azure_subnet_name', 
'{}-subnet'.format(ssn_conf['service_base_name']))
+        ssn_conf['security_group_name'] = 
os.environ.get('azure_security_group_name',
+                                                         
'{}-sg'.format(ssn_conf['service_base_name']))
         # Default variables
         ssn_conf['region'] = os.environ['azure_region']
         ssn_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
@@ -69,10 +78,11 @@ if __name__ == "__main__":
         if os.environ['conf_network_type'] == 'private':
             ssn_conf['static_public_ip_name'] = 'None'      
         else:
-            ssn_conf['static_public_ip_name'] = 
'{}-ssn-ip'.format(ssn_conf['service_base_name'])
-        key = RSA.importKey(open('{}{}.pem'.format(os.environ['conf_key_dir'], 
os.environ['conf_key_name']), 'rb').read())
+            ssn_conf['static_public_ip_name'] = 
'{}-ssn-static-ip'.format(ssn_conf['service_base_name'])
+        ssn_conf['key'] = 
RSA.importKey(open('{}{}.pem'.format(os.environ['conf_key_dir'],
+                                                               
os.environ['conf_key_name']), 'rb').read())
         ssn_conf['instance_storage_account_type'] = 'Premium_LRS'
-        ssn_conf['public_ssh_key'] = key.publickey().exportKey("OpenSSH")
+        ssn_conf['public_ssh_key'] = 
ssn_conf['key'].publickey().exportKey("OpenSSH")
         ssn_conf['instance_tags'] = {"Name": ssn_conf['instance_name'],
                                      "SBN": ssn_conf['service_base_name'],
                                      os.environ['conf_billing_tag_key']: 
os.environ['conf_billing_tag_value']}
@@ -82,11 +92,11 @@ if __name__ == "__main__":
                                            os.environ['conf_billing_tag_key']: 
os.environ['conf_billing_tag_value']}
         ssn_conf['primary_disk_size'] = '32'
     except Exception as err:
-        print("Failed to generate variables dictionary." + str(err))
+        dlab.fab.append_result("Failed to generate variables dictionary.", 
str(err))
         sys.exit(1)
 
     if AzureMeta().get_instance(ssn_conf['resource_group_name'], 
ssn_conf['instance_name']):
-        print("Service base name should be unique and less or equal 12 
symbols. Please try again.")
+        dlab.fab.append_result("Service base name should be unique and less or 
equal 20 symbols. Please try again.")
         sys.exit(1)
 
     try:
@@ -100,8 +110,7 @@ if __name__ == "__main__":
             local("~/scripts/{}.py {}".format('ssn_create_resource_group', 
params))
     except Exception as err:
         traceback.print_exc()
-        print('Error creating resource group: ' + str(err))
-        append_result("Failed to create Resource Group. Exception: " + 
str(err))
+        dlab.fab.append_result("Failed to create Resource Group.", str(err))
         sys.exit(1)
     
     try:
@@ -116,13 +125,12 @@ if __name__ == "__main__":
             local("~/scripts/{}.py {}".format('ssn_create_vpc', params))
     except Exception as err:
         traceback.print_exc()
-        print('Error creating VPC: ' + str(err))
+        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'])
         except Exception as err:
-            print("Resources hasn't been removed: " + str(err))
-        append_result("Failed to create VPC. Exception: " + str(err))
+            dlab.fab.append_result("Resources hasn't been removed.", str(err))
         sys.exit(1)
   
     try:
@@ -138,15 +146,15 @@ if __name__ == "__main__":
             local("~/scripts/{}.py {}".format('common_create_subnet', params))
     except Exception as err:
         traceback.print_exc()
-        print('Error creating Subnet: ' + str(err))
+        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'])
         except Exception as err:
-            print("Resources hasn't been removed: " + str(err))
-        append_result("Failed to create Subnet. Exception: " + str(err))
+            print("Resources hasn't been removed: {}".format(str(err)))
+            dlab.fab.append_result("Resources hasn't been removed.", str(err))
         sys.exit(1)
     
     try:
@@ -154,12 +162,12 @@ if __name__ == "__main__":
             logging.info('[CREATING VPC PEERING]')
             print("[CREATING VPC PEERING]")
             params = "--source_resource_group_name {} 
--destination_resource_group_name {} " \
-            "--source_virtual_network_name {} 
--destination_virtual_network_name 
{}".format(ssn_conf['source_resource_group_name'], 
-                        ssn_conf['resource_group_name'], 
os.environ['azure_source_vpc_name'], ssn_conf['vpc_name'])
+                     "--source_virtual_network_name {} 
--destination_virtual_network_name {}".format(
+                      ssn_conf['source_resource_group_name'], 
ssn_conf['resource_group_name'],
+                      os.environ['azure_source_vpc_name'], 
ssn_conf['vpc_name'])
             local("~/scripts/{}.py {}".format('ssn_create_peering', params))
     except Exception as err:
         traceback.print_exc()
-        print('Error creating VPC peering: ' + str(err))
         try:
             if 'azure_resource_group_name' not in os.environ:
                 
AzureActions().remove_resource_group(ssn_conf['service_base_name'], 
ssn_conf['region'])
@@ -167,7 +175,8 @@ if __name__ == "__main__":
                 AzureActions().remove_vpc(ssn_conf['resource_group_name'], 
ssn_conf['vpc_name'])
         except Exception as err:
             print("Resources hasn't been removed: " + str(err))
-        append_result("Failed to create VPC peering. Exception: " + str(err))
+            dlab.fab.append_result("Resources hasn't been removed.", str(err))
+        dlab.fab.append_result("Failed to create VPC peering.", str(err))
         sys.exit(1)
 
     try:
@@ -229,7 +238,7 @@ if __name__ == "__main__":
             local("~/scripts/{}.py {}".format('common_create_security_group', 
params))
     except Exception as err:
         traceback.print_exc()
-        print('Error creating Security group: ' + str(err))
+        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'])
@@ -240,7 +249,7 @@ if __name__ == "__main__":
                                              ssn_conf['subnet_name'])
         except Exception as err:
             print("Resources hasn't been removed: " + str(err))
-        append_result("Failed to create Security group. Exception: " + 
str(err))
+            dlab.fab.append_result("Resources hasn't been removed.", str(err))
         sys.exit(1)
 
     if os.environ['azure_datalake_enable'] == 'true':
@@ -269,7 +278,7 @@ if __name__ == "__main__":
                 raise Exception
         except Exception as err:
             traceback.print_exc()
-            print('Error: {0}'.format(err))
+            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:
@@ -282,7 +291,6 @@ if __name__ == "__main__":
             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)
-            append_result("Failed to create Data Lake Store. Exception:" + 
str(err))
             sys.exit(1)
 
     if os.environ['conf_os_family'] == 'debian':
@@ -308,7 +316,7 @@ if __name__ == "__main__":
         local("~/scripts/{}.py {}".format('common_create_instance', params))
     except Exception as err:
         traceback.print_exc()
-        print('Error: {0}'.format(err))
+        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:
@@ -325,5 +333,4 @@ if __name__ == "__main__":
             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']))
-        append_result("Failed to create instance. Exception:" + str(err))
-        sys.exit(1)
\ No newline at end of file
+        sys.exit(1)
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 87cd29a..66163d9 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -21,15 +21,16 @@
 #
 # 
******************************************************************************
 
-from dlab.fab import *
-from dlab.actions_lib import *
-from dlab.meta_lib import *
 import sys, os
 from fabric.api import *
-from dlab.ssn_lib import *
 import traceback
 import json
 import argparse
+import dlab.ssn_lib
+import dlab.fab
+import dlab.actions_lib
+import dlab.meta_lib
+import logging
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--ssn_unique_index', type=str, default='')
@@ -41,33 +42,43 @@ if __name__ == "__main__":
     logging.basicConfig(format='%(levelname)-8s [%(asctime)s]  %(message)s',
                         level=logging.DEBUG,
                         filename=local_log_filepath)
-    instance = 'ssn'
+
+    def clear_resources():
+        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
+        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
+        GCPActions().remove_role(ssn_conf['role_name'])
+        if ssn_conf['pre_defined_firewall']:
+            
GCPActions().remove_firewall('{}-ingress'.format(ssn_conf['firewall_name']))
+            
GCPActions().remove_firewall('{}-egress'.format(ssn_conf['firewall_name']))
+        if ssn_conf['pre_defined_subnet']:
+            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
+        if ssn_conf['pre_defined_vpc']:
+            GCPActions().remove_vpc(ssn_conf['vpc_name'])
 
     try:
         logging.info('[DERIVING NAMES]')
         print('[DERIVING NAMES]')
-        pre_defined_vpc = False
-        pre_defined_subnet = False
-        pre_defined_firewall = False
-        billing_enabled = True
-
         ssn_conf = dict()
+        ssn_conf['instance'] = 'ssn'
+        ssn_conf['pre_defined_vpc'] = False
+        ssn_conf['pre_defined_subnet'] = False
+        ssn_conf['pre_defined_firewall'] = False
+        ssn_conf['billing_enabled'] = True
+
         ssn_conf['ssn_unique_index'] = args.ssn_unique_index
-        ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
replace_multi_symbols(
-            os.environ['conf_service_base_name'].lower().replace('_', 
'-')[:12], '-', True)
+        ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
dlab.fab.replace_multi_symbols(
+            os.environ['conf_service_base_name'].lower()[: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']
         ssn_conf['zone'] = os.environ['gcp_zone']
-        ssn_conf['ssn_bucket_name'] = 
'{}-ssn-bucket'.format(ssn_conf['service_base_name'])
         ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
-        ssn_conf['shared_bucket_name'] = 
'{0}-{1}-shared-bucket'.format(ssn_conf['service_base_name'],
-                                                                        
ssn_conf['default_endpoint_name'])
-        ssn_conf['instance_name'] = 
'{}-ssn'.format(ssn_conf['service_base_name'])
         ssn_conf['instance_size'] = os.environ['gcp_ssn_instance_size']
         try:
             if os.environ['gcp_vpc_name'] == '':
                 raise KeyError
             else:
-                pre_defined_vpc = True
+                ssn_conf['pre_defined_vpc'] = True
                 ssn_conf['vpc_name'] = os.environ['gcp_vpc_name']
         except KeyError:
             ssn_conf['vpc_name'] = 
'{}-ssn-vpc'.format(ssn_conf['service_base_name'])
@@ -76,7 +87,7 @@ if __name__ == "__main__":
             if os.environ['gcp_subnet_name'] == '':
                 raise KeyError
             else:
-                pre_defined_subnet = True
+                ssn_conf['pre_defined_subnet'] = True
                 ssn_conf['subnet_name'] = os.environ['gcp_subnet_name']
         except KeyError:
             ssn_conf['subnet_name'] = 
'{}-ssn-subnet'.format(ssn_conf['service_base_name'])
@@ -87,13 +98,11 @@ if __name__ == "__main__":
                 pre_defined_firewall = True
                 ssn_conf['firewall_name'] = os.environ['gcp_firewall_name']
         except KeyError:
-            ssn_conf['firewall_name'] = 
'{}-ssn-subnet'.format(ssn_conf['service_base_name'])
-        ssn_conf['subnet_cidr'] = '10.10.1.0/24'
+            ssn_conf['firewall_name'] = 
'{}-ssn-sg'.format(ssn_conf['service_base_name'])
         ssn_conf['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
         ssn_conf['dlab_ssh_user'] = os.environ['conf_os_user']
         ssn_conf['service_account_name'] = 
'{}-ssn-sa'.format(ssn_conf['service_base_name']).replace('_', '-')
         ssn_conf['image_name'] = 
os.environ['gcp_{}_image_name'.format(os.environ['conf_os_family'])]
-        ssn_conf['role_name'] = ssn_conf['service_base_name'] + '-' + 
ssn_conf['ssn_unique_index'] + '-ssn-role'
 
         try:
             if os.environ['aws_account_id'] == '':
@@ -101,46 +110,36 @@ if __name__ == "__main__":
             if os.environ['aws_billing_bucket'] == '':
                 raise KeyError
         except KeyError:
-            billing_enabled = False
-        if not billing_enabled:
+            ssn_conf['billing_enabled'] = False
+        if not ssn_conf['billing_enabled']:
             os.environ['aws_account_id'] = 'None'
             os.environ['aws_billing_bucket'] = 'None'
             os.environ['aws_report_path'] = 'None'
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Failed deriving names.", str(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.dlab.fab.append_result("Failed deriving names.", str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
-        instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(ssn_conf['instance_name'])
+        ssn_conf['instance_hostname'] = 
GCPMeta().get_instance_public_ip_by_name(ssn_conf['instance_name'])
         if os.environ['conf_stepcerts_enabled'] == 'true':
-            step_cert_sans = ' --san {0} --san 
{1}'.format(GCPMeta().get_instance_public_ip_by_name(
-                ssn_conf['instance_name']), 
get_instance_private_ip_address('ssn', ssn_conf['instance_name']))
+            ssn_conf['step_cert_sans'] = ' --san {0} --san 
{1}'.format(GCPMeta().get_instance_public_ip_by_name(
+                ssn_conf['instance_name']), 
dlab.meta_lib.get_instance_private_ip_address('ssn',
+                                                                               
           ssn_conf['instance_name']))
         else:
-            step_cert_sans = ''
+            ssn_conf['step_cert_sans'] = ''
         if os.environ['conf_os_family'] == 'debian':
-            initial_user = 'ubuntu'
-            sudo_group = 'sudo'
+            ssn_conf['initial_user'] = 'ubuntu'
+            ssn_conf['sudo_group'] = 'sudo'
         if os.environ['conf_os_family'] == 'redhat':
-            initial_user = 'ec2-user'
-            sudo_group = 'wheel'
+            ssn_conf['initial_user'] = 'ec2-user'
+            ssn_conf['sudo_group'] = 'wheel'
 
         logging.info('[CREATING DLAB SSH USER]')
         print('[CREATING DLAB SSH USER]')
-        params = "--hostname {} --keyfile {} --initial_user {} --os_user {} 
--sudo_group {}".format\
-            (instance_hostname, ssn_conf['ssh_key_path'], initial_user, 
ssn_conf['dlab_ssh_user'], sudo_group)
+        params = "--hostname {} --keyfile {} --initial_user {} --os_user {} 
--sudo_group {}".format(
+            ssn_conf['instance_hostname'], ssn_conf['ssh_key_path'], 
ssn_conf['initial_user'],
+            ssn_conf['dlab_ssh_user'], ssn_conf['sudo_group'])
 
         try:
             local("~/scripts/{}.py {}".format('create_ssh_user', params))
@@ -148,20 +147,8 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Failed creating ssh user 'dlab-user'.", str(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.dlab.fab.append_result("Failed creating ssh user 
'dlab-user'.", str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -170,7 +157,7 @@ if __name__ == "__main__":
         params = "--hostname {} --keyfile {} --pip_packages " \
                  "'boto3 backoff argparse fabric==1.14.0 awscli pymongo pyyaml 
" \
                  "google-api-python-client google-cloud-storage pycrypto' 
--user {} --region {}". \
-            format(instance_hostname, ssn_conf['ssh_key_path'],
+            format(ssn_conf['instance_hostname'], ssn_conf['ssh_key_path'],
                    ssn_conf['dlab_ssh_user'], ssn_conf['region'])
 
         try:
@@ -179,20 +166,8 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Failed installing software: pip, packages.", str(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.dlab.fab.append_result("Failed installing software: pip, 
packages.", str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -204,9 +179,9 @@ if __name__ == "__main__":
                              "subnet_id": ssn_conf['subnet_name'], 
"admin_key": os.environ['conf_key_name']}
         params = "--hostname {} --keyfile {} --additional_config '{}' 
--os_user {} --dlab_path {} " \
                  "--tag_resource_id {} --step_cert_sans '{}'". \
-            format(instance_hostname, ssn_conf['ssh_key_path'], 
json.dumps(additional_config),
+            format(ssn_conf['instance_hostname'], ssn_conf['ssh_key_path'], 
json.dumps(additional_config),
                    ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'], 
ssn_conf['service_base_name'],
-                   step_cert_sans)
+                   ssn_conf['step_cert_sans'])
 
         try:
             local("~/scripts/{}.py {}".format('configure_ssn_node', params))
@@ -214,20 +189,8 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Failed configuring ssn.", str(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.dlab.fab.append_result("Failed configuring ssn.", str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -246,8 +209,9 @@ if __name__ == "__main__":
                              {"name": "deeplearning", "tag": "latest"},
                              {"name": "dataengine", "tag": "latest"},
                              {"name": "dataengine-service", "tag": "latest"}]
-        params = "--hostname {} --keyfile {} --additional_config '{}' 
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}". \
-            format(instance_hostname, ssn_conf['ssh_key_path'], 
json.dumps(additional_config),
+        params = "--hostname {} --keyfile {} --additional_config '{}' 
--os_family {} --os_user {} --dlab_path {} " \
+                 "--cloud_provider {} --region {}". \
+            format(ssn_conf['instance_hostname'], ssn_conf['ssh_key_path'], 
json.dumps(additional_config),
                    os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'], 
os.environ['ssn_dlab_path'],
                    os.environ['conf_cloud_provider'], ssn_conf['region'])
 
@@ -257,20 +221,8 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Unable to configure docker.", str(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.dlab.fab.append_result("Unable to configure docker.", 
str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -280,7 +232,7 @@ if __name__ == "__main__":
         cloud_params = [
             {
                 'key': 'KEYCLOAK_REDIRECT_URI',
-                'value': "https://{0}/".format(instance_hostname)
+                'value': "https://{0}/".format(ssn_conf['instance_hostname'])
             },
             {
                 'key': 'KEYCLOAK_REALM_NAME',
@@ -475,9 +427,9 @@ if __name__ == "__main__":
                  "--request_id {} --billing_dataset_name {} \
                  --resource {} --service_base_name {} --cloud_provider {} 
--default_endpoint_name {} " \
                  "--cloud_params '{}'". \
-            format(instance_hostname, ssn_conf['ssh_key_path'], 
os.environ['ssn_dlab_path'], ssn_conf['dlab_ssh_user'],
-                   os.environ['conf_os_family'], billing_enabled, 
os.environ['request_id'],
-                   os.environ['billing_dataset_name'], 
os.environ['conf_resource'],
+            format(ssn_conf['instance_hostname'], ssn_conf['ssh_key_path'], 
os.environ['ssn_dlab_path'],
+                   ssn_conf['dlab_ssh_user'], os.environ['conf_os_family'], 
ssn_conf['billing_enabled'],
+                   os.environ['request_id'], 
os.environ['billing_dataset_name'], os.environ['conf_resource'],
                    ssn_conf['service_base_name'], 
os.environ['conf_cloud_provider'], ssn_conf['default_endpoint_name'],
                    json.dumps(cloud_params))
         try:
@@ -486,20 +438,8 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Unable to configure UI.", str(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.dlab.fab.append_result("Unable to configure UI.", str(err))
+        clear_resources()
         sys.exit(1)
 
     try:
@@ -507,7 +447,7 @@ if __name__ == "__main__":
         print('[SUMMARY]')
         print("Service base name: {}".format(ssn_conf['service_base_name']))
         print("SSN Name: {}".format(ssn_conf['instance_name']))
-        print("SSN Hostname: {}".format(instance_hostname))
+        print("SSN Hostname: {}".format(ssn_conf['instance_hostname']))
         print("Role name: {}".format(ssn_conf['role_name']))
         print("Key name: {}".format(os.environ['conf_key_name']))
         print("VPC Name: {}".format(ssn_conf['vpc_name']))
@@ -517,12 +457,12 @@ if __name__ == "__main__":
         print("SSN AMI name: {}".format(ssn_conf['image_name']))
         print("SSN bucket name: {}".format(ssn_conf['ssn_bucket_name']))
         print("Region: {}".format(ssn_conf['region']))
-        jenkins_url = "http://{}/jenkins".format(instance_hostname)
-        jenkins_url_https = "https://{}/jenkins".format(instance_hostname)
+        jenkins_url = "http://{}/jenkins".format(ssn_conf['instance_hostname'])
+        jenkins_url_https = 
"https://{}/jenkins".format(ssn_conf['instance_hostname'])
         print("Jenkins URL: {}".format(jenkins_url))
         print("Jenkins URL HTTPS: {}".format(jenkins_url_https))
-        print("DLab UI HTTP URL: http://{}".format(instance_hostname))
-        print("DLab UI HTTPS URL: https://{}".format(instance_hostname))
+        print("DLab UI HTTP URL: 
http://{}".format(ssn_conf['instance_hostname']))
+        print("DLab UI HTTPS URL: 
https://{}".format(ssn_conf['instance_hostname']))
         try:
             with open('jenkins_creds.txt') as f:
                 print(f.read())
@@ -532,10 +472,8 @@ if __name__ == "__main__":
         with open("/root/result.json", 'w') as f:
             res = {"service_base_name": ssn_conf['service_base_name'],
                    "instance_name": ssn_conf['instance_name'],
-                   "instance_hostname": instance_hostname,
+                   "instance_hostname": ssn_conf['instance_hostname'],
                    "role_name": ssn_conf['role_name'],
-                   #"role_profile_name": role_profile_name,
-                   #"policy_name": policy_name,
                    "master_keyname": os.environ['conf_key_name'],
                    "vpc_id": ssn_conf['vpc_name'],
                    "subnet_id": ssn_conf['subnet_name'],
@@ -549,20 +487,10 @@ if __name__ == "__main__":
 
         print('Upload response file')
         params = "--instance_name {} --local_log_filepath {} --os_user {} 
--instance_hostname {}".\
-            format(ssn_conf['instance_name'], local_log_filepath, 
ssn_conf['dlab_ssh_user'], instance_hostname)
+            format(ssn_conf['instance_name'], local_log_filepath, 
ssn_conf['dlab_ssh_user'],
+                   ssn_conf['instance_hostname'])
         local("~/scripts/{}.py {}".format('upload_response_file', params))
     except Exception as err:
-        print('Error: {0}'.format(err))
-        GCPActions().remove_instance(ssn_conf['instance_name'], 
ssn_conf['zone'])
-        GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
-        GCPActions().remove_role(ssn_conf['role_name'])
-        GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
-        GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
-            GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
-            GCPActions().remove_vpc(ssn_conf['vpc_name'])
+        dlab.fab.append_result("Error with writing results.", str(err))
+        clear_resources()
         sys.exit(1)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py 
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
index f776fce..b2f75a6 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
@@ -21,14 +21,16 @@
 #
 # 
******************************************************************************
 
-from dlab.fab import *
-from dlab.actions_lib import *
-from dlab.meta_lib import *
 import sys, os
 from fabric.api import *
-from dlab.ssn_lib import *
 import json
 import argparse
+import logging
+import traceback
+import dlab.ssn_lib
+import dlab.fab
+import dlab.actions_lib
+import dlab.meta_lib
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--ssn_unique_index', type=str, default='')
@@ -36,48 +38,49 @@ args = parser.parse_args()
 
 if __name__ == "__main__":
     local_log_filename = "{}_{}.log".format(os.environ['conf_resource'], 
os.environ['request_id'])
-    local_log_filepath = "/logs/" + os.environ['conf_resource'] +  "/" + 
local_log_filename
+    local_log_filepath = "/logs/" + os.environ['conf_resource'] + "/" + 
local_log_filename
     logging.basicConfig(format='%(levelname)-8s [%(asctime)s]  %(message)s',
                         level=logging.DEBUG,
                         filename=local_log_filepath)
-    instance = 'ssn'
-    pre_defined_vpc = False
-    pre_defined_subnet = False
-    pre_defined_firewall = False
-    logging.info('[DERIVING NAMES]')
-    print('[DERIVING NAMES]')
-    ssn_conf = dict()
-    ssn_conf['ssn_unique_index'] = args.ssn_unique_index
-    ssn_conf['service_base_name'] = os.environ['conf_service_base_name'] = 
replace_multi_symbols(
-        os.environ['conf_service_base_name'].lower().replace('_', '-')[:12], 
'-', True)
-    ssn_conf['region'] = os.environ['gcp_region']
-    ssn_conf['zone'] = os.environ['gcp_zone']
-    ssn_conf['ssn_bucket_name'] = 
'{}-ssn-bucket'.format(ssn_conf['service_base_name'])
-    ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
-    ssn_conf['shared_bucket_name'] = 
'{0}-{1}-shared-bucket'.format(ssn_conf['service_base_name'],
-                                                                    
ssn_conf['default_endpoint_name'])
-    ssn_conf['instance_name'] = '{}-ssn'.format(ssn_conf['service_base_name'])
-    ssn_conf['instance_size'] = os.environ['gcp_ssn_instance_size']
-    ssn_conf['vpc_name'] = '{}-ssn-vpc'.format(ssn_conf['service_base_name'])
-    ssn_conf['subnet_name'] = 
'{}-ssn-subnet'.format(ssn_conf['service_base_name'])
-    ssn_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
-    ssn_conf['subnet_prefix'] = '20'
-    ssn_conf['firewall_name'] = 
'{}-ssn-firewall'.format(ssn_conf['service_base_name'])
-    ssn_conf['ssh_key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
-    ssn_conf['service_account_name'] = 
'{}-ssn-sa'.format(ssn_conf['service_base_name']).replace('_', '-')
-    ssn_conf['image_name'] = 
os.environ['gcp_{}_image_name'.format(os.environ['conf_os_family'])]
-    ssn_conf['role_name'] = ssn_conf['service_base_name'] + '-' + 
ssn_conf['ssn_unique_index'] + '-ssn-role'
-    ssn_conf['static_address_name'] = 
'{}-ssn-ip'.format(ssn_conf['service_base_name'])
-    ssn_conf['ssn_policy_path'] = '/root/files/ssn_policy.json'
-    ssn_conf['ssn_roles_path'] = '/root/files/ssn_roles.json'
-    ssn_conf['network_tag'] = ssn_conf['instance_name']
-    ssn_conf['instance_labels'] = {"name": ssn_conf['instance_name'],
-                                   "sbn": ssn_conf['service_base_name'],
-                                   os.environ['conf_billing_tag_key']: 
os.environ['conf_billing_tag_value']}
-    ssn_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr']
+    try:
+        ssn_conf = dict()
+        ssn_conf['instance'] = 'ssn'
+        ssn_conf['pre_defined_vpc'] = False
+        ssn_conf['pre_defined_subnet'] = False
+        ssn_conf['pre_defined_firewall'] = False
+        logging.info('[DERIVING NAMES]')
+        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'].lower()[: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'])
+        ssn_conf['instance_size'] = os.environ['gcp_ssn_instance_size']
+        ssn_conf['vpc_name'] = '{}-vpc'.format(ssn_conf['service_base_name'])
+        ssn_conf['subnet_name'] = 
'{}-subnet'.format(ssn_conf['service_base_name'])
+        ssn_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
+        ssn_conf['subnet_prefix'] = '20'
+        ssn_conf['firewall_name'] = 
'{}-ssn-sg'.format(ssn_conf['service_base_name'])
+        ssn_conf['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
+        ssn_conf['service_account_name'] = 
'{}-ssn-sa'.format(ssn_conf['service_base_name']).replace('_', '-')
+        ssn_conf['image_name'] = 
os.environ['gcp_{}_image_name'.format(os.environ['conf_os_family'])]
+        ssn_conf['role_name'] = 
'{}-{}-ssn-role'.format(ssn_conf['service_base_name'], 
ssn_conf['ssn_unique_index'])
+        ssn_conf['static_address_name'] = 
'{}-ssn-static-ip'.format(ssn_conf['service_base_name'])
+        ssn_conf['ssn_policy_path'] = '/root/files/ssn_policy.json'
+        ssn_conf['ssn_roles_path'] = '/root/files/ssn_roles.json'
+        ssn_conf['network_tag'] = ssn_conf['instance_name']
+        ssn_conf['instance_labels'] = {"name": ssn_conf['instance_name'],
+                                       "sbn": ssn_conf['service_base_name'],
+                                       os.environ['conf_billing_tag_key']: 
os.environ['conf_billing_tag_value']}
+        ssn_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr']
+    except Exception as err:
+        dlab.fab.dlab.fab.append_result("Failed to generate variables 
dictionary.", str(err))
+        sys.exit(1)
 
     if GCPMeta().get_instance(ssn_conf['instance_name']):
-        print("Service base name should be unique and less or equal 12 
symbols. Please try again.")
+        dlab.fab.dlab.fab.append_result("Service base name should be unique 
and less or equal 20 symbols. "
+                                        "Please try again.")
         sys.exit(1)
 
     try:
@@ -87,7 +90,7 @@ if __name__ == "__main__":
             ssn_conf['vpc_name'] = os.environ['gcp_vpc_name']
     except KeyError:
         try:
-            pre_defined_vpc = True
+            ssn_conf['pre_defined_vpc'] = True
             logging.info('[CREATE VPC]')
             print('[CREATE VPC]')
             params = "--vpc_name {}".format(ssn_conf['vpc_name'])
@@ -98,9 +101,8 @@ if __name__ == "__main__":
                 traceback.print_exc()
                 raise Exception
         except Exception as err:
-            print('Error: {0}'.format(err))
-            append_result("Failed to create VPC. Exception:" + str(err))
-            if pre_defined_vpc:
+            dlab.fab.append_result("Failed to create VPC.", str(err))
+            if ssn_conf['pre_defined_vpc']:
                 try:
                     GCPActions().remove_vpc(ssn_conf['vpc_name'])
                 except:
@@ -115,7 +117,7 @@ if __name__ == "__main__":
             ssn_conf['subnet_name'] = os.environ['gcp_subnet_name']
     except KeyError:
         try:
-            pre_defined_subnet = True
+            ssn_conf['pre_defined_subnet'] = True
             logging.info('[CREATE SUBNET]')
             print('[CREATE SUBNET]')
             params = "--subnet_name {} --region {} --vpc_selflink {} --prefix 
{} --vpc_cidr {} --ssn {}".\
@@ -128,9 +130,8 @@ if __name__ == "__main__":
                 traceback.print_exc()
                 raise Exception
         except Exception as err:
-            print('Error: {0}'.format(err))
-            append_result("Failed to create Subnet.", str(err))
-            if pre_defined_vpc:
+            dlab.fab.append_result("Failed to create Subnet.", str(err))
+            if ssn_conf['pre_defined_vpc']:
                 try:
                     GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
                 except:
@@ -146,7 +147,7 @@ if __name__ == "__main__":
             ssn_conf['firewall_name'] = os.environ['gcp_firewall_name']
     except KeyError:
         try:
-            pre_defined_firewall = True
+            ssn_conf['pre_defined_firewall'] = True
             logging.info('[CREATE FIREWALL]')
             print('[CREATE FIREWALL]')
             firewall_rules = dict()
@@ -154,7 +155,7 @@ if __name__ == "__main__":
             firewall_rules['egress'] = []
 
             ingress_rule = dict()
-            ingress_rule['name'] = ssn_conf['firewall_name'] + '-ingress'
+            ingress_rule['name'] = 
'{}-ingress'.format(ssn_conf['firewall_name'])
             ingress_rule['targetTags'] = [ssn_conf['network_tag']]
             ingress_rule['sourceRanges'] = [ssn_conf['allowed_ip_cidr']]
             rules = [
@@ -169,7 +170,7 @@ if __name__ == "__main__":
             firewall_rules['ingress'].append(ingress_rule)
 
             egress_rule = dict()
-            egress_rule['name'] = ssn_conf['firewall_name'] + '-egress'
+            egress_rule['name'] = '{}-egress'.format(ssn_conf['firewall_name'])
             egress_rule['targetTags'] = [ssn_conf['network_tag']]
             egress_rule['destinationRanges'] = [ssn_conf['allowed_ip_cidr']]
             rules = [
@@ -190,9 +191,8 @@ if __name__ == "__main__":
                 traceback.print_exc()
                 raise Exception
         except Exception as err:
-            print('Error: {0}'.format(err))
-            append_result("Failed to create Firewall.", str(err))
-            if pre_defined_vpc:
+            dlab.fab.append_result("Failed to create Firewall.", str(err))
+            if ssn_conf['pre_defined_vpc']:
                 GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
                 GCPActions().remove_vpc(ssn_conf['vpc_name'])
             sys.exit(1)
@@ -200,28 +200,28 @@ if __name__ == "__main__":
     try:
         logging.info('[CREATE SERVICE ACCOUNT AND ROLE]')
         print('[CREATE SERVICE ACCOUNT AND ROLE]')
-        params = "--service_account_name {} --role_name {} --policy_path {} 
--roles_path {} --unique_index {} --service_base_name {}".format(
-            ssn_conf['service_account_name'], ssn_conf['role_name'],
-            ssn_conf['ssn_policy_path'], ssn_conf['ssn_roles_path'], 
ssn_conf['ssn_unique_index'], ssn_conf['service_base_name'])
+        params = "--service_account_name {} --role_name {} --policy_path {} 
--roles_path {} --unique_index {} " \
+                 "--service_base_name {}".format( 
ssn_conf['service_account_name'], ssn_conf['role_name'], 
+                                                  ssn_conf['ssn_policy_path'], 
ssn_conf['ssn_roles_path'], 
+                                                  
ssn_conf['ssn_unique_index'], ssn_conf['service_base_name'])
         try:
             local("~/scripts/{}.py {}".format('common_create_service_account', 
params))
         except:
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Unable to create Service account and role.", str(err))
+        dlab.fab.append_result("Unable to create Service account and role.", 
str(err))
         try:
             
GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
             GCPActions().remove_role(ssn_conf['role_name'])
         except:
             print("Service account hasn't been created")
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
+        if ssn_conf['pre_defined_firewall']:
+            
GCPActions().remove_firewall('{}-ingress'.format(ssn_conf['firewall_name']))
+            
GCPActions().remove_firewall('{}-egress'.format(ssn_conf['firewall_name']))
+        if ssn_conf['pre_defined_subnet']:
             GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
+        if ssn_conf['pre_defined_vpc']:
             GCPActions().remove_vpc(ssn_conf['vpc_name'])
         sys.exit(1)
 
@@ -235,8 +235,7 @@ if __name__ == "__main__":
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Failed to create static ip.", str(err))
+        dlab.fab.append_result("Failed to create static ip.", str(err))
         try:
             
GCPActions().remove_static_address(ssn_conf['static_address_name'], 
ssn_conf['region'])
         except:
@@ -245,52 +244,53 @@ if __name__ == "__main__":
         GCPActions().remove_role(ssn_conf['role_name'])
         GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
         GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
+        if ssn_conf['pre_defined_firewall']:
+            
GCPActions().remove_firewall('{}-ingress'.format(ssn_conf['firewall_name']))
+            
GCPActions().remove_firewall('{}-egress'.format(ssn_conf['firewall_name']))
+        if ssn_conf['pre_defined_subnet']:
             GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
+        if ssn_conf['pre_defined_vpc']:
             GCPActions().remove_vpc(ssn_conf['vpc_name'])
         sys.exit(1)
 
     if os.environ['conf_os_family'] == 'debian':
-        initial_user = 'ubuntu'
-        sudo_group = 'sudo'
+        ssn_conf['initial_user'] = 'ubuntu'
+        ssn_conf['sudo_group'] = 'sudo'
     if os.environ['conf_os_family'] == 'redhat':
-        initial_user = 'ec2-user'
-        sudo_group = 'wheel'
+        ssn_conf['initial_user'] = 'ec2-user'
+        ssn_conf['sudo_group'] = 'wheel'
 
     try:
-        ssn_conf['static_ip'] = \
-            GCPMeta().get_static_address(ssn_conf['region'], 
ssn_conf['static_address_name'])['address']
+        ssn_conf['static_ip'] = 
GCPMeta().get_static_address(ssn_conf['region'],
+                                                             
ssn_conf['static_address_name'])['address']
         logging.info('[CREATE SSN INSTANCE]')
         print('[CREATE SSN INSTANCE]')
         params = "--instance_name {0} --region {1} --zone {2} --vpc_name {3} 
--subnet_name {4} --instance_size {5}"\
                  " --ssh_key_path {6} --initial_user {7} 
--service_account_name {8} --image_name {9}"\
-                 " --instance_class {10} --static_ip {11} --network_tag {12} 
--labels '{13}' --primary_disk_size {14} --service_base_name {15}".\
+                 " --instance_class {10} --static_ip {11} --network_tag {12} 
--labels '{13}' " \
+                 "--primary_disk_size {14} --service_base_name {15}".\
             format(ssn_conf['instance_name'], ssn_conf['region'], 
ssn_conf['zone'], ssn_conf['vpc_name'],
-                   ssn_conf['subnet_name'], ssn_conf['instance_size'], 
ssn_conf['ssh_key_path'], initial_user,
-                   ssn_conf['service_account_name'], ssn_conf['image_name'], 
'ssn', ssn_conf['static_ip'],
-                   ssn_conf['network_tag'], 
json.dumps(ssn_conf['instance_labels']), '20', ssn_conf['service_base_name'])
+                   ssn_conf['subnet_name'], ssn_conf['instance_size'], 
ssn_conf['ssh_key_path'],
+                   ssn_conf['initial_user'], ssn_conf['service_account_name'], 
ssn_conf['image_name'], 'ssn',
+                   ssn_conf['static_ip'], ssn_conf['network_tag'], 
json.dumps(ssn_conf['instance_labels']), '20',
+                   ssn_conf['service_base_name'])
         try:
             local("~/scripts/{}.py {}".format('common_create_instance', 
params))
         except:
             traceback.print_exc()
             raise Exception
     except Exception as err:
-        print('Error: {0}'.format(err))
-        append_result("Unable to create ssn instance.", str(err))
+        dlab.fab.append_result("Unable to create ssn instance.", str(err))
         GCPActions().remove_service_account(ssn_conf['service_account_name'], 
ssn_conf['service_base_name'])
         GCPActions().remove_role(ssn_conf['role_name'])
         GCPActions().remove_static_address(ssn_conf['static_address_name'], 
ssn_conf['region'])
         GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
         GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
-        if pre_defined_firewall:
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
-            GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
-        if pre_defined_subnet:
+        if ssn_conf['pre_defined_firewall']:
+            
GCPActions().remove_firewall('{}-ingress'.format(ssn_conf['firewall_name']))
+            
GCPActions().remove_firewall('{}-egress'.format(ssn_conf['firewall_name']))
+        if ssn_conf['pre_defined_subnet']:
             GCPActions().remove_subnet(ssn_conf['subnet_name'], 
ssn_conf['region'])
-        if pre_defined_vpc:
+        if ssn_conf['pre_defined_vpc']:
             GCPActions().remove_vpc(ssn_conf['vpc_name'])
-        sys.exit(1)
\ No newline at end of file
+        sys.exit(1)


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

Reply via email to