morpheus-cli 8.0.1 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8074c5d41cd8ca2aa6f199a0b85f22f7c2b8d3647b2788604d42424b7abbd9b
-  data.tar.gz: 8176b21a71b63466b537ca4d43933e06411ae374cbb159ab451f4e37042299e5
+  metadata.gz: 06ea65156f0a57e7af971494347aae4844608a6cb877087dc9394a127841a75e
+  data.tar.gz: a93ddec1dc9e647e23a111a168126dbfc3b683d04844731f5bc53a461305b140
 SHA512:
-  metadata.gz: 05414d569b3e9d323ca0ebf0ff86778e9656f84b92af1a2e6520e826351dc444eb1c6d6721ef7137ffbe603be703832dcd15f4e14c31f28005b6de7c2cc454f8
-  data.tar.gz: fca09ddb93cf6cc58401d1652803a61d220fe9999427a931b0fed515c5a8e0a2933013299323722739a7f65c9b9b42edffe4a62972cad85e9b5651a4fcded2df
+  metadata.gz: 9ca9b136bd006211eed46cd89103c2e7af9157d8111595f4e90b09a7a1e014570405256d64401c78311503e3d4b0aaecf5690526b2014985d79c515e0093eba3
+  data.tar.gz: f1355c6ec99b7a05e068e215ba4581a75a712bef545b661a04e7a31ad0b1711071d7f65c316e938171da60d66d0a297898068f5efb70e750a7dc987b2f12014e

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.0.1
+RUN gem install morpheus-cli -v 8.0.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/cli_command.rb

@@ -1278,7 +1278,7 @@ module Morpheus
         elsif options[:remote_url]
           credentials = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url)
           unless options[:skip_login]
-            @wallet = credentials.request_credentials(options, @do_save_credentials)
+            @wallet = credentials.request_credentials(options.merge({dry_run:false}), @do_save_credentials)
           end
         else
           credentials = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url)
@@ -1293,7 +1293,7 @@ module Morpheus
           
           if @wallet.nil? || @wallet['access_token'].nil?
             unless options[:skip_login]
-              @wallet = credentials.request_credentials(options, @do_save_credentials)
+              @wallet = credentials.request_credentials(options.merge({dry_run:false}), @do_save_credentials)
             end
           end
           
@@ -1767,7 +1767,22 @@ module Morpheus
           output = records.collect { |record| 
             options[:select_fields].collect { |field| 
               value = get_object_value(record, field)
-              value.is_a?(String) ? value : JSON.fast_generate(value)
+              if value.is_a?(String)
+                value
+              else
+                if options[:json]
+                  as_json(value, options)
+                elsif options[:yaml]
+                  output = as_yaml(value, options)
+                elsif options[:csv]
+                  as_csv(value, nil, options)
+                else
+                  # default behavior
+                  # value.is_a?(String) ? value : as_json(value, options)
+                  do_pretty = options.key?(:pretty_json) ? options[:pretty_json] : false # or true?
+                  do_pretty ? JSON.pretty_generate(value) : JSON.fast_generate(value)
+                end
+              end
             }.join(options[:delim] || ",")
           }.join(options[:newline] || "\n")
         elsif options[:json]

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

@@ -6,6 +6,7 @@ class Morpheus::Cli::Clusters
   include Morpheus::Cli::ProcessesHelper
   include Morpheus::Cli::WhoamiHelper
   include Morpheus::Cli::AccountsHelper
+  include Morpheus::Cli::ExecutionRequestHelper
 
   register_subcommands :list, :count, :get, :view, :add, :update, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}
   register_subcommands :list_workers, :add_worker, :remove_worker, :update_worker_count
@@ -607,7 +608,7 @@ class Morpheus::Cli::Clusters
         end
 
         # Controller type
-        server_types = @server_types_interface.list({computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes'].reject {|it| it['provisionType']['code'] == 'manual'}
+        server_types = @server_types_interface.list({computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes'].reject {|it| it['provisionType']['code'] == 'manual'} unless ['kubernetes-cluster', 'mvm-cluster'].include?(cluster_type_code)
         controller_provision_type = nil
         resource_pool = nil
 
@@ -802,6 +803,9 @@ class Morpheus::Cli::Clusters
       opts.on('--managed [on|off]', String, "Can be used to enable / disable managed cluster. Default is on") do |val|
         options[:managed] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
+      opts.on('--useAgent [on|off]', String, "Use the Agent to relay communications for the Kubernetes API instead of direct.") do |val|
+        options[:useAgent] = val.to_s
+      end
       opts.on('--autoRecoverPowerState [on|off]', String, "Automatically Power On VMs") do |val|
         options[:autoRecoverPowerState] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
@@ -855,6 +859,7 @@ class Morpheus::Cli::Clusters
         cluster_payload['refresh'] = options[:refresh] if options[:refresh] == true
         cluster_payload['tenant'] = options[:tenant] if !options[:tenant].nil?
         cluster_payload['integrations'] = options[:integrations] if !options[:integrations].nil?
+        cluster_payload['useAgent'] = options[:useAgent] if !options[:useAgent].nil?
         payload = {"cluster" => cluster_payload}
       end
 
@@ -3004,6 +3009,12 @@ class Morpheus::Cli::Clusters
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage( "[cluster] [options]")
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh" ) do
+        options[:no_refresh] = true
+      end
       build_option_type_options(opts, options, add_datastore_option_types)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Add datastore to a cluster.\n" +
@@ -3059,11 +3070,19 @@ class Morpheus::Cli::Clusters
       json_response = @clusters_interface.create_datastore(cluster['id'], payload)
       if options[:json]
         puts as_json(json_response)
-      elsif json_response['success']
-        if json_response['msg'] == nil
-          print_green_success "Added datastore to cluster #{cluster['name']}"
+      else
+        if json_response['success']
+          if json_response['msg'] == nil
+            print_green_success "Adding datastore to cluster #{cluster['name']}"
+          else
+            print_green_success json_response['msg']
+          end
+          execution_id = json_response['executionId']
+          if !options[:no_refresh] && execution_id
+            wait_for_execution_request(json_response['executionId'], options.merge({waiting_status:['new', 'pending', 'executing']}))
+          end
         else
-          print_green_success json_response['msg']
+          print_red_alert "Failed to create cluster datastore #{json_response['msg']}"
         end
       end
       return 0
@@ -3074,6 +3093,7 @@ class Morpheus::Cli::Clusters
   end
 
   def remove_datastore(args)
+    default_refresh_interval = 5
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -3081,6 +3101,12 @@ class Morpheus::Cli::Clusters
       opts.on( '-f', '--force', "Force Delete" ) do
         params[:force] = 'on'
       end
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh" ) do
+        options[:no_refresh] = true
+      end
       build_standard_remove_options(opts, options)
       opts.footer = "Delete a datastore from a cluster.\n" +
         "[cluster] is required. This is the name or id of an existing cluster.\n" +
@@ -3114,12 +3140,18 @@ class Morpheus::Cli::Clusters
       return
     end
     json_response = @clusters_interface.destroy_datastore(cluster['id'], datastore['id'], params)
-    render_response(json_response, options) do
-      msg = "Datastore #{datastore['name']} is being removed from cluster #{cluster['name']}..."
-      if json_response['msg']
-        msg = json_response['msg']
+    if options[:json]
+      puts as_json(json_response)
+    else
+      if json_response['success']
+        print_green_success "Datastore #{datastore['name']} is being removed from cluster #{cluster['name']}"
+        execution_id = json_response['executionId']
+        if !options[:no_refresh] && execution_id
+          wait_for_execution_request(execution_id, options.merge({waiting_status:['new', 'pending', 'executing']}))
+        end
+      else
+        print_red_alert "Failed to remove cluster datastore #{json_response['msg']}"
       end
-      print_green_success msg
     end
     return 0, nil
   end
@@ -4535,7 +4567,12 @@ class Morpheus::Cli::Clusters
         elsif resource_pool_options.count > 1 && !options[:no_prompt]
           resource_pool_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourcePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}],options[:options],api_client, {})['resourcePool']
         else
-          resource_pool_id = resource_pool_options.first['id']
+          first_option = resource_pool_options.find {|it| !it['id'].nil? }
+          if first_option.nil?
+            print_red_alert "Cloud #{cloud['name']} has no available resource pools"
+            exit 1
+          end
+          resource_pool_id = first_option['id']
         end
         if resource_pool_id.to_s["poolGroup-"]
           resource_pool = @resource_pool_groups_interface.get(resource_pool_id)['resourcePoolGroup']

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

@@ -1337,14 +1337,20 @@ class Morpheus::Cli::Hosts
       payload[:server][:plan] = {id: service_plan["id"]}
 
       # fetch volumes
-      volumes_response = @servers_interface.volumes(server['id'])
-      current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      current_volumes = nil
+      if server['volumes']
+        current_volumes = server['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      else
+        volumes_response = @servers_interface.volumes(server['id'])
+        current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      end
 
       # prompt for volumes
       vol_options = options 
       vol_options['siteId'] = group_id
       vol_options['zoneId'] = cloud_id
-      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, vol_options)
+      vol_options['resourcePoolId'] = server['resourcePool']['id'] if server['resourcePool']
+      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, vol_options, server)
       if !volumes.empty?
         payload[:volumes] = volumes
       end

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

@@ -2756,7 +2756,10 @@ class Morpheus::Cli::Instances
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
     return 1, "instance not found" if instance.nil?
-    
+    # need to load full instance details in case fetched by name
+    if instance['containerDetails'].nil?
+      instance = find_instance_by_id(instance['id'])
+    end
     payload = {}
     if options[:payload]
       payload = options[:payload]
@@ -2811,13 +2814,24 @@ class Morpheus::Cli::Instances
       payload["instance"]["plan"] = {"id" => service_plan["id"]}
 
       volumes_response = @instances_interface.volumes(instance['id'])
-      current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      current_volumes = nil
 
       # prompt for volumes
       vol_options = options 
       vol_options['siteId'] = group_id
       vol_options['zoneId'] = cloud_id
-      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, vol_options)
+      vol_options['resourcePoolId'] = resource_pool_id  # server['resourcePool']['id'] if server['resourcePool']
+      server = instance['containerDetails'][0]['server'] rescue nil
+      if server.nil?
+        Morpheus::Logging::DarkPrinter.puts "Failed to load server info"
+        volumes_response = @instances_interface.volumes(instance['id'])
+        current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      else
+         # or just use instance['volumes'] ?
+        current_volumes = server['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      end
+      vol_options['resourcePoolId'] = server['resourcePool']['id'] if server && server['resourcePool']
+      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, vol_options, server)
       if !volumes.empty?
         payload["volumes"] = volumes
       end

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

@@ -845,7 +845,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
   end
 
   def find_layout_by_name(name)
-    layouts = @library_cluster_layouts_interface.list(instance_type_id, {name: name.to_s})['layouts']
+    layouts = @library_cluster_layouts_interface.list({name: name.to_s})['layouts']
     if layouts.empty?
       print_red_alert "Cluster layout not found by name #{name}"
       return nil

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

@@ -635,8 +635,8 @@ class Morpheus::Cli::Shell
   # @return Hash like {:commands => [], :command_count => total}
   def load_history_commands(options={})
     phrase = options[:phrase]
-    sort_key = options[:sort] ? options[:sort].to_sym : nil
-    
+    #sort_key = options[:sort] ? options[:sort].to_sym : nil
+    #direction = options[:direction] # default sort is reversed to get newest first
     offset = options[:offset].to_i > 0 ? options[:offset].to_i : 0
     max = options[:max].to_i > 0 ? options[:max].to_i : 25
     
@@ -648,40 +648,21 @@ class Morpheus::Cli::Shell
     # collect records as [{:number => 1, :command => "instances list"}, etc]
     history_records = []
     history_count = 0
-    
-    # sort is a bit different for this command, the default sort is by number
-    # it sorts oldest -> newest, but shows the very last page by default.
-    if options[:sort] && ![:number, :command].include?(options[:sort])
-      sort_key = :number # nil
-    end
 
-    if options[:phrase] || sort_key || options[:direction] || options[:offset]
-      # this could be a large object...need to index our shell_history file lol
-      sort_key ||= :number
-      history_records = @history.keys.collect { |k| {number: k, command: @history[k]} }
-      if options[:direction] == 'desc'
-        history_records = history_records.sort {|x,y| y[sort_key] <=> x[sort_key] }
-      else
-        history_records = history_records.sort {|x,y| x[sort_key] <=> y[sort_key] }
-      end
-      if phrase
-        history_records = history_records.select {|it| it[:command].include?(phrase) || it[:number].to_s == phrase }
-      end
-      command_count = history_records.size
-      history_records = history_records[offset..(max-1)]
-    else
-      # default should try to be as fast as possible..
-      # no searching or sorting, default order by :number works
-      if offset != 0
-        cmd_numbers = @history.keys.last(max + offset).first(max)
-      else
-        cmd_numbers = @history.keys.last(max)
-      end
-      history_records = cmd_numbers.collect { |k| {number: k, command: @history[k]} }
-      command_count = @history.size
+    # only go so far back in command history, 1 million commands
+    # this could be a large object...need to index our shell_history file lol
+    # todo: this max needs to be done in load_history_from_log_file()
+    history_keys = @history.keys.last(1000000).reverse
+    # filter by phrase
+    if phrase
+      history_keys = history_keys.select {|k| (@history[k] && @history[k].include?(phrase)) || k.to_s == phrase }
     end
+    # no offset, just max
+    history_records = history_keys.first(max).collect { |k| {number: k, command: @history[k]} }
+    command_count = history_keys.size
+
     meta = {size:history_records.size, total:command_count.to_i, max:max, offset:offset}
-    return {:commands => history_records, :command_count => command_count, :meta => meta}
+    return {commands: history_records, command_count: command_count, meta: meta}
   end
 
   def print_history(options={})
@@ -696,16 +677,14 @@ class Morpheus::Cli::Shell
       end
     else
       print cyan
+      # by default show old->new as the shell history should bash history
+      history_records.reverse! unless options[:direction] == "desc"
       history_records.each do |history_record|
         puts "#{history_record[:number].to_s.rjust(3, ' ')}  #{history_record[:command]}"
       end
       if options[:show_pagination]
-        if options[:phrase] || options[:sort] || options[:direction] || options[:offset]
-          print_results_pagination(history_result[:meta])
-        else
-          # default order is weird, it's the last page of results, 1-25 is misleading and showing the indexes is stranger
-          print_results_pagination(history_result[:meta], {:message =>"Viewing most recent %{size} of %{total} %{label}"})
-        end
+        pagination_msg = options[:phrase] ? "Viewing most recent %{size} of %{total} commands matching '#{options[:phrase]}'" : "Viewing most recent %{size} of %{total} commands"
+        print_results_pagination(history_result[:meta], {:message =>pagination_msg})
         print reset, "\n"
       else
         print reset

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