morpheus-cli 8.0.9.1 → 8.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11090de632f0ba25e07141f1e169cbe0d626aafb4180cf472711c0f4a97c9799
-  data.tar.gz: 256e3748b3805cf0490ca9d0d6acc8c255743b535de5ab46159f1cb11169c012
+  metadata.gz: b4fc087520efe1dab49dbe42df70b39da196e9539cd78eb162adec2fc8907a54
+  data.tar.gz: b008d63500f56d6a72b12c918db54b3d2869df3fa3407e491411a8eab63ea6be
 SHA512:
-  metadata.gz: f265f198cba356cfbda69235e80e6cd95b2261dcc2482ec08603ed463067af56c6acef8a7989aa079a78d8937bd33d5d5734e15956688bf656022b69b0f75298
-  data.tar.gz: 0db70e3343c6851efaeaaf487c86b92b6a652550bc713e78b435c3ff377e0d7244ae5eb6bfe96348ee22cd1251aedf3e2156d3196ac9137b826242ec160f2bec
+  metadata.gz: f00f2ea9c25064ad69f1038a83a5c0a23708c21d2bc670406ff1527dcdd0808361043c7e7c498fd9a03733106fcd8c1884515ebd4951c12b1bc839c37163b879
+  data.tar.gz: 8c818cdda02325d65715ee474e72480467a27ce14548483415a555002042cfbb7638193feb9fc3c61138effa50d473703eeb4a6f66d47eb4ccf087e9c9b040c5

data/Dockerfile

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

data/lib/morpheus/api/clusters_interface.rb

@@ -339,6 +339,13 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def can_use_kubevip(payload)
+    url = "#{@base_url}/api/clusters/can-use-kubevip"
+    payload["requestSourceType"] = "api"
+    headers = { authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :get, url: url, headers: headers, payload: payload.to_json)
+  end
+
   def list_resources(id, resources, params={})
     url = "#{base_path}/#{id}/#{resources}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/instances_interface.rb

@@ -136,7 +136,7 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def action(id, action_code, payload={})
+  def action(id, action_code, resource_pool_id=nil, payload={})
     url, params = "", {}
     if id.is_a?(Array)
       url = "#{@base_url}/api/instances/action"
@@ -145,6 +145,9 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
       url = "#{@base_url}/api/instances/#{id}/action"
       params = {code: action_code}
     end
+    if resource_pool_id
+      params['selectedResourcePoolId'] = resource_pool_id
+    end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)

data/lib/morpheus/api/storage_volumes_interface.rb

@@ -6,4 +6,11 @@ class Morpheus::StorageVolumesInterface < Morpheus::RestInterface
     "/api/storage-volumes"
   end
 
+  def resize(id,payload)
+    url = "#{@base_url}/api/storage-volumes/#{id}/resize"
+    headers = { :params => {},:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
 end

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

@@ -244,10 +244,7 @@ class Morpheus::Cli::Clouds
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
-    # if args.count < 1
-    #   puts optparse
-    #   exit 1
-    # end
+    verify_args!(args:args, optparse:optparse, max:1)
     connect(options)
 
     begin
@@ -258,10 +255,12 @@ class Morpheus::Cli::Clouds
       else
         cloud_payload = {name: args[0], description: params[:description]}
         cloud_payload.deep_merge!(parse_passed_options(options))
+        # Group
         # use active group by default
         params[:group] ||= @active_group_id
-
-        # Group
+        if options[:options]['group']
+          params[:group] = options[:options]['group']
+        end
         group_id = nil
         group = params[:group] ? find_group_by_name_or_id_for_provisioning(params[:group]) : nil
         if group
@@ -274,22 +273,22 @@ class Morpheus::Cli::Clouds
           group_id = group_prompt['group']
         end
         cloud_payload['groupId'] = group_id
+        cloud_payload.delete('group')
         # todo: pass groups as an array instead
 
         # Cloud Name
         if args[0]
-          cloud_payload[:name] = args[0]
+          cloud_payload['name'] = args[0]
           options[:options]['name'] = args[0] # to skip prompt
-        elsif !options[:no_prompt]
-          # name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true}], options[:options])
-          # cloud_payload[:name] = name_prompt['name']
         end
+        # name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true}], options[:options])
+        # cloud_payload['name'] = name_prompt['name']
 
         # Cloud Type
         cloud_type = nil
         if params[:zone_type]
           cloud_type = cloud_type_for_name(params[:zone_type])
-        elsif !options[:no_prompt]
+        else
           # print_red_alert "Cloud Type not found or specified!"
           # exit 1
           cloud_types_dropdown = cloud_types_for_dropdown
@@ -301,7 +300,8 @@ class Morpheus::Cli::Clouds
           print_red_alert "A cloud type is required."
           exit 1
         end
-        cloud_payload[:zoneType] = {code: cloud_type['code']}
+        cloud_payload.delete('type')
+        cloud_payload['zoneType'] = {'code' => cloud_type['code']}
 
         cloud_payload['config'] ||= {}
         if params[:certificate_provider]

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

@@ -624,11 +624,13 @@ class Morpheus::Cli::Clusters
           end
 
           if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, service_plan, controller_provision_type, options)
-            server_payload['config']['resourcePoolId'] = resource_pool['id']
-            api_params['config'] ||= {}
-            api_params['config']['resourcePool'] = resource_pool['id']
-            api_params['resourcePoolId'] = resource_pool['id']
-            api_params['zonePoolId'] = resource_pool['id']
+            if resource_pool
+              server_payload['config']['resourcePoolId'] = resource_pool['id']
+              api_params['config'] ||= {}
+              api_params['config']['resourcePool'] = resource_pool['id']
+              api_params['resourcePoolId'] = resource_pool['id']
+              api_params['zonePoolId'] = resource_pool['id']
+            end
           end
         end
 
@@ -746,6 +748,13 @@ class Morpheus::Cli::Clusters
           default_repo = options[:default_repo] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultRepoAccount', 'fieldLabel' => 'Cluster Repo Account', 'type' => 'select', 'required' => false, 'optionSource' => 'dockerHubRegistries'}], options[:options], @api_client, api_params)['defaultRepoAccount']
           if default_repo != ""
             server_payload['config']['defaultRepoAccount'] = default_repo
+
+            # Act As Image Server
+            image_server = !options[:image_server].nil? ? options[:image_server] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'imageServer', 'fieldLabel' => 'Act As Image Server', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'on'}], options[:options], @api_client, api_params)['imageServer']
+            if image_server != ""
+              # api used to expect "on" so don't booleanize this one
+              server_payload['config']['imageServer'] = image_server ? 'on' : 'off'
+            end
           end
         end
 
@@ -761,7 +770,8 @@ class Morpheus::Cli::Clusters
 
         if loadbalancer_option_type
           lb_payload = { computeTypeLayoutId: cluster_payload['layout']['id']}
-          load_balancer_id = prompt_cluster_load_balancer(cluster_payload, options)
+          # look to see if "can provision Kubevip" if so pass true as third param
+          load_balancer_id = prompt_cluster_load_balancer(cluster_payload, options, can_use_kubevip(provision_type["code"], cluster_payload["type"]))
           if load_balancer_id != false
             lb_payload['loadBalancerId'] = load_balancer_id
             lb_payload['loadBalancerInstanceId'] = -1
@@ -789,6 +799,24 @@ class Morpheus::Cli::Clusters
             cluster_payload['lbInstances'] = [load_balancer_payload.compact!]
           end
         end
+        # convert sshHosts to array
+        if server_payload['sshHosts']
+          if server_payload['sshHosts'].is_a?(String)
+            server_payload['sshHosts'] = server_payload['sshHosts'].split(",").collect {|it| {"ip" => it} }
+          elsif server_payload['sshHosts'].is_a?(Object)
+            server_payload['sshHosts'] = [server_payload['sshHosts']]
+          elsif server_payload['sshHosts'].is_a?(Array)
+            server_payload['sshHosts'] = server_payload['sshHosts'].collect {|it| it.is_a?(String) ? {"ip" => it} : it }
+          end
+
+          # inject the optionalNames array into the sshHosts if present
+          if server_payload['optionalNames']
+            optional_names = server_payload['optionalNames'].is_a?(String) ? server_payload['optionalNames'].split(",") : [server_payload['optionalNames']].flatten
+            server_payload['sshHosts'].each_with_index do|host, i| 
+              host['name'] = optional_names[i].strip if optional_names[i]
+            end
+          end
+        end
 
         cluster_payload['server'] = server_payload
         payload = {'cluster' => cluster_payload}
@@ -4692,6 +4720,12 @@ class Morpheus::Cli::Clusters
     @clouds_interface.cloud_type(zone_type_id)['zoneType']['provisionTypes'].first rescue nil
   end
 
+  def can_use_kubevip(type, group_type)
+    payload = {'provisionType' => type, 'groupType' => group_type }
+    can_use = @clusters_interface.can_use_kubevip(payload)
+    return can_use
+  end
+
   def load_group(group_type, options)
     # Group / Site
     group_id = nil
@@ -4869,8 +4903,8 @@ class Morpheus::Cli::Clusters
     opts.on('--security-groups LIST', Array, "Security Groups") do |list|
       options[:securityGroups] = list
     end
-    opts.on("--create-user on|off", String, "User Config: Create Your User. Default is off") do |val|
-      options[:createUser] = ['true','on','1'].include?(val.to_s)
+    opts.on("--create-user [on|off]", String, "User Config: Create Your User. Default is off") do |val|
+      options[:createUser] = ['true','on','1',''].include?(val.to_s)
     end
     opts.on("--user-group USERGROUP", String, "User Config: User Group") do |val|
       options[:userGroup] = val
@@ -4881,6 +4915,12 @@ class Morpheus::Cli::Clusters
     opts.on('--hostname VALUE', String, "Hostname") do |val|
       options[:hostname] = val
     end
+    opts.on('--default-repo-account VALUE', String, "Default Repo Account") do |val|
+      options[:default_repo] = val
+    end
+    opts.on("--image-server [on|off]", ['on','off'], "Act As Image Server") do |val|
+      options[:image_server] = ['true','on','1',''].include?(val.to_s)
+    end
   end
 
   def add_datastore_option_types
@@ -4903,15 +4943,17 @@ class Morpheus::Cli::Clusters
         resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
 
         if resource_pool_options.empty?
-          print_red_alert "Cloud #{cloud['name']} has no available resource pools"
-          exit 1
+          print yellow,bold, "Cloud #{cloud['name']} has no available resource pools",reset,"\n\n"
+          return
+          #exit 1
         elsif resource_pool_options.count > 1 && !options[:no_prompt]
           resource_pool_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourcePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}],options[:options],api_client, {})['resourcePool']
         else
           first_option = resource_pool_options.find {|it| !it['id'].nil? }
           if first_option.nil?
-            print_red_alert "Cloud #{cloud['name']} has no available resource pools"
-            exit 1
+            print yellow,bold, "Cloud #{cloud['name']} has no available resource pools",reset,"\n\n"
+            return
+            #exit 1
           end
           resource_pool_id = first_option['id']
         end

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

@@ -256,8 +256,8 @@ class Morpheus::Cli::Hosts
         rows = servers.collect {|server| 
           stats = server['stats']
           
-          if !stats['maxMemory']
-            stats['maxMemory'] = stats['usedMemory'] + stats['freeMemory']
+          if !stats['maxMemory'] && (stats['usedMemory'] || stats['freeMemory'])
+            stats['maxMemory'] = stats['usedMemory'].to_i + stats['freeMemory'].to_i
           end
           cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
           memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
@@ -849,23 +849,30 @@ class Morpheus::Cli::Hosts
         end
 
         payload = {}
-        # prompt for service plan
-        service_plans_json = @servers_interface.service_plans({zoneId: cloud['id'], serverTypeId: server_type["id"]})
-        service_plans = service_plans_json["plans"]
-        service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
-        plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this server'}],options[:options])
-        service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['plan'].to_i }
-
-        # uh ok, this actually expects config at root level, sibling of server 
-        # payload.deep_merge!({'server' => passed_options}) unless passed_options.empty?
         payload.deep_merge!(passed_options) unless passed_options.empty?
         payload.deep_merge!({'server' => {
           'name' => host_name,
           'zone' => {'id' => cloud['id']},
           'computeServerType' => {'id' => server_type['id']},
-          'plan' => {'id' => service_plan["id"]}
-          }
-        })
+        }})
+
+        is_baremetal_host = server_type['bareMetalHost']
+
+        # Service plans do not apply during  BareMetal server imports
+        has_service_plans = !is_baremetal_host
+
+        # uh ok, this actually expects config at root level, sibling of server
+        # payload.deep_merge!({'server' => passed_options}) unless passed_options.empty?
+        # prompt for service plan
+        service_plan = nil
+        if has_service_plans
+          service_plans_json = @servers_interface.service_plans({ zoneId: cloud['id'], serverTypeId: server_type["id"] })
+          service_plans = service_plans_json["plans"]
+          service_plans_dropdown = service_plans.collect { |sp| { 'name' => sp["name"], 'value' => sp["id"] } } # already sorted
+          plan_prompt = Morpheus::Cli::OptionTypes.prompt([{ 'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this server' }], options[:options])
+          service_plan = service_plans.find { |sp| sp["id"] == plan_prompt['plan'].to_i }
+          payload['server']['plan'] = {'id' => service_plan['id']}
+        end
 
         option_type_list = server_type['optionTypes']
 
@@ -893,7 +900,7 @@ class Morpheus::Cli::Hosts
           resource_pool_option_type = option_type_list.find {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
           option_type_list = option_type_list.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
           resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'optionSource' => 'zonePools', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}
-          resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, planId: service_plan["id"], serverTypeId: server_type['id']})
+          resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, planId: service_plan ? service_plan["id"] : "", serverTypeId: server_type['id']})
           resource_pool_prompt.deep_compact!
           payload.deep_merge!(resource_pool_prompt)
           if resource_pool_option_type['fieldContext'] && resource_pool_prompt[resource_pool_option_type['fieldContext']]
@@ -903,20 +910,23 @@ class Morpheus::Cli::Hosts
           end
         end
 
-        # prompt for volumes
-        volumes = prompt_volumes(service_plan, provision_type, options, @api_client, {zoneId: cloud_id, serverTypeId: server_type['id'], siteId: group_id})
-        if !volumes.empty?
-          payload['volumes'] = volumes
-        end
+        if has_service_plans
+          # prompt for volumes
+          volumes = prompt_volumes(service_plan, provision_type, options, @api_client, {zoneId: cloud_id, serverTypeId: server_type['id'], siteId: group_id})
+          if !volumes.empty?
+            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
+          # plan customizations
+          plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {})
+          if plan_opts && !plan_opts.empty?
+            payload['servicePlanOptions'] = plan_opts
+          end
         end
 
         # prompt for network interfaces (if supported)
-        if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
+        # Does not apply during BareMetal server imports
+        if !is_baremetal_host && server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
           begin
             network_interfaces = prompt_network_interfaces(cloud['id'], server_type["provisionType"]["id"], pool_id, options)
             if !network_interfaces.empty?
@@ -971,6 +981,7 @@ class Morpheus::Cli::Hosts
         end
         #api_params.deep_merge(payload)
         params = Morpheus::Cli::OptionTypes.prompt(option_type_list,options[:options],@api_client, api_params)
+        params.booleanize!
         payload.deep_merge!(params)
         
       end
@@ -1054,6 +1065,7 @@ class Morpheus::Cli::Hosts
       new_group = nil
       passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       params.deep_merge!(passed_options) unless passed_options.empty?
+      params.booleanize!
       # metadata tags
       if options[:tags]
         params['tags'] = parse_metadata(options[:tags])
@@ -1405,6 +1417,79 @@ class Morpheus::Cli::Hosts
     end
   end
 
+  # Prompt for instance version and layout based on instance type.
+  def prompt_make_managed_instance_options(instance_type, group_id, cloud_id, options={})
+    opt_bucket = options[:options] || {}
+
+    # available versions for this instance type
+    version_source_params = {groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']}
+    available_versions = options_interface.options_for_source('instanceVersions', version_source_params)['data'] || []
+    # filter out versions that have no layouts
+    available_versions.reject! { |ver| ver['layouts'].nil? || ver['layouts'].empty? }
+    available_versions.sort! { |x,y| x['name']<=> y['name'] }
+
+    # validate version option
+    if opt_bucket['version']
+      selected_version = opt_bucket['version']
+      unless available_versions.find {|av| av['name'].to_s == selected_version.to_s }
+        raise_command_error "Invalid version option '#{selected_version}' passed. Valid versions are: #{available_versions.collect {|av| av['name']}.join(', ')}"
+      end
+    end
+    # prompt for version
+    version_prompt = Morpheus::Cli::OptionTypes.prompt([{
+         'fieldName'     => 'version',
+         'type'          => 'select',
+         'fieldLabel'    => 'Version',
+         'selectOptions' => available_versions,
+         'required'      => true,
+         'defaultValue'  => available_versions.first ? available_versions.first['value'] : '',
+         'description'  => 'Instance Type Version'
+      }],
+      opt_bucket
+    )
+    selected_version_value = version_prompt['version']
+
+    # filter layouts that support the selected version and are unmanaged or support convert to managed
+    layouts_for_version = (instance_type['instanceTypeLayouts'] || []).select { |layout|
+      (layout['instanceVersion'] == selected_version_value) &&
+      (layout['supportsConvertToManaged'] == true || layout['serverType'] == 'unmanaged')
+    }
+
+    if layouts_for_version.empty?
+      print_red_alert "No available layouts that support converting to managed for the given instance type"
+      return nil
+    end
+
+    layout_options = layouts_for_version.collect { |layout|
+      {'name' => layout['name'], 'value' => layout['id']}
+    }
+
+    # validate layout input option
+    if opt_bucket['layout']
+      default_layout = opt_bucket['layout']
+      unless layout_options.find {|lo| lo['name'].to_s == default_layout.to_s }
+        raise_command_error "Invalid layout option '#{default_layout}' passed. Valid layouts are: #{layout_options.collect {|lo| lo['name']}.join(', ')}"
+      end
+    end
+
+    layout_prompt = Morpheus::Cli::OptionTypes.prompt(
+      [{
+         'fieldName'     => 'layout',
+         'type'          => 'select',
+         'fieldLabel'    => 'Layout',
+         'selectOptions' => layout_options,
+         'required'      => true,
+         'defaultValue'  => layout_options.first ? layout_options.first['value'] : '',
+         'description'   => 'Choose a layout (template) for this instance.'
+       }],
+      opt_bucket
+    )
+    chosen_layout_id = layout_prompt['layout']
+
+    {'instanceVersion' => selected_version_value, 'instanceLayoutId' => chosen_layout_id}
+  end
+  private :prompt_make_managed_instance_options
+
   def make_managed(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -1416,9 +1501,9 @@ class Morpheus::Cli::Hosts
       opts.on('-g', '--group GROUP', String, "Group to assign to new instance.") do |val|
         options[:group] = val
       end
-      # opts.on('--instance-type-id ID', String, "Instance Type ID for the new instance.") do |val|
-      #   options['instanceTypeId'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-      # end
+      opts.on('--instance-type ID', String, "Instance Type ID or Name for the new instance. Optional - only specify if you want to set a specific instance type for conversion.") do |val|
+        options['instanceType'] = val
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
@@ -1453,11 +1538,33 @@ class Morpheus::Cli::Hosts
         params['provisionSiteId'] = group['id']
       end
       payload['server'].merge!(params)
-      ['installAgent','instanceTypeId'].each do |k|
+      ['installAgent'].each do |k|
         if options[k] != nil
           payload[k] = options[k]
         end
       end
+      # If instance type is passed, prompt for version and layout
+      unless options['instanceType'].nil?
+        instance_type = find_instance_type_by_name_or_id(options['instanceType'])
+        if instance_type.nil?
+          print_red_alert "Instance Type not found by name or id #{options['instanceType']}"
+          return 1
+        end
+        if instance_type['active'] != true
+          print_red_alert "Instance Type '#{options['instanceType']}' (#{instance_type['name']}) is not active"
+          return 1
+        end
+        resp=prompt_make_managed_instance_options(instance_type, params['provisionSiteId'] || host['siteId'],
+                                                  (host['zoneId'] || host['zone']['id']), options)
+        if resp.nil?
+          print_red_alert "Failed to select instance version and layout for given instance type '#{instance_type['name']}'"
+          return 1
+        end
+        payload['instanceTypeId'] = instance_type['id']
+        payload['layout'] = resp['instanceLayoutId']
+        payload['version'] = resp['instanceVersion']
+      end
+
       @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run(@servers_interface.dry.make_managed(host['id'], payload), options)

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

@@ -53,7 +53,9 @@ class Morpheus::Cli::Instances
     @library_layouts_interface = @api_client.library_layouts
     @clouds_interface = @api_client.clouds
     @clouds_datastores_interface = @api_client.cloud_datastores
+    @cloud_resource_pools_interface = @api_client.cloud_resource_pools
     @servers_interface = @api_client.servers
+    @server_types_interface = @api_client.server_types
     @provision_types_interface = @api_client.provision_types
     @options_interface = @api_client.options
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
@@ -2655,6 +2657,84 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def find_server_type_by_id(id)
+    begin
+      json_response =@server_types_interface.get(id.to_i)
+      return json_response['serverType']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Server Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+  private :find_server_type_by_id
+
+  # checks whether adding a node to the specified instance requires a resource pool input
+  def addnode_requires_resource_pool?(instance, provision_type)
+    return false unless provision_type && provision_type["hasZonePools"] && provision_type["zonePoolRequired"] && instance['servers']
+    instance['servers'].each do |server_id|
+      server = find_server_by_id(server_id)
+      next unless server
+      cst_id = server.dig('computeServerType', 'id')
+      cst = find_server_type_by_id(cst_id)
+      unless cst
+        print_red_alert "Server Type not found by id #{cst_id}"
+        return false
+      end
+      return true if cst['bareMetalHost']
+    end
+    false
+  end
+  private :addnode_requires_resource_pool?
+
+  # Prompts for a resource pool selection when adding a node to an instance.
+  # This is invoked during the Add Node action to choose a resource pool (eg. for HPE bare metal host provisioning types mandates a pool).
+  def addnode_prompt_for_resource_pool(instance, options)
+    zone_id = instance['cloud']['id']
+    if zone_id.nil?
+      print_red_alert "Instance #{instance['name']} does not have a cloud/zone assigned."
+      return nil
+    end
+    zone_pools = @cloud_resource_pools_interface.list(zone_id)['resourcePools']
+    if zone_pools.empty?
+      print_red_alert "No Resource Pools are defined for the instance's cloud #{instance['cloud']['name']}. This is required to perform this action."
+      return nil
+    end
+    zone_pools_dropdown = zone_pools.collect {|zp| {'name' => zp['name'], 'value' => zp['id']} }
+    # validate input if given
+    if options[:options] && options[:options]['resourcePool']
+      selected_resource_pool_id = options[:options]['resourcePool'].to_i
+      selected_pool = zone_pools.find {|zp| zp['id'] == selected_resource_pool_id }
+      if selected_pool.nil?
+        print_red_alert "Resource Pool ID #{selected_resource_pool_id} is not valid for the instance's cloud."
+        return nil
+      end
+    end
+    # auto select single
+    pool_prompt = Morpheus::Cli::OptionTypes.prompt(
+    [{
+       'fieldName' => 'resourcePool',
+       'type' => 'select',
+       'fieldLabel' => 'Resource Pool',
+       'selectOptions' => zone_pools_dropdown,
+       'required' => true,
+       'defaultValue' => zone_pools[0]['id'],
+       'description' => 'Choose the Resource Pool to use for this action'
+     }],
+    options[:options]
+    )
+    selected_pool = zone_pools.find {|zp| zp['id'] == pool_prompt['resourcePool'] }
+    if selected_pool.nil?
+      print_red_alert "A Resource Pool is required to perform this action."
+      return nil
+    end
+    selected_resource_pool_id = selected_pool['id']
+  end
+  private :addnode_prompt_for_resource_pool
+
   def action(args)
     options = {}
     action_id = nil
@@ -2663,7 +2743,11 @@ class Morpheus::Cli::Instances
       opts.on('-a', '--action CODE', "Instance Action CODE to execute") do |val|
         action_id = val.to_s
       end
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.on( '--resource-pool ID', String, "Resource pool ID for Add node action" ) do |val|
+      options[:options] ||= {}
+      options[:options]['resourcePool'] = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote,])
       opts.footer = "Execute an action for one or many instances."
     end
     optparse.parse!(args)
@@ -2716,20 +2800,46 @@ class Morpheus::Cli::Instances
       raise_command_error "Instance Action '#{action_id}' not found."
     end
 
-    action_display_name = "#{instance_action['name']} [#{instance_action['code']}]"    
+    action_display_name = "#{instance_action['name']} [#{instance_action['code']}]"
+    if action_id == 'generic-add-node' && instances.size > 1
+      raise_command_error "The #{action_display_name} action can only be performed on a single instance at a time."
+    end
+
     unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to perform action #{action_display_name} on #{id_list.size == 1 ? 'instance' : 'instances'} #{anded_list(id_list)}?", options)
       return 9, "aborted command"
     end
 
+    selected_resource_pool_id = nil
+    # Special handling for generic-add-node action to prompt for resource pool if needed.
+    if action_id == 'generic-add-node'
+      instance = instances[0]
+      layout = instance['layout']
+      provision_type_code = layout['provisionTypeCode']
+      provision_type = nil
+      if provision_type_code
+        provision_type = provision_types_interface.list({code:provision_type_code})['provisionTypes'][0]
+        if provision_type.nil?
+          print_red_alert "Provision Type not found by code #{provision_type_code}"
+          return 1
+        end
+      end
+
+      # Check if instance containers are of 'baremetalhost' type, if so, then only prompt for resource pool.
+      pool_required = addnode_requires_resource_pool?(instance, provision_type)
+      if pool_required
+        selected_resource_pool_id = addnode_prompt_for_resource_pool(instance, options )
+        return 1 if selected_resource_pool_id.nil?
+      end
+    end # End of generic-add-node special handling
     # return run_command_for_each_arg(containers) do |arg|
     #   _action(arg, action_id, options)
     # end
     @instances_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @instances_interface.dry.action(instance_ids, action_id)
+      print_dry_run @instances_interface.dry.action(instance_ids, action_id, selected_resource_pool_id)
       return 0
     end
-    json_response = @instances_interface.action(instance_ids, action_id)
+    json_response = @instances_interface.action(instance_ids, action_id, selected_resource_pool_id)
     # just assume json_response["success"] == true,  it always is with 200 OK
     if options[:json]
       puts as_json(json_response, options)
@@ -2937,7 +3047,7 @@ class Morpheus::Cli::Instances
       opts.footer = <<-EOT
 Create a snapshot for an instance.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -3067,7 +3177,7 @@ EOT
 Cancel removal of an instance.
 This is a way to undo delete of an instance still pending removal.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -3098,7 +3208,7 @@ EOT
       opts.footer = <<-EOT
 Cancel expiration of an instance.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -3129,7 +3239,7 @@ EOT
       opts.footer = <<-EOT
 Cancel shutdown for an instance.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -3160,7 +3270,7 @@ EOT
       opts.footer = <<-EOT
 Extend expiration for an instance.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -3191,7 +3301,7 @@ EOT
       opts.footer = <<-EOT
 Extend shutdown for an instance.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -3437,7 +3547,7 @@ Run workflow for an instance.
 By default the provision phase is executed.
 Use the --phase option to execute a different phase.
 The available phases are start, stop, preProvision, provision, postProvision, preDeploy, deploy, reconfigure, teardown, startup and shutdown.
-EOT
+      EOT
     end
     optparse.parse!(args)
     if args.count != 2
@@ -3505,7 +3615,7 @@ EOT
 List snapshots for an instance.
 [instance] is required. This is the name or id of an instance
 [snapshot] is optional. this is the name or id a snapshot to filter by.
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, min:1, max: 2)
@@ -4001,7 +4111,7 @@ EOT
       opts.footer = <<-EOT
 List instance scaling threshold schedules.
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -4045,7 +4155,7 @@ EOT
 Get details about an instance scaling threshold schedule.
 [instance] is required. This is the name or id of an instance
 [schedule] is required. This is id of an instance schedule
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:2)
@@ -4084,7 +4194,7 @@ EOT
       opts.footer = <<-EOT
 Update an existing instance scaling threshold schedule
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -4145,7 +4255,7 @@ EOT
 Update an existing instance scaling threshold schedule.
 [instance] is required. This is the name or id of an instance
 [schedule] is required. This is id of an instance schedule
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:2)
@@ -4205,7 +4315,7 @@ EOT
 Delete an existing instance scaling threshold schedule
 [instance] is required. This is the name or id of an instance
 [schedule] is required. This is id of an instance schedule
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:2)
@@ -4769,7 +4879,7 @@ EOT
 List deployments for an instance.
 [instance] is required. This is the name or id of an instance
 [search] is optional. Filters on deployment version identifier
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, min:1)
@@ -4827,7 +4937,7 @@ EOT
       opts.footer = <<-EOT
 Clone to image (template) for an instance
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -4899,7 +5009,7 @@ EOT
       opts.footer = <<-EOT
 Lock an instance
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -4933,7 +5043,7 @@ EOT
       opts.footer = <<-EOT
 Unlock an instance
 [instance] is required. This is the name or id of an instance
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -4968,7 +5078,7 @@ EOT
 Refresh an instance.
 [instance] is required. This is the name or id of an instance.
 This is only supported by certain types of instances such as terraform.
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -5017,7 +5127,7 @@ Prepare to apply an instance.
 [instance] is required. This is the name or id of an instance.
 Displays the current configuration data used by the apply command.
 This is only supported by certain types of instances such as terraform.
-EOT
+      EOT
     end
     optparse.parse!(args)
     if args.count != 1
@@ -5090,7 +5200,7 @@ This is only supported by certain types of instances such as terraform.
 By default this executes two requests to validate and then apply the changes.
 The first request corresponds to the terraform plan command only.
 Use --no-validate to skip this step apply changes in one step.
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -5240,7 +5350,7 @@ EOT
 View state of an instance.
 [instance] is required. This is the name or id of an instance.
 This is only supported by certain types of apps such as terraform.
-EOT
+      EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)

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

@@ -7,7 +7,7 @@ class Morpheus::Cli::StorageVolumes
 
   set_command_name :'storage-volumes'
   set_command_description "View and manage storage volumes."
-  register_subcommands %w{list get add remove}
+  register_subcommands :list, :get, :add, :remove, :resize
 
   # RestCommand settings
   register_interfaces :storage_volumes, :storage_volume_types
@@ -80,6 +80,12 @@ class Morpheus::Cli::StorageVolumes
     ]
   end
 
+  def resize_storage_volume_option_types()
+    [
+      {'fieldName' => 'maxStorage', 'fieldLabel' => 'New Size', 'type' => 'number', 'required' => true},
+    ]
+  end
+
   def load_option_types_for_storage_volume(type_record, parent_record)
     storage_volume_type = type_record
     option_types = storage_volume_type['optionTypes']
@@ -94,4 +100,62 @@ class Morpheus::Cli::StorageVolumes
     return option_types
   end
 
+  def resize(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      volume = find_volume_by_name_or_id(args[0])
+      payload = {}
+      id = volume['id'].to_i
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'size', 'type' => 'number', 'fieldLabel' => "Volume Size (bytes)", 'required' => true, 'description' => 'Enter a volume size (bytes).', 'defaultValue' => volume['maxStorage']}], options[:options])
+      payload['maxStorage'] = v_prompt['size'].to_i
+      @storage_volumes_interface.resize(id, payload)
+    end
+  end
+
+  def find_volume_by_id(id)
+    begin
+      json_response = @storage_volumes_interface.get(id.to_i)
+      return json_response['storageVolume']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Volume not found by id #{id}"
+        exit 1
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_volume_by_name(name)
+    results = @storage_volumes_interface.list({name: name})
+    if results['storageVolumes'].empty?
+      print_red_alert "Volume not found by name #{name}"
+      exit 1
+    elsif results['storageVolumes'].size > 1
+      print_red_alert "Multiple Volumes exist with the name '#{name}'"
+      puts_error as_pretty_table(results['storageVolumes'], [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      exit 1
+    end
+    return results['storageVolumes'][0]
+  end
+
+  def find_volume_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_volume_by_id(val)
+    else
+      return find_volume_by_name(val)
+    end
+  end
+
 end

data/lib/morpheus/cli/error_handler.rb

@@ -192,6 +192,11 @@ class Morpheus::Cli::ErrorHandler
             @stderr.print reset
           end
         else
+          # quick parse only for msg display
+          response = (JSON.parse(e.response.to_s) rescue nil)
+          if response.is_a?(Hash) && response['success'] == false && response['msg']
+            @stderr.print red, response['msg'].to_s, reset, "\n"
+          end
           @stderr.puts "Use -V or --debug for more verbose debugging information."
         end
       end

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

@@ -28,9 +28,15 @@ module Morpheus::Cli::ProcessesHelper
       "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) },
+    }
+    if process['message'].to_s.strip != ''
+      description_cols.merge!({ "Message" => lambda {|it| it['message']}
+      })
+    end
+    description_cols.merge!({
       "Status" => lambda {|it| format_process_status(it) },
       # "# Events" => lambda {|it| (it['events'] || []).size() },
-    }
+    })
     print_description_list(description_cols, process, options)
 
     if process['error']

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

@@ -1067,7 +1067,7 @@ module Morpheus::Cli::ProvisioningHelper
 
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     volumes = []
-    plan_size = nil
+    plan_size = 0
     if plan_info['maxStorage'].to_i > 0
       plan_size = plan_info['maxStorage'].to_i / (1024 * 1024 * 1024)
     end
@@ -1909,25 +1909,16 @@ module Morpheus::Cli::ProvisioningHelper
         default_interface_type_value = (network_interface_type_options.find {|t| t['value'].to_s == network_interface['networkInterfaceTypeId'].to_s} || {})['name']
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkInterfaceTypeId', 'type' => 'select', 'fieldLabel' => "Network Interface Type", 'selectOptions' => network_interface_type_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a network interface type.', 'defaultValue' => default_interface_type_value}], options[:options])
         network_interface['networkInterfaceTypeId'] = v_prompt[field_context]['networkInterfaceTypeId'].to_i
+        selected_network_interface_type = network_interface_types.find {|it| it["id"] == network_interface['networkInterfaceTypeId']}
       end
 
-      # choose IP if network allows it
-      # allowStaticOverride is only returned in 4.2.1+, so treat null as true for now..
-      ip_available = selected_network['allowStaticOverride'] == true || selected_network['allowStaticOverride'].nil?
-      ip_required = true
-      if selected_network['id'].to_s.include?('networkGroup')
-        #puts "IP Address: Using network group." if !no_prompt
-        ip_available = false
-        ip_required = false
-      elsif selected_network['pool']
-        #puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
-        ip_required = false
-      elsif selected_network['dhcpServer']
-        #puts "IP Address: Using DHCP" if !no_prompt
-        ip_required = false
-      end
+      # determine if IP can/should be specified for selected network
+      ip_flags = determine_ip_requirements(selected_network)
+      ip_available = ip_flags[:ip_available]
+      ip_required = ip_flags[:ip_required]
 
-      if ip_available
+      # Prompt for IP input when static assignment is allowed or an IP is explicitly required
+      if ip_available || ip_required
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'ipAddress', 'type' => 'text', 'fieldLabel' => "IP Address", 'required' => ip_required, 'description' => 'Enter an IP for this network interface. x.x.x.x', 'defaultValue' => network_interface['ipAddress']}], options[:options])
         if v_prompt[field_context] && !v_prompt[field_context]['ipAddress'].to_s.empty?
           network_interface['ipAddress'] = v_prompt[field_context]['ipAddress']
@@ -1940,6 +1931,20 @@ module Morpheus::Cli::ProvisioningHelper
         network_interface['ipMode'] = 'static'
       end
 
+      # prompt for virtual interfaces if supported by the selected network interface type
+      virtual_interfaces = prompt_virtual_interfaces(
+        selected_network_interface_type,
+        networks,
+        network_options,
+        field_context,
+        interface_index,
+        options,
+        no_prompt
+      )
+      virtual_interfaces ||= []
+      network_interface['networkInterfaces'] = virtual_interfaces unless virtual_interfaces.empty?
+
+      # append the interface
       network_interfaces << network_interface
       interface_index += 1
       if options[:options] && options[:options]['networkInterfaces'] && options[:options]['networkInterfaces'][interface_index]
@@ -1957,6 +1962,153 @@ module Morpheus::Cli::ProvisioningHelper
 
   end
 
+  # determine if IP can/should be specified for selected network
+  def determine_ip_requirements(selected_network)
+    ip_available = selected_network['allowStaticOverride'] != false
+    ip_required = true
+    if selected_network['id'].to_s.include?('networkGroup')
+      ip_available = false
+      ip_required = false
+    elsif selected_network['pool']
+      ip_required = false
+    elsif selected_network['dhcpServer']
+      ip_required = false
+    end
+    {ip_available: ip_available, ip_required: ip_required}
+  end
+
+  # Prompt for virtual interfaces if supported by the selected network interface type
+  def prompt_virtual_interfaces(selected_network_interface_type, networks, network_options, field_context, interface_index, options, no_prompt)
+    return [] unless selected_network_interface_type && selected_network_interface_type['hasVirtualInterfaces']
+
+    virtual_interfaces = []
+    # gather virtual interface types for the selected network interface type
+    network_interface_types = selected_network_interface_type['virtualInterfaces'] || []
+    return [] if network_interface_types.empty?
+
+    network_interface_type_options = []
+    network_interface_types.each do |opt|
+      next if opt.nil?
+      network_interface_type_options << {'name' => opt['name'], 'value' => opt['id']}
+    end
+
+    # Preconfigured virtual interfaces passed in options
+    prespecified = false
+    preconfigured_vi = []
+    if options[:options]
+      if options[:options]['networkInterfaces'] &&
+         options[:options]['networkInterfaces'][interface_index]
+        preconfigured_vi = options[:options]['networkInterfaces'][interface_index]['networkInterfaces'] || []
+        prespecified = true
+      end
+      if options[:options][field_context].is_a?(Hash) && !options[:options][field_context].empty?
+        prespecified = true
+      end
+    end
+
+    vi_index = 0
+    has_another = false
+    # Process any pre-configured virtual interfaces first, then prompt for additional ones.
+    if preconfigured_vi[vi_index]
+      has_another = true
+    elsif options[:options] && options[:options][field_context] && !options[:options][field_context].empty?
+      has_another = options[:options][field_context]['virtualInterface'] || false
+    end
+    confirm_message = prespecified ? "Add virtual network interface? (under prespecified interface #{interface_index})": "Add virtual network interface?"
+
+    add_another = has_another || (!no_prompt && Morpheus::Cli::OptionTypes.confirm(confirm_message, {default:false}))
+    while add_another
+      vi_field_context = vi_index == 0 ? "virtualInterface" : "virtualInterface#{vi_index+1}"
+      vi = preconfigured_vi[vi_index] ? preconfigured_vi[vi_index].dup : {}
+
+      # Determine default network for this virtual interface
+      default_network_id = vi['networkId'] || (vi['network'] && vi['network']['id'])
+      default_network_name = (network_options.find {|n| n['value'] == default_network_id} || {})['name']
+
+      # Choose network
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(
+        [{
+           'fieldContext' => "#{field_context}.#{vi_field_context}",
+           'fieldName' => 'networkId',
+           'type' => 'select',
+           'fieldLabel' => "Virtual Network",
+           'selectOptions' => network_options,
+           'required' => true,
+           'skipSingleOption' => false,
+           'description' => 'Choose a network for this virtual interface.',
+           'defaultValue' => default_network_name
+         }],
+        options[:options],
+        nil,
+        {},
+        no_prompt,
+        true
+      )
+      vi['network'] ||= {}
+      vi['network']['id'] = v_prompt[field_context][vi_field_context]['networkId'].to_s
+
+      # determine / prompt interface type for virtual interface
+      default_interface_type_id = vi['networkInterfaceTypeId'] ||
+            (vi['networkInterfaceType'] && vi['networkInterfaceType']['id'])
+      default_interface_type_name =
+        (network_interface_type_options.find { |t| t['value'].to_s == default_interface_type_id.to_s } || {})['name']
+      type_prompt = Morpheus::Cli::OptionTypes.prompt(
+        [{
+           'fieldContext' => "#{field_context}.#{vi_field_context}",
+           'fieldName' => 'networkInterfaceTypeId',
+           'type' => 'select',
+           'fieldLabel' => "Virtual Network Interface Type",
+           'selectOptions' => network_interface_type_options,
+           'required' => true,
+           'skipSingleOption' => true,
+           'description' => 'Choose a network interface type.',
+           'defaultValue' => default_interface_type_name
+         }],
+        options[:options]
+      )
+      vi['networkInterfaceTypeId'] = type_prompt[field_context][vi_field_context]['networkInterfaceTypeId'].to_i
+
+      # IP logic
+      selected_network = networks.find {|n| n['id'].to_s == vi['network']['id'] }
+      if selected_network
+        ip_flags = determine_ip_requirements(selected_network)
+        if ip_flags[:ip_available] || ip_flags[:ip_required]
+          v_prompt = Morpheus::Cli::OptionTypes.prompt(
+            [{
+               'fieldContext' => "#{field_context}.#{vi_field_context}",
+               'fieldName' => 'ipAddress',
+               'type' => 'text',
+               'fieldLabel' => "IP Address for Virtual Interface",
+               'required' => ip_flags[:ip_required],
+               'description' => 'Enter an IP for this virtual interface.',
+               'defaultValue' => vi['ipAddress']
+             }],
+            options[:options]
+          )
+          if v_prompt[field_context][vi_field_context] && !v_prompt[field_context][vi_field_context]['ipAddress'].to_s.empty?
+            vi['ipAddress'] = v_prompt[field_context][vi_field_context]['ipAddress']
+            vi['ipMode'] = 'static'
+          elsif ip_flags[:ip_required] == false && selected_network['dhcpServer']
+            vi['ipMode'] = 'dhcp'
+          end
+        end
+      end
+
+      virtual_interfaces << vi
+      vi_index += 1
+
+      has_another = false
+      confirm_message = prespecified ? "Add another virtual network interface? (under prespecified interface #{interface_index})": "Add another virtual network interface?"
+      if preconfigured_vi[vi_index]
+        has_another = true
+      elsif options[:options] && options[:options][field_context]
+        has_another = options[:options][field_context]["virtualInterface#{vi_index+1}"] && !options[:options][field_context]["virtualInterface#{vi_index+1}"].empty?
+      end
+      add_another = has_another || (!no_prompt && Morpheus::Cli::OptionTypes.confirm(confirm_message,{default:false}))
+    end
+    virtual_interfaces
+  end
+
   # Prompts user for environment variables for new instance
   # returns array of evar objects {id: null, name: "VAR", value: "somevalue"}
   def prompt_evars(options={})
@@ -2145,8 +2297,8 @@ module Morpheus::Cli::ProvisioningHelper
     return payload
   end
 
-  def prompt_cluster_load_balancer(cluster, options)
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'loadBalancerTypeId', 'type' => 'select', 'fieldLabel' => "Load Balancer", 'optionSource' => 'loadBalancerTypes', 'required' => false, 'description' => 'Select Load Balancer for Cluster', 'defaultValue' => '', 'excludeKubevip' => true}], options[:options], api_client, cluster)
+  def prompt_cluster_load_balancer(cluster, options, can_use_kubevip)
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'loadBalancerTypeId', 'type' => 'select', 'fieldLabel' => "Load Balancer", 'optionSource' => 'loadBalancerTypes', 'required' => false, 'description' => 'Select Load Balancer for Cluster', 'defaultValue' => '', 'excludeKubevip' => !can_use_kubevip}], options[:options], api_client, cluster)
     lb_type_id = v_prompt['loadBalancerTypeId']
 
     if lb_type_id.empty?

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.9.1"
+    VERSION = "8.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.9.1
+  version: 8.0.10
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-26 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix