morpheus-cli 5.4.3.1 → 5.4.4

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

@@ -7,7 +7,7 @@ class Morpheus::Cli::ServicePlanCommand
 
   set_command_name :'service-plans'
 
-  register_subcommands :list, :get, :add, :update, :activate, :deactivate
+  register_subcommands :list, :get, :add, :update, :activate, :deactivate, :remove
   set_default_subcommand :list
 
   def connect(opts)
@@ -119,8 +119,6 @@ class Morpheus::Cli::ServicePlanCommand
   def _get(plan_id, options = {})
     params = {}
     begin
-      @service_plans_interface.setopts(options)
-
       if !(plan_id.to_s =~ /\A\d{1,}\Z/)
         plan = find_service_plan(plan_id)
 
@@ -130,7 +128,7 @@ class Morpheus::Cli::ServicePlanCommand
         end
         plan_id = plan['id']
       end
-
+      @service_plans_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @service_plans_interface.dry.get(plan_id)
         return
@@ -740,6 +738,55 @@ class Morpheus::Cli::ServicePlanCommand
     end
   end
 
+  def remove(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[plan]")
+      build_common_options(opts, options, [:json, :dry_run, :remote, :auto_confirm])
+      opts.footer = "Delete a service plan.\n" +
+        "[plan] is required. Service plan ID, name or code"
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+      return 1
+    end
+
+    begin
+      plan = find_service_plan(args[0])
+
+      if !plan
+        print_red_alert "Service plan #{args[0]} not found"
+        return 1
+      end
+
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete the service plan '#{plan['name']}'?", options)
+        return 9, "aborted command"
+      end
+
+      @service_plans_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_plans_interface.dry.destroy(plan['id'], params)
+        return
+      end
+
+      json_response = @service_plans_interface.destroy(plan['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        print_green_success "Service plan #{plan['name']} deleted"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
   def find_service_plan(val)

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

@@ -41,10 +41,5 @@ class Morpheus::Cli::StorageServerTypes
     }
   end
 
-  # overridden to support name or code
-  def find_storage_server_type_by_name_or_id(name)
-    storage_server_type_for_name_or_id(name)
-  end
-
 end
 

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

@@ -66,12 +66,6 @@ class Morpheus::Cli::StorageServers
     }
   end
 
-  # overridden to work with name or code
-  # nope, api works with name=code now too
-  # def find_storage_server_type_by_name_or_id(name)
-  #   storage_server_type_for_name_or_id(name)
-  # end
-
   def add_storage_server_option_types()
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},

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

@@ -41,10 +41,5 @@ class Morpheus::Cli::StorageVolumeTypes
     }
   end
 
-  # overridden to support name or code
-  def find_storage_volume_type_by_name_or_id(name)
-    storage_volume_type_for_name_or_id(name)
-  end
-
 end
 

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

@@ -65,12 +65,6 @@ class Morpheus::Cli::StorageVolumes
     }
   end
 
-  # overridden to work with name or code
-  # nope, api works with name=code now too
-  # def find_storage_volume_type_by_name_or_id(name)
-  #   storage_volume_type_for_name_or_id(name)
-  # end
-
   def add_storage_volume_option_types()
     [
       {'fieldContext' => 'storageServer', 'fieldName' => 'id', 'fieldLabel' => 'Storage Server', 'type' => 'select', 'optionSource' => 'storageServers', 'optionParams' => {'createType' => 'block'}, 'required' => true},

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

@@ -864,7 +864,7 @@ module Morpheus::Cli::ProvisioningHelper
     if locked_fields.include?('volumes')
       payload['volumes'] = options[:options]['volumes'] if options[:options]['volumes']
     else
-      volumes = prompt_volumes(service_plan, options, api_client, {zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
+      volumes = prompt_volumes(service_plan, provision_type, options, api_client, {zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
       if !volumes.empty?
         payload['volumes'] = volumes
       end
@@ -912,7 +912,7 @@ module Morpheus::Cli::ProvisioningHelper
       has_security_groups = !!sg_option_type
       available_security_groups = []
       if sg_option_type && sg_option_type['type'] == 'select' && sg_option_type['optionSource']
-        sg_option_results = options_interface.options_for_source(sg_option_type['optionSource'], sg_api_params)
+        sg_option_results = options_interface.options_for_source(sg_option_type['optionSource'], sg_api_params, sg_option_type['optionSourceType'])
         available_security_groups = sg_option_results['data'].collect do |it|
           {"id" => it["value"] || it["id"], "name" => it["name"], "value" => it["value"] || it["id"]}
         end
@@ -1039,7 +1039,7 @@ module Morpheus::Cli::ProvisioningHelper
 
   # This recreates the behavior of multi_disk.js
   # returns array of volumes based on service plan options (plan_info)
-  def prompt_volumes(plan_info, options={}, api_client=nil, api_params={})
+  def prompt_volumes(plan_info, provision_type, options={}, api_client=nil, api_params={})
     #puts "Configure Volumes:"
     # return [] if plan_info['noDisks']
 
@@ -1141,14 +1141,19 @@ module Morpheus::Cli::ProvisioningHelper
       volume['name'] = v_prompt[field_context]['name']
     end
     if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customSize']
-      if root_custom_size_options.empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
-        volume['size'] = v_prompt[field_context]['size']
-        volume['sizeId'] = nil #volume.delete('sizeId')
+      # provision_type['rootDiskSizeKnown'] == false means size cannot be changed
+      if provision_type['rootDiskSizeKnown'] == false
+        # volume['size'] = plan_size if plan_size.to_i != 0
       else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.', 'defaultValue' => volume['sizeId']}], options[:options])
-        volume['sizeId'] = v_prompt[field_context]['sizeId']
-        volume['size'] = nil #volume.delete('size')
+        if root_custom_size_options.empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+          volume['size'] = v_prompt[field_context]['size']
+          volume['sizeId'] = nil #volume.delete('sizeId')
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.', 'defaultValue' => volume['sizeId']}], options[:options])
+          volume['sizeId'] = v_prompt[field_context]['sizeId']
+          volume['size'] = nil #volume.delete('size')
+        end
       end
     else
       # might need different logic here ? =o
@@ -1248,7 +1253,7 @@ module Morpheus::Cli::ProvisioningHelper
 
     # This recreates the behavior of multi_disk.js
     # returns array of volumes based on service plan options (plan_info)
-    def prompt_resize_volumes(current_volumes, plan_info, options={})
+    def prompt_resize_volumes(current_volumes, plan_info, provision_type, options={})
       #puts "Configure Volumes:"
       no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
 
@@ -1328,7 +1333,7 @@ module Morpheus::Cli::ProvisioningHelper
         'id' => current_root_volume['id'],
         'rootVolume' => true,
         'name' => current_root_volume['name'],
-        'size' => current_root_volume['size'] > plan_size ? current_root_volume['size'] : plan_size,
+        'size' => current_root_volume['size'] > (plan_size || 0) ? current_root_volume['size'] : plan_size,
         'sizeId' => nil,
         'storageType' => storage_type_id,
         'datastoreId' => current_root_volume['datastoreId']
@@ -1339,19 +1344,24 @@ module Morpheus::Cli::ProvisioningHelper
         volume['name'] = v_prompt[field_context]['name']
       end
       if plan_info['rootDiskCustomizable'] && storage_type && storage_type['customSize']
-        if root_custom_size_options.empty?
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
-          volume['size'] = v_prompt[field_context]['size']
-          volume['sizeId'] = nil #volume.delete('sizeId')
+        # provision_type['rootDiskSizeKnown'] == false means size cannot be changed
+        if provision_type['rootDiskSizeKnown'] == false
+          # volume['size'] = plan_size if plan_size.to_i != 0
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
-          volume['sizeId'] = v_prompt[field_context]['sizeId']
-          volume['size'] = nil #volume.delete('size')
+          if root_custom_size_options.empty?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => 'Root Volume Size (GB)', 'required' => true, 'description' => 'Enter a volume size (GB).', 'defaultValue' => volume['size']}], options[:options])
+            volume['size'] = v_prompt[field_context]['size']
+            volume['sizeId'] = nil #volume.delete('sizeId')
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'sizeId', 'type' => 'select', 'fieldLabel' => 'Root Volume Size', 'selectOptions' => root_custom_size_options, 'required' => true, 'description' => 'Choose a volume size.'}], options[:options])
+            volume['sizeId'] = v_prompt[field_context]['sizeId']
+            volume['size'] = nil #volume.delete('size')
+          end
         end
       else
         # might need different logic here ? =o
-        volume['size'] = plan_size
-        volume['sizeId'] = nil #volume.delete('sizeId')
+        # volume['size'] = plan_size
+        # volume['sizeId'] = nil #volume.delete('sizeId')
       end
       # if !datastore_options.empty?
       #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
@@ -1379,7 +1389,7 @@ module Morpheus::Cli::ProvisioningHelper
               'id' => current_volume['id'].to_i,
               'rootVolume' => false,
               'name' => current_volume['name'],
-              'size' => current_volume['size'] > plan_size ? current_volume['size'] : plan_size,
+              'size' => current_volume['size'] > (plan_size || 0) ? current_volume['size'] : plan_size,
               'sizeId' => nil,
               'storageType' => (current_volume['type'] || current_volume['storageType']),
               'datastoreId' => current_volume['datastoreId']
@@ -1404,7 +1414,7 @@ module Morpheus::Cli::ProvisioningHelper
               'id' => current_volume['id'].to_i,
               'rootVolume' => false,
               'name' => current_volume['name'],
-              'size' => current_volume['size'] > plan_size ? current_volume['size'] : plan_size,
+              'size' => current_volume['size'] > (plan_size || 0) ? current_volume['size'] : plan_size,
               'sizeId' => nil,
               'storageType' => (current_volume['type'] || current_volume['storageType']),
               'datastoreId' => current_volume['datastoreId']
@@ -1426,8 +1436,8 @@ module Morpheus::Cli::ProvisioningHelper
               end
             else
               # might need different logic here ? =o
-              volume['size'] = plan_size
-              volume['sizeId'] = nil #volume.delete('sizeId')
+              # volume['size'] = plan_size
+              # volume['sizeId'] = nil #volume.delete('sizeId')
             end
             # if !datastore_options.empty?
             #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])
@@ -1492,8 +1502,8 @@ module Morpheus::Cli::ProvisioningHelper
               end
             else
               # might need different logic here ? =o
-              volume['size'] = plan_size
-              volume['sizeId'] = nil #volume.delete('sizeId')
+              # volume['size'] = plan_size
+              # volume['sizeId'] = nil #volume.delete('sizeId')
             end
             if !datastore_options.empty?
               v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Datastore", 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.'}], options[:options])

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

@@ -336,11 +336,19 @@ module Morpheus::Cli::RestCommand
   end
 
   def rest_object_key
-    send("#{rest_key}_object_key")
+    if respond_to?("#{rest_key}_object_key", true)
+      send("#{rest_key}_object_key")
+    else
+      rest_name.camelcase.singularize
+    end
   end
 
   def rest_list_key
-    send("#{rest_key}_list_key")
+    if respond_to?("#{rest_key}_list_key", true)
+      send("#{rest_key}_list_key")
+    else
+      rest_name.camelcase
+    end
   end
 
   def rest_column_definitions(options)
@@ -408,11 +416,19 @@ module Morpheus::Cli::RestCommand
   end
 
   def rest_type_object_key
-    send("#{rest_type_key}_object_key")
+    if respond_to?("#{rest_type_key}_object_key", true)
+      send("#{rest_type_key}_object_key")
+    else
+      rest_type_name.camelcase.singularize
+    end
   end
 
   def rest_type_list_key
-    send("#{rest_type_key}_list_key")
+    if respond_to?("#{rest_type_key}_list_key", true)
+      send("#{rest_type_key}_list_key")
+    else
+      rest_type_name.camelcase
+    end
   end
 
   def rest_type_column_definitions(options)

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

@@ -90,67 +90,4 @@ module Morpheus::Cli::StorageServersHelper
     end
   end
 
-  def get_available_storage_server_types(refresh=false)
-    if !@available_storage_server_types || refresh
-      @available_storage_server_types = storage_server_types_interface.list({max:1000})[storage_server_type_list_key]
-    end
-    return @available_storage_server_types
-  end
-
-  def storage_server_type_for_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return storage_server_type_for_id(val)
-    else
-      return storage_server_type_for_name(val)
-    end
-  end
-
-  def storage_server_type_for_id(id)
-    return get_available_storage_server_types().find { |z| z['id'].to_i == id.to_i}
-  end
-
-  def storage_server_type_for_name(name)
-    return get_available_storage_server_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
-  end
-
-  def find_storage_server_type_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_storage_server_type_by_id(val)
-    else
-      return find_storage_server_type_by_name(val)
-    end
-  end
-
-  def find_storage_server_type_by_id(id)
-    begin
-      json_response = storage_server_types_interface.get(id.to_i)
-      return json_response[storage_server_type_object_key]
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Storage Server Type not found by id #{id}"
-        return nil
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_storage_server_type_by_name(name)
-    json_response = storage_server_types_interface.list({name: name.to_s})
-    storage_server_types = json_response[storage_server_type_list_key]
-    if storage_server_types.empty?
-      print_red_alert "Storage Server Type not found by name #{name}"
-      return storage_server_types
-    elsif storage_server_types.size > 1
-      print_red_alert "#{storage_server_types.size} storage server types found by name #{name}"
-      rows = storage_server_types.collect do |it|
-        {id: it['id'], name: it['name']}
-      end
-      puts as_pretty_table(rows, [:id, :name], {color:red})
-      return nil
-    else
-      return storage_server_types[0]
-    end
-  end
-
 end

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

@@ -54,49 +54,6 @@ module Morpheus::Cli::StorageVolumesHelper
     'Storage Volume Types'
   end
 
-  def get_available_storage_volume_types(refresh=false)
-    if !@available_storage_volume_types || refresh
-      @available_storage_volume_types = storage_volume_types_interface.list({max:1000})[storage_volume_type_list_key]
-    end
-    return @available_storage_volume_types
-  end
-
-  def storage_volume_type_for_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return storage_volume_type_for_id(val)
-    else
-      return storage_volume_type_for_name(val)
-    end
-  end
-
-  def storage_volume_type_for_id(val)
-    record = get_available_storage_volume_types().find { |z| z['id'].to_i == val.to_i}
-    label = "Storage Volume Type"
-    if record.nil?
-      print_red_alert "#{label} not found by id #{val}"
-      return nil
-    end
-    return record
-  end
-
-  def storage_volume_type_for_name(val)
-    records = get_available_storage_volume_types().select { |z| z['name'].downcase == val.downcase || z['code'].downcase == val.downcase}
-    label = "Storage Volume Type"
-    if records.empty?
-      print_red_alert "#{label} not found by name '#{val}'"
-      return nil
-    elsif records.size > 1
-      print_red_alert "More than one #{label.downcase} found by name '#{val}'"
-      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
-      return records[0]
-    end
-  end
-
   def format_storage_volume_status(record, return_color=cyan)
     out = ""
     status_string = record['status']

data/lib/morpheus/cli/option_types.rb

@@ -231,6 +231,7 @@ module Morpheus
                     print "\n"
                     exit 1
                   else
+                    parent_context_map.reject! {|k,v| k == parent_ns && (v.nil? || (v.is_a?(Hash) && v.empty?))}
                     next
                   end
                 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.4.3.1"
+    VERSION = "5.4.4"
   end
 end

data/lib/morpheus/routes.rb

@@ -87,9 +87,19 @@ module Morpheus::Routes
         :'data-stores' => {}, # ugh, should be datastores
         servers: {}, # Storage Servers
       },
-      # :'keys-and-certs' => {},
-      :'key-pairs' => {},
-      certificates: {},
+      trust: [
+        "#!credentials",
+        "#!certificates",
+        "#!keypairs",
+        "#!services",
+      ],
+      boot: [
+        "#!mappings",
+        "#!boot-menus",
+        "#!answerfiles",
+        "#!boot-images",
+        "#!macs",
+      ],
     },
     backups: {
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.3.1
+  version: 5.4.4
 platform: ruby
 authors:
 - David Estes
 - Bob Whiton
 - Jeremy Michael Crosbie
 - James Dickson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,6 +200,8 @@ files:
 - lib/morpheus/api/clouds_interface.rb
 - lib/morpheus/api/clusters_interface.rb
 - lib/morpheus/api/containers_interface.rb
+- lib/morpheus/api/credential_types_interface.rb
+- lib/morpheus/api/credentials_interface.rb
 - lib/morpheus/api/custom_instance_types_interface.rb
 - lib/morpheus/api/cypher_interface.rb
 - lib/morpheus/api/dashboard_interface.rb
@@ -356,6 +358,8 @@ files:
 - lib/morpheus/cli/commands/clusters.rb
 - lib/morpheus/cli/commands/coloring_command.rb
 - lib/morpheus/cli/commands/containers_command.rb
+- lib/morpheus/cli/commands/credential_types_command.rb
+- lib/morpheus/cli/commands/credentials_command.rb
 - lib/morpheus/cli/commands/curl_command.rb
 - lib/morpheus/cli/commands/cypher_command.rb
 - lib/morpheus/cli/commands/dashboard_command.rb
@@ -526,11 +530,11 @@ files:
 - lib/morpheus/terminal.rb
 - lib/morpheus/util.rb
 - morpheus-cli.gemspec
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -545,9 +549,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance
 test_files: []