reorder tool's output

Author: Cohen-J-Omer

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ibm-ray-config
-version = 1.0.0b26
+version = 1.0.0b27
 author = Omer J Cohen
 author_email = [email protected]
 description = Interactive tool generating ray configuration for IBM platforms 

src/ibm_ray_config/main.py

@@ -53,7 +53,6 @@ def validate_api_keys(base_config, modules, iam_api_key, compute_iam_endpoint):
 
 @click.command()
 @click.option('--output-folder', '-o', help='Output folder to save configurations')
-# @click.option('--input-file', '-i', help=f'Template for the new configuration')
 @click.option('--iam-api-key', '-a', help='IAM_API_KEY')
 @click.option('--version', '-v', help=f'Get package version', is_flag=True)
 @click.option('--compute-iam-endpoint', help='IAM endpoint url used for compute instead of default https://iam.cloud.ibm.com')

src/ibm_ray_config/modules/gen2/ray/vpc.py

@@ -294,7 +294,7 @@ def _create_vpc_peripherals(self, ibm_vpc_client, vpc_obj, zone_obj, resource_gr
         ibm_vpc_client.set_subnet_public_gateway(
             subnet_id, {'id': gateway_id})
 
-        print(color_msg(f"VPC subnet {subnet_prototype['name']} been created and attached to gateway", color=Color.LIGHTGREEN))
+        print(color_msg(f"VPC subnet {subnet_prototype['name']} been created and attached to gateway\n", color=Color.LIGHTGREEN))
 
         # Update security group to have all required rules
         sg_id = vpc_obj['default_security_group']['id']
@@ -321,7 +321,7 @@ def _create_vpc_peripherals(self, ibm_vpc_client, vpc_obj, zone_obj, resource_gr
                 res = ibm_vpc_client.create_security_group_rule(
                     sg_id, sg_rule_prototype).get_result()
 
-        print(color_msg(f"Security group {sg_name} been updated with required rules", color=Color.LIGHTGREEN))
+        print(color_msg(f"Security group {sg_name} been updated with required rules\n", color=Color.LIGHTGREEN))
 
     def create_public_gateway(self, vpc_obj, zone_obj, resource_group, subnet_name):
         vpc_id = vpc_obj['id']
@@ -410,7 +410,7 @@ def list_vpcs():
             # Create a new VPC
             if not vpc_name:
                 resource_group_id = self._select_resource_group()
-                print(color_msg(f"Using resource group id: {resource_group_id}",color=Color.LIGHTGREEN))
+                print(color_msg(f"Using resource group id: {resource_group_id}\n",color=Color.LIGHTGREEN))
                 resource_group = {'id': resource_group_id}
 
                 vpc_obj = self._create_vpc(ibm_vpc_client, resource_group)

src/ibm_ray_config/modules/gen2/ssh_key.py

@@ -17,7 +17,7 @@ def generate_keypair():
     filename = f"{os.sep}tmp{os.sep}{DEFAULT_KEY_NAME}"
 
     os.system(f'ssh-keygen -b 2048 -t rsa -f {filename} -q -N ""')
-    print(f"\n\n\033[92mSSH key pair been generated\n")
+    print(color_msg("SSH key pair been generated",Color.LIGHTGREEN))
     print(f"private key intermediate location: {os.path.abspath(filename)}")
     print(f"public key intermediate location: {os.path.abspath(filename)}.pub\033[0m")
     with open(f"{filename}.pub", 'r') as file:
@@ -93,7 +93,7 @@ def register_ssh_key(ibm_vpc_client, config, auto=False):
                 print(color_msg("Can't register an SSH key with the same fingerprint",Color.RED))
             exit(1) # can't continue the configuration process without a valid ssh key   
 
-    print(f"\033[92mnew SSH key: '{keyname}' been registered in vpc\033[0m")
+    print(color_msg(f"new SSH key '{keyname}' been registered in vpc\n", Color.LIGHTGREEN))
 
     result = response.get_result()
     return result['name'], result['id'], private_ssh_key_path
@@ -197,7 +197,7 @@ def is_pair(id, ssh_key_filename):
             ssh_key_data = subprocess.getoutput([f"ssh-keygen -y -f {self.defaults['ssh_key_filename']} | cut -d' ' -f 2"])
             response = self.ibm_vpc_client.create_key(public_key=ssh_key_data, name=default_keyname, resource_group={
                                         "id": resource_group_id}, type='rsa')
-            print(f"\033[92mnew SSH key {default_keyname} been registered in vpc\033[0m")
+            print(color_msg(f"new SSH key {default_keyname} been registered in vpc\n", Color.LIGHTGREEN))
             result = response.get_result()
             return result['id'], self.defaults['ssh_key_filename'], 'root'
         else: