morpheus-cli 8.0.2 → 8.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06ea65156f0a57e7af971494347aae4844608a6cb877087dc9394a127841a75e
-  data.tar.gz: a93ddec1dc9e647e23a111a168126dbfc3b683d04844731f5bc53a461305b140
+  metadata.gz: 7cbc73275f4621016909ca9b3d12fcdf879a27d948c5d0e2b5e168d849850954
+  data.tar.gz: c30e3333325812730d68d16fa340ed8f858926b22aaf8d3ffd95fc9d4f9d2ef8
 SHA512:
-  metadata.gz: 9ca9b136bd006211eed46cd89103c2e7af9157d8111595f4e90b09a7a1e014570405256d64401c78311503e3d4b0aaecf5690526b2014985d79c515e0093eba3
-  data.tar.gz: f1355c6ec99b7a05e068e215ba4581a75a712bef545b661a04e7a31ad0b1711071d7f65c316e938171da60d66d0a297898068f5efb70e750a7dc987b2f12014e
+  metadata.gz: e9b1b734e792e44addc36e281765be1598d7e9d94e312f4e8c7cdd5a0da8ade497d8989421e56793dc86897a37d1fdafca26da81bda67f0591481ddec642099f
+  data.tar.gz: e6ff86116594db8837b84a0baa8b15e0f6bb777dd3df415fad23f6918a9f097b210026b2479391decaac93c1a21177f082fd4449914d9bcb910f899228b60a70

data/Dockerfile

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

data/lib/morpheus/api/license_interface.rb

@@ -8,18 +8,16 @@ class Morpheus::LicenseInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def install(key)
+  def install(payload)
     url = "#{@base_url}/api/license"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = {license: key}
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def test(key)
+  def test(payload)
     # use /test instead, since 4.1.1
     url = "#{@base_url}/api/license/decode"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = {license: key}
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 

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

@@ -422,7 +422,7 @@ class Morpheus::Cli::Clusters
         options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
       end
       opts.on('--workflow ID', String, "Workflow") do |val|
-        options['taskSetId'] = val.to_i
+        options[:workflow] = val.to_i
       end
       add_server_options(opts, options)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -608,13 +608,12 @@ 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'} unless ['kubernetes-cluster', 'mvm-cluster'].include?(cluster_type_code)
+        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 ['mvm-cluster'].include?(cluster_type_code)
         controller_provision_type = nil
         resource_pool = nil
 
         if !server_types.empty?
           controller_type = server_types.first
-
           if controller_type['provisionType']
             if provision_type && provision_type['id'] == controller_type['provisionType']['id']
               controller_provision_type = provision_type
@@ -747,10 +746,11 @@ class Morpheus::Cli::Clusters
 
         # Workflow / Automation
         if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
-          task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
+          task_set_id = options[:workflow] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSetId', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSetId']
 
           if !task_set_id.nil?
-            server_payload['taskSet'] = {'id' => task_set_id}
+            # server_payload['taskSet'] = {'id' => task_set_id}
+            cluster_payload['taskSetId'] = task_set_id
           end
         end
 
@@ -3784,7 +3784,7 @@ class Morpheus::Cli::Clusters
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_details(process)
+        print_process_details(process, options)
 
         print_h2 "Process Events", options
         process_events = process['events'] || process['processEvents'] || []
@@ -4003,7 +4003,7 @@ class Morpheus::Cli::Clusters
         subtitles = []
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_event_details(process_event)
+        print_process_event_details(process_event, options)
         print reset, "\n"
         return 0
       end
@@ -4015,37 +4015,6 @@ class Morpheus::Cli::Clusters
 
   private
 
-  def print_process_event_details(process_event, options={})
-    # process_event =~ process
-    description_cols = {
-        "Process ID" => lambda {|it| it['processId'] },
-        "Event ID" => lambda {|it| it['id'] },
-        "Name" => lambda {|it| it['displayName'] },
-        "Description" => lambda {|it| it['description'] },
-        "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
-        "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
-        "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-        "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-        "Duration" => lambda {|it| format_process_duration(it) },
-        "Status" => lambda {|it| format_process_status(it) },
-    }
-    print_description_list(description_cols, process_event)
-
-    if process_event['error']
-      print_h2 "Error", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['error'].to_s.strip
-    end
-
-    if process_event['output']
-      print_h2 "Output", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['output'].to_s.strip
-    end
-  end
-
   def print_clusters_table(clusters, opts={})
     table_color = opts[:color] || cyan
     rows = clusters.collect do |cluster|

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

@@ -2229,6 +2229,18 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[host]")
+      opts.on('--ignoreDaemonsets [on|off]', String, "Ignore Daemonsets") do |val|
+        options[:ignoreDaemonsets] = (val.to_s.empty? || val.to_s == 'on' || val.to_s == 'true')
+      end
+      opts.on('--force [on|off]', String, "Force") do |val|
+        options[:force] = (val.to_s.empty? || val.to_s == 'on' || val.to_s == 'true')
+      end
+      opts.on('--deleteEmptyDir [on|off]', String, "Delete Empty Directories") do |val|
+        options[:deleteEmptyDir] = (val.to_s.empty? || val.to_s == 'on' || val.to_s == 'true')
+      end
+      opts.on('--deleteLocalData [on|off]', String, "Delete Local Data") do |val|
+        options[:deleteLocalData] = (val.to_s == 'on' || val.to_s == 'true')
+      end
       build_standard_update_options(opts, options, [:auto_confirm])
       opts.footer = <<-EOT
 Enable maintenance mode for a host.
@@ -2252,6 +2264,27 @@ EOT
     # end
 
     payload = {}
+
+    if server.dig('config', 'kubernetesRole')
+      payload[:server] = {}
+      payload[:server][:ignoreDaemonsets] = options.fetch(:ignoreDaemonsets) do
+        prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ignoreDaemonsets', 'fieldLabel' => 'Ignore Daemonsets', 'type' => 'checkbox', 'defaultValue' => true, 'required' => false}], options, @api_client, {})
+        prompt['ignoreDaemonsets'] == 'on'
+      end
+      payload[:server][:force] = options.fetch(:force) do
+        prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'force', 'fieldLabel' => 'Force', 'type' => 'checkbox', 'defaultValue' => true, 'required' => false}], options, @api_client, {})
+        prompt['force'] == 'on'
+      end
+      payload[:server][:deleteEmptyDir] = options.fetch(:deleteEmptyDir) do
+        prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deleteEmptyDir', 'fieldLabel' => 'Delete Empty Directories', 'type' => 'checkbox', 'defaultValue' => true, 'required' => false}], options, @api_client, {})
+        prompt['deleteEmptyDir'] == 'on'
+      end
+      payload[:server][:deleteLocalData] = options.fetch(:deleteLocalData) do
+        prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deleteLocalData', 'fieldLabel' => 'Delete Local Data', 'type' => 'checkbox', 'defaultValue' => false, 'required' => false}], options, @api_client, {})
+        prompt['force'] == 'on'
+      end
+    end
+    
     if options[:payload]
       payload = options[:payload]
       payload.deep_merge!(parse_passed_options(options))

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

@@ -2921,6 +2921,12 @@ class Morpheus::Cli::Instances
       opts.on( '--description VALUE', String, "Snapshot Description." ) do |val|
         options[:options]['description'] = val
       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_add_options(opts, options, [:auto_confirm])
       opts.footer = <<-EOT
 Create a snapshot for an instance.
@@ -2949,6 +2955,18 @@ EOT
     json_response = @instances_interface.snapshot(instance['id'], payload)
     render_response(json_response, options, 'snapshots') do
       print_green_success "Snapshot initiated."
+      process_id = json_response['processIds'][0] rescue nil
+      if process_id
+        unless options[:no_refresh]
+          process = wait_for_process_execution(process_id, options)
+          snapshot_id = process['resultId']
+          if snapshot_id
+            Morpheus::Cli::Snapshots.new.handle(["get", snapshot_id] + (options[:remote] ? ["-r",options[:remote]] : []))
+          end
+        end
+      else
+        # puts "No process returned"
+      end
     end
     return 0, nil
   end
@@ -3707,7 +3725,7 @@ EOT
       if options[:json]
         puts as_json(json_response, options)
       else
-        print_green_success "Snapshots attaced to instance #{instance['name']} queued for deletion."
+        print_green_success "Snapshots attached to instance #{instance['name']} queued for deletion."
       end
       return 0
 
@@ -4496,7 +4514,7 @@ EOT
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_details(process)
+        print_process_details(process, options)
   
         print_h2 "Process Events", options
         process_events = process['events'] || process['processEvents'] || []
@@ -5502,67 +5520,6 @@ private
       {'fieldName' => 'maxDisk', 'fieldLabel' => 'Max Disk', 'type' => 'number', 'description' => 'Maximum storage percent (0-100)'},
     ]
   end
-
-  def print_process_details(process)
-    description_cols = {
-      "Process ID" => lambda {|it| it['id'] },
-      "Name" => lambda {|it| it['displayName'] },
-      "Description" => lambda {|it| it['description'] },
-      "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
-      "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
-      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-      "Duration" => lambda {|it| format_process_duration(it) },
-      "Status" => lambda {|it| format_process_status(it) },
-      # "# Events" => lambda {|it| (it['events'] || []).size() },
-    }
-    print_description_list(description_cols, process)
-
-    if process['error']
-      print_h2 "Error", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process['error'].to_s.strip
-    end
-
-    if process['output']
-      print_h2 "Output", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process['output'].to_s.strip
-    end
-  end
-
-  def print_process_event_details(process_event, options={})
-    # process_event =~ process
-    description_cols = {
-      "Process ID" => lambda {|it| it['processId'] },
-      "Event ID" => lambda {|it| it['id'] },
-      "Name" => lambda {|it| it['displayName'] },
-      "Description" => lambda {|it| it['description'] },
-      "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
-      "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
-      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-      "Duration" => lambda {|it| format_process_duration(it) },
-      "Status" => lambda {|it| format_process_status(it) },
-    }
-    print_description_list(description_cols, process_event)
-
-    if process_event['error']
-      print_h2 "Error", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['error'].to_s.strip
-    end
-
-    if process_event['output']
-      print_h2 "Output", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['output'].to_s.strip
-    end
-  end
   
   def update_wiki_page_option_types
     [

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

@@ -55,6 +55,10 @@ class Morpheus::Cli::License
         print "#{yellow}No license currently installed#{reset}\n\n"
       else
         print_license_details(json_response)
+        licenses = json_response['installedLicenses']
+        if licenses
+          print_installed_licenses(licenses, options)
+        end
         print_h2 "Current Usage", [], options
         print_license_usage(license, current_usage)
         print reset,"\n"
@@ -72,40 +76,55 @@ class Morpheus::Cli::License
     account_name = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[key]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.on('-a', '--add', "Stack this license on top of existing licenses. Without this option all existing licenses will be replaced." ) do
+        options[:options]['installAction'] = 'add'
+      end
+      opts.on('--stack', '--stack', "Alias for --add" ) do
+        options[:options]['installAction'] = 'add'
+      end
+      opts.on('--replace', '--replace', "Replace existing licenses with this new license. This is the default behavior." ) do
+        options[:options]['installAction'] = 'replace'
+      end
+      build_standard_add_options(opts, options)
       opts.footer = "Install a new license key.\n" +
                     "This will potentially change the enabled features and capabilities of your appliance."
     end
     optparse.parse!(args)
-    if args.count > 1
-      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-    end
+    verify_args!(args:args, optparse:optparse, min:0, max:1)
     connect(options)
-    begin
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
       if args[0]
-        key = args[0]
+        key = args[0].strip
       else
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'licenseKey', 'fieldLabel' => 'License Key', 'type' => 'text', 'required' => true}], options[:options])
-        key = v_prompt['licenseKey'] || ''
+        key = v_prompt['licenseKey'].to_s.strip
       end
-      @license_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @license_interface.dry.install(key)
-        return 0
-      end
-      json_response = @license_interface.install(key)
-      license = json_response['license']
-      if options[:json]
-        puts JSON.pretty_generate(json_response)
-      else
-        print_green_success "License installed!"
-        get([] + (options[:remote] ? ["-r",options[:remote]] : []))
+      payload['license'] = key
+      # Stack Licenses?
+      # load current licenses to see if this prompt is required
+      json_response = @license_interface.get()
+      licenses = json_response['installedLicenses']
+      if licenses && !(licenses.size == 1 && key.index(licenses[0]['keyId']) == 0)
+        install_actions = [{'name' => 'Add', 'value' => 'add'},{'name' => 'Replace', 'value' => 'replace'}]
+        payload['installAction'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'installAction', 'fieldLabel' => 'Install Action', 'type' => 'select', 'selectOptions' => install_actions, 'required' => true, 'defaultValue' => 'replace', 'description' => "Install action to perform. Use add to stack this license on top of existing licenses. Use replace (default) to remove any existing license(s)."}], options[:options])['installAction']
       end
+    end
+    @license_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @license_interface.dry.install(payload)
       return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return false
     end
+    json_response = @license_interface.install(payload)
+    render_response(json_response, options) do
+      print_green_success "License installed!"
+      get([] + (options[:remote] ? ["-r",options[:remote]] : []))
+    end
+    return 0, nil
   end
 
   def decode(args)
@@ -117,7 +136,16 @@ class Morpheus::Cli::License
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[key]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on('-a', '--add', "Stack this license on top of existing licenses. Without this option all existing licenses will be replaced." ) do
+        options[:options]['installAction'] = 'add'
+      end
+      opts.on('--stack', '--stack', "Alias for --add" ) do
+        options[:options]['installAction'] = 'add'
+      end
+      opts.on('--replace', '--replace', "Replace existing licenses with this new license. This is the default behavior." ) do
+        options[:options]['installAction'] = 'replace'
+      end
+      build_standard_add_options(opts, options, [:fields])
       opts.footer = "Test a license key.\n" +
                     "This is a way to decode and view a license key before installing it."
     end
@@ -126,50 +154,48 @@ class Morpheus::Cli::License
       raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
-    key = nil
-    if args[0]
-      key = args[0]
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
     else
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'licenseKey', 'fieldLabel' => 'License Key', 'type' => 'text', 'required' => true}], options[:options])
-      key = v_prompt['licenseKey'] || ''
-    end
-    begin
-      @license_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @license_interface.dry.test(key)
-        return
-      end
-      json_response = @license_interface.test(key)
-      license = json_response['license']
-      current_usage = json_response['currentUsage'] || {}
-      exit_code, err = 0, nil
-      if license.nil?
-        err = "Unable to decode license."
-        exit_code = 1
-        #return err, exit_code
-      end
-      render_result = render_with_format(json_response, options)
-      if render_result
-        return exit_code, err
-      end
-      if options[:quiet]
-        return exit_code, err
+      payload.deep_merge!(parse_passed_options(options))
+      key = nil
+      if args[0]
+        key = args[0].strip
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'licenseKey', 'fieldLabel' => 'License Key', 'type' => 'text', 'required' => true}], options[:options])
+        key = v_prompt['licenseKey'] || ''
       end
-      if exit_code != 0
-        print_error red, err.to_s, reset, "\n"
-        return exit_code, err
+      payload['license'] = key
+      # Stack Licenses?
+      # load current licenses to see if this prompt is required
+      json_response = @license_interface.get()
+      licenses = json_response['installedLicenses']
+      if licenses && !(licenses.size == 1 && key.index(licenses[0]['keyId']) == 0)
+        install_actions = [{'name' => 'Add', 'value' => 'add'},{'name' => 'Replace', 'value' => 'replace'}]
+        payload['installAction'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'installAction', 'fieldLabel' => 'Install Action', 'type' => 'select', 'selectOptions' => install_actions, 'required' => true, 'defaultValue' => 'replace', 'description' => "Install action to perform. Use add to stack this license on top of existing licenses. Use replace (default) to remove any existing license(s)."}], options[:options])['installAction']
       end
-      
+    end
+    @license_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @license_interface.dry.test(payload)
+      return
+    end
+    json_response = @license_interface.test(payload)
+    render_response(json_response, options) do
+      license = json_response['license']
+      current_usage = json_response['currentUsage'] || {}      
       # all good
       print_h1 "License"
       print_license_details(json_response)
+      licenses = json_response['installedLicenses']
+      if licenses
+        print_installed_licenses(licenses, options)
+      end
       print_h2 "License Usage", [], options
       print_license_usage(license, current_usage)
       print reset,"\n"
-      return exit_code, err
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
   end
 
@@ -177,44 +203,58 @@ class Morpheus::Cli::License
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[key]")
+      opts.banner = subcommand_usage("[key ID]")
+      opts.on('--key KEY', String, "License Key ID to uninstall (only the first 8 characters are required to identify license to uninstall). By default all licenses are uninstalled.") do |val|
+        options[:key] = val.to_s
+      end
       build_common_options(opts, options, [:auto_confirm, :json, :yaml, :dry_run, :remote])
-      opts.footer = "Uninstall the current license key.\n" +
-                    "This clears out the current license key from the appliance.\n" +
+      opts.footer = "Uninstall license key(s).\n" +
+                    "Use [key] or --key to uninstall only the specified license key.\n" +
+                    "By default all currently installed license keys are uninstalled.\n" +
                     "The function of the remote appliance will be restricted without a license installed.\n" +
                     "Be careful using this."
     end
     optparse.parse!(args)
-    if args.count > 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-    end
+    verify_args!(args:args, optparse:optparse, min:0, max:1)
     connect(options)
-    begin
-      @license_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @license_interface.dry.uninstall(params)
-        return
-      end
-      
-      unless options[:quiet]
-        print cyan,"#{bold}WARNING!#{reset}#{cyan} You are about to uninstall your license key.",reset,"\n"
-        print yellow, "Be careful using this. Make sure you have a copy of your key somewhere if you intend to use it again.",reset, "\n"
-        print "\n"
+    key_id = nil
+    if args[0] || options[:key]
+      key_id = (args[0] || options[:key])[0..7]
+    end
+    # load current licenses to prompt user which to uninstall
+    json_response = @license_interface.get()
+    licenses = json_response['installedLicenses'] # || [json_response['licenses']]
+    if key_id
+      # appliance version < 8.0.4 does not return installedLicenses list
+      if licenses.nil?
+        raise_command_error "Appliance version does not support uninstalling specific keys"
       end
-      
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you want to uninstall the license key for remote #{@appliance_name} - #{@appliance_url}?")
-        return 9, "command aborted"
+      matching_license = licenses.find {|it| it['keyId'] == key_id }
+      if matching_license.nil?
+        raise_command_error "Unable to find installed license key '#{key_id}'"
       end
+      params['keyId'] = key_id
+    end
+
+    unless options[:quiet]
+      print cyan,"#{bold}WARNING!#{reset}#{cyan} You are about to uninstall your license key (#{key_id ? key_id : 'ALL'})",reset,"\n"
+      print yellow, "Be careful using this. Make sure you have a copy of your key somewhere if you intend to use it again.",reset, "\n"
+      print "\n"
+    end
+    
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you want to uninstall the license key (#{key_id ? key_id : 'ALL'}) for remote #{@appliance_name} - #{@appliance_url}?")
+      return 9, "command aborted"
+    end
 
-      json_response = @license_interface.uninstall(params)
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
-      return 0 if options[:quiet]
+    @license_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @license_interface.dry.uninstall(params)
+      return
+    end
+    json_response = @license_interface.uninstall(params)
+      
+    render_response(json_response, options) do
       print_green_success "License uninstalled!"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
   end
 
@@ -267,8 +307,10 @@ class Morpheus::Cli::License
 
   def print_license_details(json_response)
     license = json_response['license']
+    licenses = json_response['installedLicenses']
     current_usage = json_response['currentUsage'] || {}
     description_cols = {
+      "Key ID" => lambda {|it| licenses ? licenses.collect {|li| li['keyId'] }.join(", ") : it['keyId'] },
       "Account" => 'accountName',
       "Product Tier" => lambda {|it| format_product_tier(it) },
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
@@ -285,7 +327,7 @@ class Morpheus::Cli::License
       "Hard Limit" => lambda {|it| format_boolean it["hardLimit"] },
       "Limit Type" => lambda {|it| format_limit_type(it) },
     }
-
+    description_cols.delete("Key ID") if !license['keyId']
     description_cols.delete("Multi-Tenant") if !license['multiTenant']
     description_cols.delete("White Label") if !license['whitelabel']
 
@@ -373,5 +415,46 @@ class Morpheus::Cli::License
     cyan + label.rjust(label_width, ' ') + ": " + generate_usage_bar(used, max, chart_opts) + cyan + used.to_s.rjust(label_width, ' ') + " / " + (max.to_i > 0 ? max.to_s : unlimited_label).to_s.ljust(label_width, ' ') + "\n"
   end
 
+  def print_installed_licenses(licenses, options)
+    print_h2 "Installed Licenses", [], options
+    license_columns = {
+      "Key ID" => 'keyId',
+      "Account" => 'accountName',
+      "Product Tier" => lambda {|it| format_product_tier(it) },
+      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+      "End Date" => lambda {|it| 
+        if it['endDate']
+          format_local_dt(it['endDate']).to_s + ' (' + format_duration(Time.now, it['endDate']).to_s + ')' 
+        else
+          'Never'
+        end
+      },
+      "Multi-Tenant" => lambda {|it| format_boolean it["multiTenant"] },
+      "White Label" => lambda {|it| format_boolean it["whitelabel"] },
+      "Stats Reporting" => lambda {|it| format_boolean it["reportStatus"] },
+      "Hard Limit" => lambda {|it| format_boolean it["hardLimit"] },
+      "Limit Type" => lambda {|it| format_limit_type(it) },
+      "Limit Type" => lambda {|it| format_limit_type(it) },
+    }
+    if licenses[0] && licenses[0]['limitType'] == 'workload'
+      license_columns.merge!({
+        "Workloads" => 'maxInstances'
+      })
+    else
+      license_columns.merge!({
+        "Managed Servers" => 'maxManagedServers',
+        "Discovered Servers" => 'maxDiscoveredServers',
+        "Hosts" => 'maxHosts', 
+        "HPE VM Hosts" => 'maxMvm',
+        "HPE VM Sockets" => 'maxMvmSockets',
+        "Iac Deployments" => 'maxIac',
+        "Xaas Instances" => 'maxXaas',
+        "Executions" => 'maxExecutions',
+        "Distributed Workers" => 'maxDistributedWorkers',
+        # "Discovered Objects" => 'maxDiscoveredObjects'
+      })
+    end
+    print as_pretty_table(licenses, license_columns, options)
+  end
 
 end

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

@@ -493,6 +493,9 @@ class Morpheus::Cli::NetworksCommand
         # allow arbitrary -O options
         payload['network'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
+        # all of these prompts pass in options instead of options[:options] so merge them here
+        options.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
          # Name
         if options['name']
           payload['network']['name'] = options['name']
@@ -813,16 +816,14 @@ class Morpheus::Cli::NetworksCommand
         ## Advanced Options
 
         # Network Domain
-        if network_type['networkDomainEditable'] && payload['network']['networkDomain'].nil?
-          if options.key?('domain')
-            if options['domain'].to_s.empty?  # clear it?
+        if payload['network']['networkDomain'].nil?
+            if options.key?('domain') &&  options['domain'].to_s.empty?  # clear it?
               payload['network']['networkDomain'] = {'id' => nil}
             else
               # always prompt to handle value as name instead of id...
               v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'domain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'optionSource' => 'networkDomains', 'required' => false, 'description' => ''}], options, @api_client)
               payload['network']['networkDomain'] = {'id' => v_prompt['domain'].to_i} unless v_prompt['domain'].to_s.empty?
             end
-          end
         end
 
         # Search Domains

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

@@ -295,7 +295,7 @@ class Morpheus::Cli::Processes
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
-        print_process_details(process)
+        print_process_details(process, options)
   
         print_h2 "Process Events"
         process_events = process['events'] || process['processEvents'] || []
@@ -456,7 +456,7 @@ EOT
         subtitles = []
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
-        print_process_event_details(process_event)
+        print_process_event_details(process_event, options)
         print reset, "\n"
         return 0
       end

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

@@ -73,15 +73,15 @@ class Morpheus::Cli::Snapshots
         "Name" => 'name',
         "Description" => 'description',
         "External Id" => 'externalId',
-        "Status" => 'status',
-        "State" => 'state',
+        # "State" => 'state',
         "Snapshot Type" => 'snapshotType',
-        "Snapshot Created" => 'snapshotCreated',
-        "Cloud" => 'zone.name',
-        "Datastore" => 'datastore',
-        "Parent Snapshot" => 'parentSnapshot',
-        "Active" => 'currentlyActive',
-        "Date Created" => 'dateCreated'
+        "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
+        "Cloud" => lambda {|it| format_name_and_id(it['zone']) },
+        "Datastore" => lambda {|it| format_name_and_id(it['datastore']) },
+        "Parent Snapshot" => lambda {|it| format_name_and_id(it['parentSnapshot']) },
+        "Active" => lambda {|it| format_boolean(it['currentlyActive']) },
+        "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Status" => lambda {|it| format_snapshot_status(it) }
       }
       print_description_list(description_cols, snapshot)
 
@@ -134,4 +134,20 @@ class Morpheus::Cli::Snapshots
       exit 1
     end
   end
+
+  protected
+
+  def format_snapshot_status(snapshot, return_color=cyan)
+    out = ""
+    status_string = snapshot['status'].to_s
+    if status_string == 'complete'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'failed'
+      out << "#{red}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{cyan}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
 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

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.2"
+    VERSION = "8.0.4"
   end
 end

data/lib/morpheus/formatters.rb

@@ -486,7 +486,7 @@ def format_name_and_id(obj)
   elsif(obj.is_a?(Hash))
     "#{obj['name']} [#{obj['id']}]" rescue ""
   else
-    object.to_s
+    obj.to_s
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.0.4
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix