morpheus-cli 5.4.2 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81fbae375d0d103b21c67cbbe12688b7d6977674b275047acf8e5dc9f2e155f
-  data.tar.gz: f926189bc1792af28a86c1652a9b0b4268581d759fff857697e559e862aa09fb
+  metadata.gz: 1115efb46c7480c6a3814183c5748f27ce92d8be5ca935116fac0a26d66a58aa
+  data.tar.gz: a47a2aa8cb3d36dfff5de6e811c2948e54e54771d3e00c47ca377db50b77fbbf
 SHA512:
-  metadata.gz: d5d832fc40ea3d0da75e4acfcd445fb59509b78fee5b87c81fa401237ed6ee8476a8a5de9fa11ce6bf2b1cac28f292bc0c6a5a9ef4345ca3c08a99baf084bee6
-  data.tar.gz: 216b534d057fe67350a816ee00e45a4d9218f21a9a4ebeeadad764a9b12821720658bf56be6b873e63143c58be61064d20c88550cd4a4a88780748499fe2f386
+  metadata.gz: ab05b111e694eded06459369814d4dcf462766a48a861831a004e428324b7181b570b8df6b6c8097f5be6bc5fc3be2d2ea59ac44ae4003cc444b53e49d2a3665
+  data.tar.gz: b4760ef297c3a3dd9b19b71c0d4702885803dc5ae107a2cf538c074fd6a17191303910b28e119560113ce6f50208e250b6c07659e003da80c8c6c068cfad26ed

data/lib/morpheus/api/api_client.rb

@@ -347,7 +347,6 @@ class Morpheus::APIClient
   end
 
   def auth
-    # Morpheus::AuthInterface.new(common_interface_options).setopts(@options)
     Morpheus::AuthInterface.new({url: @base_url, client_id: @client_id, verify_ssl: @verify_ssl}).setopts(@options)
   end
 
@@ -889,6 +888,10 @@ class Morpheus::APIClient
     Morpheus::NetworkStaticRoutesInterface.new(common_interface_options).setopts(@options)
   end
 
+  def snapshots
+    Morpheus::SnapshotsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end

data/lib/morpheus/api/catalog_item_types_interface.rb

@@ -6,4 +6,24 @@ class Morpheus::CatalogItemTypesInterface < Morpheus::RestInterface
     "/api/catalog-item-types"
   end
 
+  # NOT json, multipart file upload
+  # def update_logo(id, logo_file)
+  #   url = "#{base_path}/#{id}/update-logo"
+  #   headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
+  #   payload = {}
+  #   payload[:logo] = logo_file
+  #   payload[:multipart] = true
+  #   execute(method: :post, url: url, headers: headers, payload: payload)
+  # end
+
+  # NOT json, multipart file upload, uses PUT update endpoint
+  def update_logo(id, logo_file)
+    url = "#{base_path}/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    payload["catalogItemType"] = {"logo" => logo_file}
+    payload[:multipart] = true
+    execute(method: :put, url: url, headers: headers, payload: payload)
+  end
+
 end

data/lib/morpheus/api/instances_interface.rb

@@ -262,6 +262,34 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def revert_to_snapshot(id, snapshot_id, payload={})
+    url = "#{@base_url}/api/instances/#{id}/revert-snapshot/#{snapshot_id}"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def remove_all_container_snapshots(id, container_id, payload={})
+    url = "#{@base_url}/api/instances/#{id}/delete-container-snapshots/#{container_id}"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def remove_all_instance_snapshots(id, payload={})
+    url = "#{@base_url}/api/instances/#{id}/delete-all-snapshots"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def create_linked_clone(id, snapshot_id, payload={})
+    url = "#{@base_url}/api/instances/#{id}/linked-clone/#{snapshot_id}"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def service_plans(params={})
     url = "#{@base_url}/api/instances/service-plans"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/ping_interface.rb

@@ -14,6 +14,8 @@ class Morpheus::PingInterface < Morpheus::APIClient
 
   def get(params={})
     headers = {params: params}
+    # use access token if authenticated
+    headers[:authorization] = "Bearer #{@access_token}" if @access_token
     execute(method: :get, url: "/api/ping", headers: headers)
   end
 

data/lib/morpheus/api/setup_interface.rb

@@ -14,12 +14,16 @@ class Morpheus::SetupInterface < Morpheus::APIClient
 
   def get(params={})
     headers = {params: params}
+    # use access token if authenticated
+    headers[:authorization] = "Bearer #{@access_token}" if @access_token
     execute(method: :get, url: "/api/setup", headers: headers)
   end
 
   #this should go away and just use 
   def check(params={}, timeout=5)
     headers = {params: params}
+    # use access token if authenticated
+    headers[:authorization] = "Bearer #{@access_token}" if @access_token
     execute(method: :get, url: "/api/setup/check", headers: headers, timeout: timeout)
   end
 

data/lib/morpheus/api/snapshots_interface.rb

@@ -0,0 +1,19 @@
+require 'morpheus/api/api_client'
+
+# Snapshots API interface.
+class Morpheus::SnapshotsInterface < Morpheus::APIClient
+
+  def get(snapshot_id)
+    url = "#{@base_url}/api/snapshots/#{snapshot_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def remove(snapshot_id, payload={})
+    url = "#{@base_url}/api/snapshots/#{snapshot_id}"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+end

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

@@ -13,6 +13,7 @@ class Morpheus::Cli::CatalogItemTypesCommand
   set_command_description "Self Service: View and manage catalog item types"
 
   register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands({:'update-logo' => :update_logo})
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -222,6 +223,7 @@ EOT
   def add(args)
     options = {}
     params = {}
+    logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       # opts.on('-t', '--type [instance|blueprint|workflow]', "Item Type, default is instance.") do |val|
@@ -229,6 +231,19 @@ EOT
       #   options[:options]['type'] = val.to_s.downcase
       # end
       build_option_type_options(opts, options, add_catalog_item_type_option_types)
+      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
+        filename = val
+        logo_file = nil
+        if filename == 'null'
+          filename = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exists?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          logo_file = File.new(filename, 'rb')
+        end
+      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil
@@ -330,6 +345,16 @@ EOT
       return 0, nil
     end
     json_response = @catalog_item_types_interface.create(payload)
+    if json_response['success']
+      if logo_file
+        begin
+          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file)
+        rescue RestClient::Exception => e
+          print_red_alert "Failed to save logo!"
+          print_rest_exception(e, options)
+        end
+      end
+    end
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
       print_green_success "Added catalog item type #{catalog_item_type['name']}"
@@ -342,9 +367,23 @@ EOT
     options = {}
     params = {}
     payload = {}
+    logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type] [options]")
       build_option_type_options(opts, options, update_catalog_item_type_option_types)
+      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
+        filename = val
+        logo_file = nil
+        if filename == 'null'
+          filename = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exists?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          logo_file = File.new(filename, 'rb')
+        end
+      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil
@@ -445,6 +484,16 @@ EOT
       return
     end
     json_response = @catalog_item_types_interface.update(catalog_item_type['id'], payload)
+    if json_response['success']
+      if logo_file
+        begin
+          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file)
+        rescue RestClient::Exception => e
+          print_red_alert "Failed to save logo!"
+          print_rest_exception(e, options)
+        end
+      end
+    end
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
       print_green_success "Updated catalog item type #{catalog_item_type['name']}"
@@ -453,6 +502,45 @@ EOT
     return 0, nil
   end
 
+  def update_logo(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[type] [file]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update the logo for a catalog item type." + "\n" +
+                    "[type] is required. This is the name or id of a catalog item type." + "\n" +
+                    "[file] is required. This is the path of the logo file"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    catalog_item_type = find_catalog_item_type_by_name_or_id(args[0])
+    return 1 if catalog_item_type.nil?
+    filename = args[1]
+    logo_file = nil
+    if filename == 'null'
+      filename = 'null' # clear it
+    else
+      filename = File.expand_path(filename)
+      if !File.exists?(filename)
+        raise_command_error "File not found: #{filename}"
+      end
+      logo_file = File.new(filename, 'rb')
+    end
+    @catalog_item_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @catalog_item_types_interface.dry.update_logo(catalog_item_type['id'], logo_file)
+      return
+    end
+    json_response = @catalog_item_types_interface.update_logo(catalog_item_type['id'], logo_file)
+    render_response(json_response, options, catalog_item_type_object_key) do
+      print_green_success "Updated catalog item type #{catalog_item_type['name']} logo"
+      return _get(catalog_item_type["id"], {}, options)
+    end
+  end
+
   def remove(args)
     options = {}
     params = {}

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

@@ -547,11 +547,7 @@ class Morpheus::Cli::Clusters
           available_layouts = layouts_for_dropdown(cloud['id'], cluster_type['id'])
 
           if !available_layouts.empty?
-            if available_layouts.count > 1 && !options[:no_prompt]
-              layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
-            else
-              layout_id = available_layouts.first['id']
-            end
+            layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
             layout = find_layout_by_name_or_id(layout_id)
           end
         end
@@ -560,17 +556,25 @@ class Morpheus::Cli::Clusters
 
         # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
+        provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
 
         api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
 
         # Controller type
-        server_types = @server_types_interface.list({max:1, computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes']
+        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'}
         controller_provision_type = nil
         resource_pool = nil
 
         if !server_types.empty?
           controller_type = server_types.first
-          controller_provision_type = controller_type['provisionType'] ? (@provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil) : nil
+
+          if controller_type['provisionType']
+            if provision_type && provision_type['id'] == controller_type['provisionType']['id']
+              controller_provision_type = provision_type
+            else
+              controller_provision_type = @provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil
+            end
+          end
 
           if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
             server_payload['config']['resourcePoolId'] = resource_pool['id']
@@ -585,21 +589,23 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan(api_params, options)
 
         if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, provision_type, options)}
           api_params['planId'] = service_plan['id']
         end
 
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
-
-        if !volumes.empty?
-          server_payload['volumes'] = volumes
+        if provision_type['hasVolumes']
+          volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
+          if !volumes.empty?
+            server_payload['volumes'] = volumes
+          end
         end
 
         # Options / Custom Config
         option_type_list =
-          ((controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) + layout['optionTypes'] +
-          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue [])).sort { |type| type['displayOrder'] }
+          ((controller_type.nil? ? [] : controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) +
+          layout['optionTypes'] +
+          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue []))
 
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
@@ -625,11 +631,13 @@ class Morpheus::Cli::Clusters
         cluster_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(load_layout_options(cluster_payload), options[:options], @api_client, api_params, options[:no_prompt], true))
 
         # Server options
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, api_params, options[:no_prompt], true))
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
         # Worker count
-        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
-        server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        if !['manual', 'external'].include?(provision_type['code'])
+          default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+          server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker-cluster', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        end
 
         # Create User
         if !options[:createUser].nil?
@@ -657,10 +665,12 @@ class Morpheus::Cli::Clusters
         server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Workflow / Automation
-        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']
+        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']
 
-        if !task_set_id.nil?
-          server_payload['taskSet'] = {'id' => task_set_id}
+          if !task_set_id.nil?
+            server_payload['taskSet'] = {'id' => task_set_id}
+          end
         end
 
         cluster_payload['server'] = server_payload
@@ -1172,7 +1182,7 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
 
         if service_plan
-          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, nil, options)}
         end
 
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)
@@ -3713,34 +3723,37 @@ class Morpheus::Cli::Clusters
     service_plan
   end
 
-  def prompt_service_plan_options(service_plan, options)
+  def prompt_service_plan_options(service_plan, provision_type, options)
     plan_options = {}
-
-    # custom max memory
-    if service_plan['customMaxMemory']
-      if !options[:maxMemory]
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
-        plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
-      else
-        plan_options['maxMemory'] = options[:maxMemory]
+    hide_custom_options = provision_type && provision_type['code'] == 'manual'
+
+    if !hide_custom_options
+      # custom max memory
+      if service_plan['customMaxMemory']
+        if !options[:maxMemory]
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
+          plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
+        else
+          plan_options['maxMemory'] = options[:maxMemory]
+        end
       end
-    end
 
-    # custom cores: max cpu, max cores, cores per socket
-    if service_plan['customCores']
-      if options[:cpuCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
-        plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
-      else
-        plan_options['cpuCount']
-      end
-      if options[:coreCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
-        plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
-      end
-      if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
-        plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+      # custom cores: max cpu, max cores, cores per socket
+      if service_plan['customCores']
+        if options[:cpuCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
+          plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
+        else
+          plan_options['cpuCount']
+        end
+        if options[:coreCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
+          plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
+        end
+        if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
+          plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+        end
       end
     end
     plan_options

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

@@ -878,6 +878,12 @@ class Morpheus::Cli::Hosts
           payload['volumes'] = volumes
         end
 
+        # plan customizations
+        plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {})
+        if plan_opts && !plan_opts.empty?
+          payload['servicePlanOptions'] = plan_opts
+        end
+
         # prompt for network interfaces (if supported)
         if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
           begin
@@ -1252,6 +1258,12 @@ class Morpheus::Cli::Hosts
         payload[:volumes] = volumes
       end
 
+      # plan customizations
+      plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {}, server)
+      if plan_opts && !plan_opts.empty?
+        payload['servicePlanOptions'] = plan_opts
+      end
+
       # todo: reconfigure networks
       #       need to get provision_type_id for network info
       # prompt for network interfaces (if supported)