morpheus-cli 8.0.6 → 8.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bd49f7ba0c5284049c949b7eb9abab30586335cf7994071467ac2e40e5052f8
-  data.tar.gz: 8042138fa3aa60542f6a042a035172f15aac37483fd3fea25fd11ed550e1ba29
+  metadata.gz: 28b8927c521af95d6c463be3cf8de08ad7f84017e18ab89a8143759d6e11e722
+  data.tar.gz: 0a1c6677040bcb8e50a5bde9603b5cda373d8ee16c41cf3a74ed96f1ff23a1be
 SHA512:
-  metadata.gz: 24dd7b12d6f4a3884844af6ad53736cfecf3c28102aae2f2b8a710bac97433955aae2d7771f367ae8241f721a701c5a8d375a95fe065af5162280ebbe737d342
-  data.tar.gz: 1dca804ca56f509dcf13d9a35312de4429b0163e74f4140952fa06d15b8928f8ebe3132537b77ae1939307a2fcb69aa9d9ea52e2293753a042fdf5a6cf8da2f2
+  metadata.gz: 0dca9e1aedcf8daedd76aba8e43b93d56733c05d247aa8fc31b0324d2b22c122e6164519e870a590ff703ad5413b8b96cf822dd537533acd2f2dce53a6fc6697
+  data.tar.gz: a8cdd96b0895216198267f1b639b97654fa0e0c2c38db49f55eb6776153305d59148febbca8bac8fe81bf193d3b465a90fbcd38bf8b52d508e01bdc3dfc44670

data/Dockerfile

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

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

@@ -1477,33 +1477,56 @@ class Morpheus::Cli::Hosts
   def upgrade_agent(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      opts.banner = subcommand_usage("[host]")
+      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_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Upgrade agent for a host.
+[host] is required. This is the name or id of a host.
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
-    begin
-      host = find_host_by_name_or_id(args[0])
-      @servers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @servers_interface.dry.upgrade(host['id'])
-        return
-      end
-      json_response = @servers_interface.upgrade(host['id'])
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+    
+    host = find_host_by_name_or_id(args[0])
+    return 1 if host.nil?
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'server' => parse_passed_options(options)})
+    else
+      payload.deep_merge!({'server' => parse_passed_options(options)})
+    end
+
+    @servers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @servers_interface.dry.upgrade(host['id'], payload)
+      return
+    end
+    json_response = @servers_interface.upgrade(host['id'], payload)
+    render_response(json_response, options) do
+      #get([host['id']])
+      if json_response['success']
+        if json_response['msg'] == nil
+          print_green_success "Upgrading agent on host #{host['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
-        puts "Host #{host['name']} upgrading..." unless options[:quiet]
+        # never reached because unsuccessful requests raise an exception
+        print_red_alert "API Request failed: #{json_response['msg']}"
       end
-      return
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
   end
 

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

@@ -326,6 +326,7 @@ class Morpheus::Cli::License
           'Never'
         end
       },
+      "Version" => lambda {|it| it["licenseVersion"] },
       "Multi-Tenant" => lambda {|it| format_boolean it["multiTenant"] },
       "White Label" => lambda {|it| format_boolean it["whitelabel"] },
       "Stats Reporting" => lambda {|it| format_boolean it["reportStatus"] },
@@ -361,6 +362,7 @@ class Morpheus::Cli::License
       used_hosts = current_usage['hosts']
       used_mvm = current_usage['mvm']
       used_mvm_sockets = current_usage['mvmSockets']
+      used_sockets = current_usage['sockets'].to_f.round(1)
       used_iac = current_usage['iac']
       used_xaas = current_usage['xaas']
       used_executions = current_usage['executions']
@@ -373,6 +375,7 @@ class Morpheus::Cli::License
       max_hosts = license['maxHosts']
       max_mvm = license['maxMvm']
       max_mvm_sockets = license['maxMvmSockets']
+      max_sockets = license['maxSockets']
       max_iac = license['maxIac']
       max_xaas = license['maxXaas']
       max_executions = license['maxExecutions']
@@ -381,6 +384,7 @@ class Morpheus::Cli::License
       label_width = 20
       chart_opts = {max_bars: 20, unlimited_label: '0%', percent_sigdig: 0}
       out = ""
+      out << cyan + "Sockets".rjust(label_width, ' ') + ": " + generate_usage_bar(used_sockets, max_sockets, chart_opts) + cyan + used_sockets.to_s.rjust(8, ' ') + " / " + (max_sockets ? max_sockets.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
       out << cyan + "Managed Servers".rjust(label_width, ' ') + ": " + generate_usage_bar(used_managed_servers, max_managed_servers, chart_opts) + cyan + used_managed_servers.to_s.rjust(8, ' ') + " / " + (max_managed_servers ? max_managed_servers.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
       out << cyan + "Discovered Servers".rjust(label_width, ' ') + ": " + generate_usage_bar(used_discovered_servers, max_discovered_servers, chart_opts) + cyan + used_discovered_servers.to_s.rjust(8, ' ') + " / " + (max_discovered_servers ? max_discovered_servers.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
       out << cyan + "Hosts".rjust(label_width, ' ') + ": " + generate_usage_bar(used_hosts, max_hosts, chart_opts) + cyan + used_hosts.to_s.rjust(8, ' ') + " / " + (max_hosts ? max_hosts.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
@@ -439,6 +443,7 @@ class Morpheus::Cli::License
           'Never'
         end
       },
+      "Version" => lambda {|it| it["licenseVersion"] },
       "Multi-Tenant" => lambda {|it| format_boolean it["multiTenant"] },
       "White Label" => lambda {|it| format_boolean it["whitelabel"] },
       "Stats Reporting" => lambda {|it| format_boolean it["reportStatus"] },
@@ -451,11 +456,12 @@ class Morpheus::Cli::License
       })
     else
       license_columns.merge!({
+        "Sockets" => 'maxSockets',
+        "HPE VM Sockets" => 'maxMvmSockets',
         "Managed Servers" => 'maxManagedServers',
         "Discovered Servers" => 'maxDiscoveredServers',
         "Hosts" => 'maxHosts', 
         "HPE VM Hosts" => 'maxMvm',
-        "HPE VM Sockets" => 'maxMvmSockets',
         "Iac Deployments" => 'maxIac',
         "Xaas Instances" => 'maxXaas',
         "Executions" => 'maxExecutions',

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

@@ -153,6 +153,7 @@ class Morpheus::Cli::ServicePlanCommand
           "Code" => lambda {|it| it['code']},
           "Display Order" => lambda {|it| it['sortOrder']},
           "Provision Type" => lambda {|it| it['provisionType'] ? it['provisionType']['name'] : ''},
+          "Server Type" => lambda {|it| it['serverType']},
           "Storage" => lambda {|it| printable_byte_size(it, it['maxStorage'], 'storageSizeType', 'GB')}
       }
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.6"
+    VERSION = "8.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.6
+  version: 8.0.7
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix