morpheus-cli 7.0.7 → 8.0.0

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

@@ -294,6 +294,13 @@ class Morpheus::Cli::License
     elsif license['zoneTypesExcluded'] && license['zoneTypesExcluded'].size > 0
       description_cols["Excluded Clouds"] = lambda {|it| it['zoneTypesExcluded'].join(', ') }
     end
+
+    if license['taskTypes'] && license['taskTypes'].size > 0
+      description_cols["Included Tasks"] = lambda {|it| it['taskTypes'].join(', ') }
+    elsif license['taskTypesExcluded'] && license['taskTypesExcluded'].size > 0
+      description_cols["Excluded Tasks"] = lambda {|it| it['taskTypesExcluded'].join(', ') }
+    end
+
     print_description_list(description_cols, license)
   end
 
@@ -306,6 +313,7 @@ class Morpheus::Cli::License
       used_discovered_servers = current_usage['discoveredServers']
       used_hosts = current_usage['hosts']
       used_mvm = current_usage['mvm']
+      used_mvm_sockets = current_usage['mvmSockets']
       used_iac = current_usage['iac']
       used_xaas = current_usage['xaas']
       used_executions = current_usage['executions']
@@ -317,6 +325,7 @@ class Morpheus::Cli::License
       max_discovered_servers = license['maxDiscoveredServers']
       max_hosts = license['maxHosts']
       max_mvm = license['maxMvm']
+      max_mvm_sockets = license['maxMvmSockets']
       max_iac = license['maxIac']
       max_xaas = license['maxXaas']
       max_executions = license['maxExecutions']
@@ -328,7 +337,8 @@ class Morpheus::Cli::License
       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"
-      out << cyan + "MVM Hosts".rjust(label_width, ' ') + ": " + generate_usage_bar(used_mvm, max_mvm, chart_opts) + cyan + used_mvm.to_s.rjust(8, ' ') + " / " + (max_mvm ? max_mvm.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
+      out << cyan + "HPE VM Hosts".rjust(label_width, ' ') + ": " + generate_usage_bar(used_mvm, max_mvm, chart_opts) + cyan + used_mvm.to_s.rjust(8, ' ') + " / " + (max_mvm ? max_mvm.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
+      out << cyan + "HPE VM Sockets".rjust(label_width, ' ') + ": " + generate_usage_bar(used_mvm_sockets, max_mvm_sockets, chart_opts) + cyan + used_mvm_sockets.to_s.rjust(8, ' ') + " / " + (max_mvm_sockets ? max_mvm_sockets.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
       out << cyan + "Iac Deployments".rjust(label_width, ' ') + ": " + generate_usage_bar(used_iac, max_iac, chart_opts) + cyan + used_iac.to_s.rjust(8, ' ') + " / " + (max_iac ? max_iac.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
       out << cyan + "Xaas Instances".rjust(label_width, ' ') + ": " + generate_usage_bar(used_xaas, max_xaas, chart_opts) + cyan + used_xaas.to_s.rjust(8, ' ') + " / " + (max_xaas ? max_xaas.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"
       out << cyan + "Executions".rjust(label_width, ' ') + ": " + generate_usage_bar(used_executions, max_executions, chart_opts) + cyan + used_executions.to_s.rjust(8, ' ') + " / " + (max_executions ? max_executions.to_s : unlimited_label).to_s.ljust(15, ' ') + "\n"

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

@@ -9,7 +9,7 @@ class Morpheus::Cli::Processes
 
   set_command_name :'process'
 
-  register_subcommands :list, :get, {:'get-event' => :event_details}
+  register_subcommands :list, :get, {:'get-event' => :event_details}, :retry, :cancel
 
   # alias_subcommand :details, :get
   # set_default_subcommand :list
@@ -346,6 +346,76 @@ class Morpheus::Cli::Processes
     end
   end
 
+  def retry(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Retry a process.
+[id] is required. This is the id of a process.
+Only a process that is failed or cancelled and is of a retryable type can be retried.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    # process = find_process_by_id(args[0])
+    # return 1 if process.nil?
+    process_id = args[0]
+    payload = parse_payload(options)
+    if payload.nil?
+      payload = parse_passed_options(options)
+      # prompt
+    end
+    confirm!("Are you sure you would like to retry process #{process_id}?", options)
+    @processes_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @processes_interface.dry.retry(process_id, payload)
+      return
+    end
+    json_response = @processes_interface.retry(process_id, payload)
+    render_response(json_response, options) do
+      print_green_success "Retrying process #{process_id}"
+    end
+    return 0, nil
+  end
+
+  def cancel(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Cancel a process.
+[id] is required. This is the id of a process.
+Only a process that is currently running and is of a cancellable type can be canceled.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    # process = find_process_by_id(args[0])
+    # return 1 if process.nil?
+    process_id = args[0]
+    payload = parse_payload(options)
+    if payload.nil?
+      payload = parse_passed_options(options)
+      # prompt
+    end
+    confirm!("Are you sure you would like to cancel process #{process_id}?", options)
+    @processes_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @processes_interface.dry.cancel(process_id, payload)
+      return
+    end
+    json_response = @processes_interface.cancel(process_id, payload)
+    render_response(json_response, options) do
+      print_green_success "Cancelling process #{process_id}"
+    end
+    return 0, nil
+  end
+
   def event_details(args)
     options = {}
     params = {}

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

@@ -35,6 +35,9 @@ class Morpheus::Cli::Setup
       opts.on('--hubmode MODE','--hubmode MODE', "Choose an option for hub registration possible values are login, register, skip.") do |val|
         options[:hubmode] = val.to_s.downcase
       end
+      opts.on('--license KEY', String, "License key to install") do |val|
+        options[:license] = val
+      end
       opts.on('--force','--force', "Force setup, make api request even if setup is unavailable.") do
         options[:force] = true
       end
@@ -127,10 +130,10 @@ EOT
       puts "It looks like you are the first one here, so let's begin."
       print reset, "\n"
       # print "\n"
-      unless Morpheus::Cli::OptionTypes.confirm("Would you like to setup and initialize the remote appliance now?", options)  
-        return 9, "aborted command"
-      end
-      print "\n"
+      # unless Morpheus::Cli::OptionTypes.confirm("Would you like to setup and initialize the remote appliance now?", options)  
+      #   return 9, "aborted command"
+      # end
+      # print "\n"
       hubmode = nil
       hub_init_payload = nil # gets included as payload for hub scoped like hub.email
       if hub_settings['enabled']
@@ -354,6 +357,15 @@ EOT
         payload.delete('hub')
       end
 
+      # License Key prompt
+      print_h2 "License", options
+      if options[:license]
+        payload['licenseKey'] = options[:license].strip
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'licenseKey', 'fieldLabel' => 'License Key', 'type' => 'text', 'description' => "Enter a License Key to install now or leave blank to use a community license or install one manually later."}], options[:options])
+        key = v_prompt['licenseKey']
+        payload['licenseKey'] = key.strip if !key.to_s.strip.empty?
+      end
     end
       
     # ok, make the api request
@@ -383,24 +395,26 @@ EOT
     print reset
     #print "\n"
 
-    if hubmode == 'skip'
-      if ::Morpheus::Cli::OptionTypes::confirm("Would you like to install your License Key now?", options.merge({:default => true}))
-        cmd_res = Morpheus::Cli::License.new.install([] + (options[:remote] ? ["-r",options[:remote]] : []))
-        # license_is_valid = cmd_res != false
+    unless options[:no_prompt]
+      if hubmode == 'skip' && payload['licenseKey'].to_s.empty?
+        if ::Morpheus::Cli::OptionTypes::confirm("Would you like to install your License Key now?", options.merge({:default => true}))
+          cmd_res = Morpheus::Cli::License.new.install([] + (options[:remote] ? ["-r",options[:remote]] : []))
+          # license_is_valid = cmd_res != false
+        end
       end
-    end
 
-    if ::Morpheus::Cli::OptionTypes::confirm("Would you like to create the first group now?", options.merge({:default => true}))
-      cmd_res = Morpheus::Cli::Groups.new.add(['--use'] + (options[:remote] ? ["-r",options[:remote]] : []))
+      if ::Morpheus::Cli::OptionTypes::confirm("Would you like to create the first group now?", options.merge({:default => true}))
+        cmd_res = Morpheus::Cli::Groups.new.add(['--use'] + (options[:remote] ? ["-r",options[:remote]] : []))
 
-      #print "\n"
+        #print "\n"
 
-      # if cmd_res !=
-        if ::Morpheus::Cli::OptionTypes::confirm("Would you like to create the first cloud now?", options.merge({:default => true}))
-          cmd_res = Morpheus::Cli::Clouds.new.add([] + (options[:remote] ? ["-r",options[:remote]] : []))
-          #print "\n"
-        end
-      # end
+        # if cmd_res !=
+          if ::Morpheus::Cli::OptionTypes::confirm("Would you like to create the first cloud now?", options.merge({:default => true}))
+            cmd_res = Morpheus::Cli::Clouds.new.add([] + (options[:remote] ? ["-r",options[:remote]] : []))
+            #print "\n"
+          end
+        # end
+      end
     end
     print "\n",reset
     return exit_code, err

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

@@ -531,6 +531,7 @@ EOT
       v_prompt.deep_compact!
       virtual_image_payload.deep_merge!(v_prompt)
       virtual_image_files = virtual_image_payload.delete('virtualImageFiles')
+      upload_type = virtual_image_payload.delete('uploadType') # not used serverside
       virtual_image_payload['imageType'] = image_type['code']
       storage_provider_id = virtual_image_payload.delete('storageProviderId')
       if !storage_provider_id.to_s.empty?
@@ -551,6 +552,11 @@ EOT
       if virtual_image_payload && virtual_image_payload['imageType'] == 'vmware'
         virtual_image_payload['imageType'] == 'vmdk'
       end
+      # no need to make second request anymore, just include virtualImage.url
+      if file_url
+        virtual_image_payload['url'] = file_url
+        file_url = nil
+      end
       #payload = {'virtualImage' => virtual_image_payload}
       payload.deep_merge!({'virtualImage' => virtual_image_payload})
     end
@@ -967,7 +973,7 @@ EOT
       {'fieldName' => 'installAgent', 'fieldLabel' => 'Install Agent?', 'type' => 'checkbox', 'defaultValue' => 'off', 'required' => false, 'description' => 'Install Agent?', 'displayOrder' => 6},
       {'fieldName' => 'sshUsername', 'fieldLabel' => 'SSH Username', 'type' => 'text', 'required' => false, 'description' => 'Enter an SSH Username', 'displayOrder' => 7},
       {'fieldName' => 'sshPassword', 'fieldLabel' => 'SSH Password', 'type' => 'password', 'required' => false, 'description' => 'Enter an SSH Password', 'displayOrder' => 8},
-      {'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Storage Provider', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider.', 'displayOrder' => 9},
+      {'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Bucket', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider.', 'displayOrder' => 9},
       {'fieldName' => 'userData', 'fieldLabel' => 'Cloud-Init User Data', 'type' => 'textarea', 'required' => false, 'displayOrder' => 10},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 40},
       {'fieldName' => 'isAutoJoinDomain', 'fieldLabel' => 'Auto Join Domain?', 'type' => 'checkbox', 'defaultValue' => 'off', 'required' => false, 'description' => 'Auto Join Domain?', 'category' => 'advanced', 'displayOrder' => 40},
@@ -999,7 +1005,9 @@ EOT
         tmp_option_types.reject! {|opt| ['storageProviderId', 'userData', 'sshUsername', 'sshPassword'].include?(opt['fieldName'])}
       else
         if include_file_selection
-          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'description' => 'Choose an image file to upload', 'displayOrder' => 11}
+          tmp_option_types << {'code' => 'virtualImage.uploadType', 'fieldName' => 'uploadType', 'fieldLabel' => 'Create Image ID', 'type' => 'select', 'selectOptions' => [{'name' => 'File', 'value' => 'file'},{'name' => 'URL/Path', 'value' => 'url'},{'name' => 'None', 'value' => 'none'}], 'defaultValue' => 'file', 'required' => false, 'description' => 'Choose upload type: file, url or none', 'displayOrder' => 11}
+          tmp_option_types << {'dependsOnCode' => 'virtualImage.uploadType:file', 'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'description' => 'Choose an image file to upload', 'displayOrder' => 12}
+          tmp_option_types << {'dependsOnCode' => 'virtualImage.uploadType:url', 'fieldName' => 'url', 'fieldLabel' => 'URL/Path', 'type' => 'text', 'required' => false, 'description' => 'Enter URL/Path to virtual image file(s)', 'displayOrder' => 13}
         end
       end
     end

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

@@ -2150,25 +2150,51 @@ module Morpheus::Cli::ProvisioningHelper
       end
 
       # Tenants
+      default_stores = []
+      default_targets = []
       unless excludes.include?('tenants')
         if !options[:tenants].nil?
           accounts = options[:tenants].collect {|id| id.to_i}
         elsif !options[:no_prompt]
           account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account', 'type' => 'select', 'fieldLabel' => 'Add Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account']
 
-          if !account_id.nil?
+          unless account_id.nil?
             accounts << account_id
             available_accounts = available_accounts.reject {|it| it['value'] == account_id}
 
+            # Prompt default store / target
+            if options[:for_datastore]
+              if Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultTarget', 'type' => 'checkbox', 'fieldLabel' => 'Default', 'required' => false, 'description' => 'Designate as Default Store.', 'defaultValue' => false}], options[:options].merge({:checkbox_as_boolean => true}), @api_client, {})['defaultTarget']
+                default_targets << account_id
+              end
+              if Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultStore', 'type' => 'checkbox', 'fieldLabel' => 'Image Target', 'required' => false, 'description' => 'Designate as Image Target.', 'defaultValue' => false}], options[:options].merge({:checkbox_as_boolean => true}), @api_client, {})['defaultStore']
+                default_stores << account_id
+              end
+            end
+
             while !available_accounts.empty? && (account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account', 'type' => 'select', 'fieldLabel' => 'Add Another Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account'])
               if !account_id.nil?
                 accounts << account_id
                 available_accounts = available_accounts.reject {|it| it['value'] == account_id}
+
+                # Prompt default store / target
+                if options[:for_datastore]
+                  if Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultTarget', 'type' => 'checkbox', 'fieldLabel' => 'Default', 'required' => false, 'description' => 'Designate as Default Store.', 'defaultValue' => false}], options[:options].merge({:checkbox_as_boolean => true}), @api_client, {})['defaultTarget']
+                    default_targets << account_id
+                  end
+                  if Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultStore', 'type' => 'checkbox', 'fieldLabel' => 'Image Target', 'required' => false, 'description' => 'Designate as Image Target.', 'defaultValue' => false}], options[:options].merge({:checkbox_as_boolean => true}), @api_client, {})['defaultStore']
+                    default_stores << account_id
+                  end
+                end
               end
             end
           end
         end
-        permissions['tenantPermissions'] = {'accounts' => accounts}
+        if options[:for_datastore]
+          permissions['tenantPermissions'] = accounts.collect {|it| {'id' => it, 'defaultStore' => default_stores.include?(it), 'defaultTarget' => default_targets.include?(it)}}
+        else
+          permissions['tenantPermissions'] = {'accounts' => accounts}
+        end
       end
     end
     permissions

data/lib/morpheus/cli/option_types.rb

@@ -404,6 +404,9 @@ module Morpheus
               value = password_prompt(option_type)
             elsif option_type['type'] == 'checkbox'
               value = checkbox_prompt(option_type)
+              if options[:checkbox_as_boolean]
+                value = (value == 'on')
+              end
             elsif option_type['type'] == 'radio'
               value = radio_prompt(option_type)
             elsif option_type['type'] == 'textarea'

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "7.0.7"
+    VERSION = "8.0.0"
   end
 end

data/lib/morpheus/formatters.rb

@@ -478,6 +478,18 @@ def format_name_values(obj)
   end
 end
 
+def format_name_and_id(obj)
+  if(obj.is_a?(Array))
+    return "" if obj.empty? # && hide_empty
+    names, ids = obj.collect {|it| it['name'] rescue "" }, obj.collect {|it| it['id'] rescue "" }
+    "#{names.join(", ")} [#{ids.join(",")}]"
+  elsif(obj.is_a?(Hash))
+    "#{obj['name']} [#{obj['id']}]" rescue ""
+  else
+    object.to_s
+  end
+end
+
 def a_or_an(v)
   v.to_s =~ /^[aeiou]/i ? "an" : "a"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 8.0.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -289,6 +289,7 @@ files:
 - lib/morpheus/api/library_container_upgrades_interface.rb
 - lib/morpheus/api/library_instance_types_interface.rb
 - lib/morpheus/api/library_layouts_interface.rb
+- lib/morpheus/api/library_operating_systems_interface.rb
 - lib/morpheus/api/library_spec_template_types_interface.rb
 - lib/morpheus/api/library_spec_templates_interface.rb
 - lib/morpheus/api/license_interface.rb
@@ -473,6 +474,7 @@ files:
 - lib/morpheus/cli/commands/library_forms_command.rb
 - lib/morpheus/cli/commands/library_instance_types_command.rb
 - lib/morpheus/cli/commands/library_layouts_command.rb
+- lib/morpheus/cli/commands/library_operating_systems_command.rb
 - lib/morpheus/cli/commands/library_option_lists_command.rb
 - lib/morpheus/cli/commands/library_option_types_command.rb
 - lib/morpheus/cli/commands/library_spec_templates_command.rb
@@ -667,7 +669,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance