Add IBM VMs to list_cloud_instances command (refs FRUC-206)

Author: nazarovdo

core/commands/list_cloud_instances_command.rb

@@ -8,6 +8,7 @@
 require_relative 'base_command'
 require_relative '../services/aws_service'
 require_relative '../services/gcp_service'
+require_relative '../services/ibm_service'
 require_relative '../services/configuration_reader'
 
 # Command shows list all active instances on Cloud Providers
@@ -20,7 +21,7 @@ def self.synopsis
 
   def show_help
     info = <<-HELP
-List cloud instances command shows a list of active machines on GCP and AWS providers and the time they were created.
+List cloud instances command shows a list of active machines on GCP, AWS and IBM Cloud providers and the time they were created.
 
 Add the --json flag for the list_cloud_instances command to show the machine readable text.
 Add the --hours NUMBER_OF_HOURS flag for displaying the machine older than this hours.
@@ -45,7 +46,7 @@ def execute
   def show_list
     @hidden_instances = read_hidden_instances
     @number_instances = 0
-    print_lists(generate_aws_list, generate_gcp_list)
+    print_lists(generate_aws_list, generate_gcp_list, generate_ibm_list)
   end
 
   def generate_aws_list
@@ -90,6 +91,21 @@ def generate_gcp_list
     Result.ok(all_instances)
   end
 
+  def generate_ibm_list
+    return Result.error('IBM Cloud service is not configured') unless @env.ibm_service.configured?
+
+    all_instances = @env.ibm_service.instances_list_with_time
+    return Result.error('No instances were found in IBM Cloud services') if all_instances.empty?
+
+    all_instances.each do |instance|
+      instance[:launch_time] = DateTime.parse(instance[:launch_time]).new_offset(0.0 / 24)
+    end
+    all_instances = select_by_time(all_instances) unless @env.hours.nil?
+    all_instances = time_to_string(all_instances)
+    @number_instances += all_instances.size
+    Result.ok(all_instances)
+  end
+
   def select_by_time(instances)
     new_instances = instances
     if @env.hours.to_i <= 0
@@ -108,26 +124,32 @@ def time_to_string(instances)
     end
   end
 
-  def print_lists(aws_list, gcp_list)
+  def print_lists(aws_list, gcp_list, ibm_list)
     if @env.json
-      @ui.out(in_json_format(aws_list, gcp_list))
+      @ui.out(in_json_format(aws_list, gcp_list, ibm_list))
     else
       if aws_list.success?
         @ui.info('List all active instances on AWS:')
-        @ui.info("\n" + in_table_format(aws_list.value, false))
+        @ui.info("\n" + in_table_format(aws_list.value, false, 'aws'))
       else
         @ui.info(aws_list.error)
       end
       if gcp_list.success?
         @ui.info('List all active instances on GCP:')
-        @ui.info("\n" + in_table_format(gcp_list.value, true))
+        @ui.info("\n" + in_table_format(gcp_list.value, true, 'gcp'))
       else
         @ui.info(gcp_list.error)
       end
+      if ibm_list.success?
+        @ui.info('List all active instances on IBM Cloud:')
+        @ui.info("\n" + in_table_format(ibm_list.value, false, 'ibm'))
+      else
+        @ui.info(ibm_list.error)
+      end
     end
   end
 
-  def in_json_format(aws_list, gcp_list)
+  def in_json_format(aws_list, gcp_list, ibm_list)
     aws_list_json = if aws_list.error?
                       { aws: aws_list.error }
                     else
@@ -138,18 +160,25 @@ def in_json_format(aws_list, gcp_list)
                     else
                       { gcp: gcp_list.value }
                     end
-    JSON.generate(aws_list_json.merge(gcp_list_json))
+    ibm_list_json = if ibm_list.error?
+                      { ibm: ibm_list.error }
+                    else
+                      { ibm: ibm_list.value }
+                    end
+    JSON.generate(aws_list_json.merge(gcp_list_json, ibm_list_json))
   end
 
-  def in_table_format(list, with_user_info)
+  def in_table_format(list, with_user_info, provider)
     return 'List empty' if list.empty?
 
     header = ['Launch time', 'Node name']
+    header.concat(['PVM Instance ID']) if provider == 'ibm'
     header.concat(['Zone' ,'Path', 'User']) if with_user_info
     table = TTY::Table.new(header: header)
     list.each do |instance|
       info = [instance[:launch_time], instance[:node_name]]
       info.concat([instance[:zone] ,instance[:path], instance[:username]]) if with_user_info
+      info.concat([instance[:instance_id]]) if provider == 'ibm'
       table << info
     end
     table.render(:unicode)

core/services/ibm_service.rb

@@ -21,6 +21,10 @@ def initialize(ibm_config, logger)
       @ibm_iam_token = retrieve_iam_token
     end
 
+    def configured?
+      @configured
+    end
+
     def instance_exists?(instance_name)
       instance_data = fetch_pvm_instance_data(instance_name)
       !instance_data.nil?
@@ -31,6 +35,24 @@ def public_network_exists?(instance_name)
       !public_network_data.nil?
     end
 
+    def instances_list_with_time
+      return [] unless configured?
+    
+      list_instances['pvmInstances']
+        .map { |instance| generate_instance_info(instance) }
+        .sort_by { |vm| DateTime.parse(vm[:launch_time]) }
+        .reverse
+    end
+    
+    def generate_instance_info(instance)
+      {
+        launch_time: instance['creationDate'],
+        node_name: instance['serverName'],
+        instance_id: instance['pvmInstanceID']
+      }
+    end
+    
+
     def delete_ssh_key(key_pair_name)
       uri = URI("https://#{@ibm_region}.power-iaas.cloud.ibm.com/pcloud/v1/tenants/#{@ibm_tenant_id}/sshkeys/#{key_pair_name}")
       send_delete_request(uri)