morpheus-cli 8.0.1 → 8.0.3

data/lib/morpheus/cli/commands/virtual_images.rb

@@ -172,11 +172,8 @@ EOT
         id
       else
         image = find_virtual_image_by_name_or_id(id)
-        if image
-          image['id']
-        else
-          raise_command_error "virtual image not found for name '#{id}'"
-        end
+        return 1, "virtual image not found for name '#{id}'" if image.nil?
+        image['id']
       end
     end
     return run_command_for_each_arg(id_list) do |arg|
@@ -383,15 +380,16 @@ EOT
     # storageProviderId, format, name
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[image] [options]")
-      opts.on('-n', '--name NAME', String, "Name (optional) of the new converted image. Default is name of the original image.") do |val|
-        options[:options]['name'] = val
-      end
-      opts.on('-f', '--format FORMAT', String, "Format (optional). Default is 'qcow2'") do |val|
-        options[:options]['format'] = val
-      end
-      opts.on('--storageProvider VALUE', String, "Storage Provider ID (optional). Default is storage provider of the original image.") do |val|
-        options[:options]['storageProvider'] = val.to_s
-      end
+      # opts.on('-n', '--name NAME', String, "Name (optional) of the new converted image. Default is name of the original image.") do |val|
+      #   options[:options]['name'] = val
+      # end
+      # opts.on('-f', '--format FORMAT', String, "Format (optional). Default is 'qcow2'") do |val|
+      #   options[:options]['format'] = val
+      # end
+      # opts.on('--storageProvider VALUE', String, "Storage Provider ID (optional). Default is storage provider of the original image.") do |val|
+      #   options[:options]['storageProvider'] = val.to_s
+      # end
+      build_option_type_options(opts, options, convert_virtual_image_option_types)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Convert a virtual image to a new format." + "\n" +
         "[image] is required. This is the name or id of a virtual image."
@@ -411,7 +409,18 @@ EOT
       payload.deep_merge!({virtual_image_object_key => passed_options}) unless passed_options.empty?
     else
       virtual_image_payload = passed_options
-      virtual_image_payload['storageProvider'] = {'id' => virtual_image_payload['storageProvider']} unless virtual_image_payload['storageProvider'].nil?
+      source_format = virtual_image['imageType']
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(convert_virtual_image_option_types(source_format), options[:options], @api_client, {'virtualImageId': virtual_image['id']})
+      v_prompt.deep_compact!
+      virtual_image_payload.deep_merge!(v_prompt)
+      # support "storageProviderId" too
+      if virtual_image_payload['storageProviderId']
+        virtual_image_payload['storageProvider'] = virtual_image_payload.delete('storageProviderId')
+      end
+      # convert "storageProvider":1 to "storageProvider": {"id":1}
+      if virtual_image_payload['storageProvider'] && !virtual_image_payload['storageProvider'].is_a?(Hash)
+        virtual_image_payload['storageProvider'] = {'id' => virtual_image_payload['storageProvider'].to_i }
+      end
       payload = virtual_image_payload
     end
     @virtual_images_interface.setopts(options)
@@ -990,11 +999,20 @@ EOT
 
   def find_virtual_image_by_name(name)
     json_results = @virtual_images_interface.list({name: name.to_s})
-    if json_results['virtualImages'].empty?
+    records = json_results['virtualImages']
+    if records.empty?
       print_red_alert "Virtual Image not found by name #{name}"
       return nil
+    elsif records.size > 1
+      print_red_alert "More than one Virtual Image found by name '#{name}'"
+      print_error "\n"
+      puts_error as_pretty_table(records, [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      print_error reset,"\n"
+      return nil
+    else
+      virtual_image = records[0]
     end
-    virtual_image = json_results['virtualImages'][0]
     return virtual_image
   end
 
@@ -1074,6 +1092,42 @@ EOT
     list
   end
 
+  def convert_virtual_image_option_types(source_format=nil)
+    [
+      {'shorthand' => '-f', 'fieldName' => 'format', 'type' => 'select', 'fieldLabel' => 'Format', 'selectOptions' => get_convert_image_formats(source_format), 'required' => true, 'defaultValue' => (source_format == 'qcow2' ? nil : 'qcow2')},
+      {'shorthand' => '-b', 'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Bucket', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider Bucket or File Share.'},
+      {'shorthand' => '-n', 'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => false}
+    ]
+  end
+
+  def convert_source_types
+    ["raw","qcow2","vmdk",'vmware', "vhd","ovf"]
+  end
+
+  def convert_destination_types
+    #["raw", "qcow2", "vmdk",'vmware',"vhd","ovf"]
+    convert_source_types
+  end
+
+  def get_convert_image_formats(source_format=nil)
+    categories = [
+      {'name' => 'QCOW2', 'value' => 'qcow2'},
+      {'name' => 'VMDK', 'value' => 'ovf'},
+      {'name' => 'VHD', 'value' => 'vhd'},
+      {'name' => 'Raw', 'value' => 'raw'}
+    ]
+    # if source format (imageType) is not in the list, then no options
+    # else reject the current value
+    if source_format
+      if !convert_source_types.include?(source_format.to_s.downcase)
+        categories = []
+      else
+        categories = categories.select {|it| it['value'] != source_format.to_s.downcase }
+      end
+    end
+    return categories
+  end
+
   def format_tenants(accounts)
     if accounts && accounts.size > 0
       accounts = accounts.sort {|a,b| a['name'] <=> b['name'] }.uniq {|it| it['id'] }

data/lib/morpheus/cli/mixins/execution_request_helper.rb

@@ -29,7 +29,7 @@ module Morpheus::Cli::ExecutionRequestHelper
     # unless options[:quiet]
     #   print cyan, "Execution request has not yet finished. Refreshing every #{refresh_display_seconds} seconds...", "\n", reset
     # end
-    while execution_request['status'] == 'pending' || execution_request['status'] == 'new' do
+    while (options[:waiting_status] || ['new', 'pending']).include?(execution_request['status']) do
       sleep(refresh_interval)
       execution_request = execution_request_interface.get(execution_request_id)['executionRequest']
     end

data/lib/morpheus/cli/mixins/processes_helper.rb

@@ -8,8 +8,17 @@ module Morpheus::Cli::ProcessesHelper
     klass.send :include, Morpheus::Cli::PrintHelper
   end
 
+  def api_client
+    raise "#{self.class} has not defined @api_client" if @api_client.nil?
+    @api_client
+  end
+
+  def processes_interface
+    # get_interface('processes')
+    api_client.processes
+  end
 
-  def print_process_details(process)
+  def print_process_details(process, options={})
     description_cols = {
       "Process ID" => lambda {|it| it['id'] },
       "Name" => lambda {|it| it['displayName'] },
@@ -22,7 +31,7 @@ module Morpheus::Cli::ProcessesHelper
       "Status" => lambda {|it| format_process_status(it) },
       # "# Events" => lambda {|it| (it['events'] || []).size() },
     }
-    print_description_list(description_cols, process)
+    print_description_list(description_cols, process, options)
 
     if process['error']
       print_h2 "Error"
@@ -39,7 +48,7 @@ module Morpheus::Cli::ProcessesHelper
     end
   end
 
-  def print_process_event_details(process_event)
+  def print_process_event_details(process_event, options={})
     # process_event =~ process
     description_cols = {
       "Process ID" => lambda {|it| it['processId'] },
@@ -53,7 +62,7 @@ module Morpheus::Cli::ProcessesHelper
       "Duration" => lambda {|it| format_process_duration(it) },
       "Status" => lambda {|it| format_process_status(it) },
     }
-    print_description_list(description_cols, process_event)
+    print_description_list(description_cols, process_event, options)
 
     if process_event['error']
       print_h2 "Error"
@@ -111,4 +120,25 @@ module Morpheus::Cli::ProcessesHelper
     out
   end
 
+  def wait_for_process_execution(process_id, options={}, print_output = true)
+    refresh_interval = 10
+    if options[:refresh_interval].to_i > 0
+      refresh_interval = options[:refresh_interval]
+    end
+    refresh_display_seconds = refresh_interval % 1.0 == 0 ? refresh_interval.to_i : refresh_interval
+    unless options[:quiet]
+      print cyan, "Refreshing every #{refresh_display_seconds} seconds until process is complete...", "\n", reset
+    end
+    process = processes_interface.get(process_id)['process']
+    while ['new','queued','pending','running'].include?(process['status']) do
+      sleep(refresh_interval)
+      process = processes_interface.get(process_id)['process']
+    end
+    if print_output && options[:quiet] != true
+      print_h1 "Process Details", [], options
+      print_process_details(process, options)
+    end
+    return process
+  end
+
 end