morpheus-cli 5.3.2 → 5.3.3

data/lib/morpheus/cli/log_settings_command.rb

@@ -6,11 +6,12 @@ class Morpheus::Cli::LogSettingsCommand
 
   set_command_name :'log-settings'
 
-  register_subcommands :get, :update
-  register_subcommands :enable_integration, :disable_integration, :remove_integration
+  register_subcommands :get, :update  
   register_subcommands :add_syslog_rule, :remove_syslog_rule
   
-  set_default_subcommand :get
+  # these command are deprecated in 5.3.3 and can be removed
+  register_subcommands :enable_integration, :disable_integration, :remove_integration
+  set_subcommands_hidden :enable_integration, :disable_integration, :remove_integration
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -186,6 +187,7 @@ class Morpheus::Cli::LogSettingsCommand
   end
 
   def enable_integration(args)
+    print_error yellow,"[DEPRECATED] The command `#{command_name} enable-integration` is deprecated.",reset,"\n"
     options = {}
 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -240,6 +242,7 @@ class Morpheus::Cli::LogSettingsCommand
   end
 
   def disable_integration(args)
+    print_error yellow,"[DEPRECATED] The command `#{command_name} disable-integration` is deprecated.",reset,"\n"
     options = {}
 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -285,6 +288,7 @@ class Morpheus::Cli::LogSettingsCommand
   end
 
   def remove_integration(args)
+    print_error yellow,"[DEPRECATED] The command `#{command_name } remove-integration` is deprecated.",reset,"\n"
     options = {}
 
     optparse = Morpheus::Cli::OptionParser.new do |opts|

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

@@ -0,0 +1,156 @@
+require 'morpheus/cli/mixins/print_helper'
+require 'morpheus/cli/option_types'
+require 'morpheus/rest_client'
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for load balancer management
+# including load balancers, load balancer types, virtual servers, etc.
+module Morpheus::Cli::LoadBalancersHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  def load_balancers_interface
+    # @api_client.load_balancers
+    raise "#{self.class} has not defined @load_balancers_interface" if @load_balancers_interface.nil?
+    @load_balancers_interface
+  end
+
+  def load_balancer_types_interface
+    # @api_client.load_balancer_types
+    raise "#{self.class} has not defined @load_balancer_types_interface" if @load_balancer_types_interface.nil?
+    @load_balancer_types_interface
+  end
+
+  def load_balancer_object_key
+    'loadBalancer'
+  end
+
+  def load_balancer_list_key
+    'loadBalancers'
+  end
+
+  def load_balancer_label
+    'Load Balancer'
+  end
+
+  def load_balancer_plural_label
+    'Load Balancers'
+  end
+
+  def load_balancer_type_object_key
+    'loadBalancerType'
+  end
+
+  def load_balancer_type_list_key
+    'loadBalancerTypes'
+  end
+
+  def load_balancer_type_label
+    'Load Balancer Type'
+  end
+
+  def load_balancer_type_plural_label
+    'Load Balancer Types'
+  end
+
+  def find_load_balancer_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_load_balancer_by_id(val)
+    else
+      return find_load_balancer_by_name(val)
+    end
+  end
+
+  def find_load_balancer_by_id(id)
+    begin
+      json_response = load_balancers_interface.get(id.to_i)
+      return json_response[load_balancer_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Load Balancer not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_load_balancer_by_name(name)
+    lbs = load_balancers_interface.list({name: name.to_s})[load_balancer_list_key]
+    if lbs.empty?
+      print_red_alert "Load Balancer not found by name #{name}"
+      return nil
+    elsif lbs.size > 1
+      print_red_alert "#{lbs.size} load balancers found by name #{name}"
+      #print_lbs_table(lbs, {color: red})
+      print reset,"\n\n"
+      return nil
+    else
+      return lbs[0]
+    end
+  end
+
+  def get_available_load_balancer_types(refresh=false)
+    if !@available_load_balancer_types || refresh
+      @available_load_balancer_types = load_balancer_types_interface.list({max:1000})[load_balancer_type_list_key]
+    end
+    return @available_load_balancer_types
+  end
+
+  def load_balancer_type_for_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return load_balancer_type_for_id(val)
+    else
+      return load_balancer_type_for_name(val)
+    end
+  end
+
+  def load_balancer_type_for_id(id)
+    return get_available_load_balancer_types().find { |z| z['id'].to_i == id.to_i}
+  end
+
+  def load_balancer_type_for_name(name)
+    return get_available_load_balancer_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
+  end
+
+  def find_load_balancer_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_load_balancer_type_by_id(val)
+    else
+      return find_load_balancer_type_by_name(val)
+    end
+  end
+
+  def find_load_balancer_type_by_id(id)
+    begin
+      json_response = load_balancer_types_interface.get(id.to_i)
+      return json_response[load_balancer_type_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Load Balancer Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_load_balancer_type_by_name(name)
+    json_response = load_balancer_types_interface.list({name: name.to_s})
+    load_balancer_types = json_response[load_balancer_type_list_key]
+    if load_balancer_types.empty?
+      print_red_alert "Load Balancer Type not found by name #{name}"
+      return load_balancer_types
+    elsif load_balancer_types.size > 1
+      print_red_alert "#{load_balancer_types.size} load balancer types found by name #{name}"
+      rows = load_balancer_types.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return load_balancer_types[0]
+    end
+  end
+
+end

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

@@ -1335,4 +1335,15 @@ module Morpheus::Cli::PrintHelper
     parse_json_or_yaml(config, parsers)
   end
 
+  def format_option_types_table(option_types, options={}, domain_name=nil)
+    columns = [
+      {"FIELD LABEL" => lambda {|it| it['fieldLabel'] } },
+      {"FIELD NAME" => lambda {|it| [it['fieldContext'] == domain_name ? nil : it['fieldContext'], it['fieldName']].select {|it| !it.to_s.empty? }.join('.') } },
+      {"TYPE" => lambda {|it| it['type'] } },
+      {"DEFAULT" => lambda {|it| it['defaultValue'] } },
+      {"REQUIRED" => lambda {|it| format_boolean it['required'] } },
+    ]
+    as_pretty_table(option_types, columns, options)
+  end
+  
 end

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

@@ -484,7 +484,7 @@ module Morpheus::Cli::ProvisioningHelper
     if options[:instance_type_code]
       instance_type_code = options[:instance_type_code]
     else
-      instance_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Type', 'optionSource' => 'instanceTypes', 'required' => true, 'description' => 'Select Instance Type.'}],options[:options],api_client,{groupId: group_id})
+      instance_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Type', 'optionSource' => 'instanceTypes', 'required' => true, 'description' => 'Select Instance Type.'}],options[:options],api_client,{groupId: group_id}, no_prompt, true)
       instance_type_code = instance_type_prompt['type']
     end
     if instance_type_code.to_s =~ /\A\d{1,}\Z/
@@ -657,13 +657,11 @@ module Morpheus::Cli::ProvisioningHelper
           version_value = default_version_value
           version_is_required = default_layout_value.nil?
           if default_layout_value.nil? && options[:options]["layout"].nil? && options[:always_prompt] != true
-            #version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
             version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'selectOptions' => available_versions, 'required' => version_is_required, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
             version_value = version_prompt['version']
           end
         end
-
-        layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_value, creatable: true})['layout']
+        layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_value, creatable: true}, no_prompt, true)['layout']
       end
     end
 
@@ -679,7 +677,7 @@ module Morpheus::Cli::ProvisioningHelper
     end
     layout_id = layout['id']
     payload['instance']['layout'] = {'id' => layout['id'], 'code' => layout['code']}
-    
+
     # need to GET provision type for optionTypes, and other settings...
     provision_type_code = layout['provisionTypeCode'] || layout['provisionType']['code']
     provision_type = nil
@@ -693,50 +691,6 @@ module Morpheus::Cli::ProvisioningHelper
       provision_type = get_provision_type_for_zone_type(cloud['zoneType']['id'])
     end
 
-    # prompt for service plan
-    plan_id = nil
-    service_plan = nil
-    service_plans_json = instances_interface.service_plans({zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
-    service_plans = service_plans_json["plans"]
-    if locked_fields.include?('plan.id')
-      plan_id = options[:options]['plan']['id'] rescue nil
-      if plan_id.nil?
-        plan_id = options[:options]['instance']['plan']['id'] rescue nil
-      end
-      service_plan = service_plans.find {|sp| sp['id'] == plan_id }
-    else
-      service_plan = service_plans.find {|sp| sp['id'] == options[:service_plan].to_i} if options[:service_plan]
-
-      if !service_plan
-        service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"], 'code' => sp['code']} } # already sorted
-        default_plan = nil
-        if payload['plan']
-          default_plan = payload['plan']
-        elsif payload['instance'] && payload['instance']['plan']
-          default_plan = payload['instance']['plan']
-        end
-
-        if options[:default_plan] && service_plans_dropdown.find {|sp| [sp["name"], sp["value"].to_s, sp["code"]].include?(options[:default_plan].to_s)}
-          default_plan_value = options[:default_plan]
-        else
-          default_plan_value = options[:default_plan] || (default_plan.is_a?(Hash) ? default_plan['id'] : default_plan)
-        end
-        plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance', 'defaultValue' => default_plan_value}],options[:options])
-        plan_id = plan_prompt['servicePlan']
-        service_plan = service_plans.find {|sp| sp["id"] == plan_id.to_i }
-        if !service_plan
-          print_red_alert "Plan not found by id #{plan_id}"
-          exit 1
-        end
-      end
-      #todo: consolidate these, instances api looks for instance.plan.id and apps looks for plan.id
-      if options[:for_app]
-        payload['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
-      else
-        payload['instance']['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
-      end
-    end
-
     # build config option types
     option_type_list = []
     if !layout['optionTypes'].nil? && !layout['optionTypes'].empty?
@@ -745,47 +699,112 @@ module Morpheus::Cli::ProvisioningHelper
     if !instance_type['optionTypes'].nil? && !instance_type['optionTypes'].empty?
       option_type_list += instance_type['optionTypes']
     end
-    if !provision_type.nil? && !provision_type['optionTypes'].nil? && !provision_type['optionTypes'].empty?
-      option_type_list += provision_type['optionTypes']
-    end
 
-    # prompt for resource pool
+    api_params = {groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_value}
+
     pool_id = nil
     resource_pool = nil
-    if locked_fields.include?('config.resourcePoolId')
-      pool_id = payload['config']['resourcePoolId'] rescue nil
-    elsif locked_fields.include?('config.resourcePool')
-      pool_id = payload['config']['resourcePool'] rescue nil
-    elsif locked_fields.include?('config.azureResourceGroupId')
-      pool_id = payload['config']['azureResourceGroupId'] rescue nil
-    else
-      has_zone_pools = provision_type && provision_type["id"] && provision_type["hasZonePools"]
-      if has_zone_pools
-        # pluck out the resourcePoolId option type to prompt for
-        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_options = options_interface.options_for_source('zonePools', {groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], planId: service_plan["id"], layoutId: layout["id"]})['data']
-        resource_pool = resource_pool_options.find {|opt| opt['id'] == options[:resource_pool].to_i} if options[:resource_pool]
-
-        if resource_pool
-          pool_id = resource_pool['id']
-        else
-          if options[:default_resource_pool]
-            default_resource_pool = resource_pool_options.find {|rp| rp['id'] == options[:default_resource_pool]}
+    service_plan = nil
+
+    prompt_service_plan = -> {
+      service_plans_json = instances_interface.service_plans({zoneId: cloud_id, layoutId: layout['id'], siteId: group_id}.merge(resource_pool.nil? ? {} : {'resourcePoolId' => resource_pool['id']}))
+      service_plans = service_plans_json["plans"]
+      if locked_fields.include?('plan.id')
+        plan_id = options[:options]['plan']['id'] rescue nil
+        if plan_id.nil?
+          plan_id = options[:options]['instance']['plan']['id'] rescue nil
+        end
+        service_plan = service_plans.find {|sp| sp['id'] == plan_id }
+      else
+        service_plan = service_plans.find {|sp| sp['id'] == options[:service_plan].to_i} if options[:service_plan]
+
+        if !service_plan
+          service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"], 'code' => sp['code']} } # already sorted
+          default_plan = nil
+          if payload['plan']
+            default_plan = payload['plan']
+          elsif payload['instance'] && payload['instance']['plan']
+            default_plan = payload['instance']['plan']
           end
-          resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.', 'defaultValue' => default_resource_pool ? default_resource_pool['name'] : nil}
-          resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{})
-          resource_pool_prompt.deep_compact!
-          payload.deep_merge!(resource_pool_prompt)
-          resource_pool = Morpheus::Cli::OptionTypes.get_last_select()
-          if resource_pool_option_type['fieldContext'] && resource_pool_prompt[resource_pool_option_type['fieldContext']]
-            pool_id = resource_pool_prompt[resource_pool_option_type['fieldContext']][resource_pool_option_type['fieldName']]
-          elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
-            pool_id = resource_pool_prompt[resource_pool_option_type['fieldName']]
+
+          if options[:default_plan] && service_plans_dropdown.find {|sp| [sp["name"], sp["value"].to_s, sp["code"]].include?(options[:default_plan].to_s)}
+            default_plan_value = options[:default_plan]
+          else
+            default_plan_value = options[:default_plan] || (default_plan.is_a?(Hash) ? default_plan['id'] : default_plan)
+          end
+          plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance', 'defaultValue' => default_plan_value}],options[:options], api_client, {}, no_prompt, true)
+          plan_id = plan_prompt['servicePlan']
+          service_plan = service_plans.find {|sp| sp["id"] == plan_id.to_i }
+          if !service_plan
+            print_red_alert "Plan not found by id #{plan_id}"
+            exit 1
           end
-          resource_pool ||= resource_pool_options.find {|it| it['id'] == pool_id}
         end
+        #todo: consolidate these, instances api looks for instance.plan.id and apps looks for plan.id
+        if options[:for_app]
+          payload['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
+        else
+          payload['instance']['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
+        end
+      end
+    }
+
+    prompt_resource_pool = -> {
+      # prompt for resource pool
+      if locked_fields.include?('config.resourcePoolId')
+        pool_id = payload['config']['resourcePoolId'] rescue nil
+      elsif locked_fields.include?('config.resourcePool')
+        pool_id = payload['config']['resourcePool'] rescue nil
+      elsif locked_fields.include?('config.azureResourceGroupId')
+        pool_id = payload['config']['azureResourceGroupId'] rescue nil
+      else
+        has_zone_pools = provision_type && provision_type["id"] && provision_type["hasZonePools"]
+        if has_zone_pools
+          # pluck out the resourcePoolId option type to prompt for
+          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_options = options_interface.options_for_source('zonePools', {groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], layoutId: layout["id"]}.merge(service_plan.nil? ? {} : {planId: service_plan["id"]}))['data']
+          resource_pool = resource_pool_options.find {|opt| opt['id'] == options[:resource_pool].to_i} if options[:resource_pool]
+
+          if resource_pool
+            pool_id = resource_pool['id']
+          else
+            if options[:default_resource_pool]
+              default_resource_pool = resource_pool_options.find {|rp| rp['id'] == options[:default_resource_pool]}
+            end
+            resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.', 'defaultValue' => default_resource_pool ? default_resource_pool['name'] : nil}
+            resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{}, no_prompt, true)
+            resource_pool_prompt.deep_compact!
+            payload.deep_merge!(resource_pool_prompt)
+            resource_pool = Morpheus::Cli::OptionTypes.get_last_select()
+            if resource_pool_option_type['fieldContext'] && resource_pool_prompt[resource_pool_option_type['fieldContext']]
+              pool_id = resource_pool_prompt[resource_pool_option_type['fieldContext']][resource_pool_option_type['fieldName']]
+            elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
+              pool_id = resource_pool_prompt[resource_pool_option_type['fieldName']]
+            end
+            resource_pool ||= resource_pool_options.find {|it| it['id'] == pool_id}
+          end
+        end
+      end
+    }
+
+    prompt_provision_options = -> {
+      if !provision_type.nil? && !provision_type['optionTypes'].nil? && !provision_type['optionTypes'].empty?
+        option_type_list += provision_type['optionTypes'].reject {|it| (it['fieldGroup'] || '').downcase == 'provisiontype'}
+        provision_config_payload = Morpheus::Cli::OptionTypes.prompt(provision_type['optionTypes'].reject {|it| (it['fieldGroup'] || '').downcase != 'provisiontype'}, options[:options], @api_client, api_params, no_prompt, true)
+        payload.deep_merge!(provision_config_payload)
       end
+    }
+
+    if ['openstack', 'huawei', 'opentelekom'].include?(cloud_type['zoneType']['code'])
+      prompt_resource_pool.call
+      prompt_provision_options.call
+      prompt_service_plan.call
+    else
+      prompt_service_plan.call
+      prompt_provision_options.call
+      prompt_resource_pool.call
     end
 
     # remove host selection for kubernetes
@@ -858,7 +877,7 @@ module Morpheus::Cli::ProvisioningHelper
       if provision_type && provision_type["hasNetworks"]
         # prompt for network interfaces (if supported)
         begin
-          network_interfaces = prompt_network_interfaces(cloud_id, provision_type["id"], pool_id, options)
+          network_interfaces = prompt_network_interfaces(cloud_id, provision_type["id"], pool_id, options.merge({:api_params => payload['config']}))
           if !network_interfaces.empty?
             payload['networkInterfaces'] = network_interfaces
           end
@@ -921,7 +940,6 @@ module Morpheus::Cli::ProvisioningHelper
     end
 
     # prompt for option types
-    api_params = {groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_value}
     api_params['config'] = payload['config'] if payload['config']
     api_params['poolId'] = payload['config']['resourcePoolId'] if payload['config'] && payload['config']['resourcePoolId']
 
@@ -935,10 +953,21 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
-    instance_config_payload = Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, api_params)
-    payload.deep_merge!(instance_config_payload)
+    option_type_list += [
+      {'fieldName' => 'userGroup.id', 'fieldLabel' => 'User Group', 'fieldGroup' => 'User Config', 'type' => 'select', 'optionSource' => 'userGroups', 'displayOrder' => 0, 'fieldContext' => 'instance'},
+      {'fieldName' => 'hostName', 'fieldLabel' => 'Hostname', 'fieldGroup' => 'Advanced', 'type' => 'string', 'displayOrder' => 1},
+      {'fieldName' => 'networkDomain.id', 'fieldLabel' => 'Domain', 'fieldGroup' => 'Advanced', 'type' => 'select', 'optionSource' => 'networkDomains', 'displayOrder' => 2, 'fieldContext' => 'instance'},
+      {'fieldName' => 'timezone', 'fieldLabel' => 'Time Zone', 'fieldGroup' => 'Advanced', 'type' => 'select', 'optionSource' => 'timezones', 'displayOrder' => 3, 'fieldContext' => 'config'}
+    ]
 
-    ## Network Options
+    if instance_type['hasAutoScale']
+      option_type_list += [
+        {'fieldName' => 'layoutSize', 'fieldLabel' => 'Scale Factor', 'fieldGroup' => 'Advanced', 'type' => 'number', 'defaultValue' => 1, 'displayOrder' => 0},
+      ]
+    end
+
+    instance_config_payload = Morpheus::Cli::OptionTypes.prompt(option_type_list.reject {|ot| ot['type'] == 'exposedPorts'}, options[:options], @api_client, api_params, no_prompt, true)
+    payload.deep_merge!(instance_config_payload)
 
     # prompt for exposed ports
     if payload['ports'].nil?
@@ -950,10 +979,6 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
-    ## Advanced Options
-
-    # scale factor
-
     # prompt for environment variables
     evars = prompt_evars(options)
     if !evars.empty?
@@ -1327,13 +1352,9 @@ module Morpheus::Cli::ProvisioningHelper
 
           field_context = "dataVolume#{volume_index}"
 
-          if no_prompt
-            volume_action = 'keep'
-          else
-            action_options = [{'name' => 'Modify', 'value' => 'modify'}, {'name' => 'Keep', 'value' => 'keep'}, {'name' => 'Delete', 'value' => 'delete'}]
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'action', 'type' => 'select', 'fieldLabel' => "Modify/Keep/Delete volume '#{current_volume['name']}'", 'selectOptions' => action_options, 'required' => true, 'description' => 'Modify, Keep or Delete existing data volume?'}], options[:options])
-            volume_action = v_prompt[field_context]['action']
-          end
+          action_options = [{'name' => 'Modify', 'value' => 'modify'}, {'name' => 'Keep', 'value' => 'keep'}, {'name' => 'Delete', 'value' => 'delete'}]
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'action', 'type' => 'select', 'fieldLabel' => "Modify/Keep/Delete volume '#{current_volume['name']}'", 'selectOptions' => action_options, 'required' => true, 'defaultValue' => 'keep', 'description' => 'Modify, Keep or Delete existing data volume?'}], options[:options])
+          volume_action = v_prompt[field_context]['action']
 
           if volume_action == 'delete'
             # deleted volume is just excluded from post params
@@ -1490,10 +1511,11 @@ module Morpheus::Cli::ProvisioningHelper
     #puts "Configure Networks:"
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     network_interfaces = []
-    api_params = {zoneId: zone_id, provisionTypeId: provision_type_id}
+    api_params = {zoneId: zone_id, provisionTypeId: provision_type_id}.merge(options[:api_params] || {})
     if pool_id.to_s =~ /\A\d{1,}\Z/
       api_params[:poolId] = pool_id 
     end
+
     zone_network_options_json = api_client.options.options_for_source('zoneNetworkOptions', api_params)
     # puts "zoneNetworkOptions JSON"
     # puts JSON.pretty_generate(zone_network_options_json)
@@ -1575,7 +1597,7 @@ module Morpheus::Cli::ProvisioningHelper
       default_network_value = (network_options.find {|n| n['value'] == default_network_id} || {})['name']
 
       # choose network
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkId', 'type' => 'select', 'fieldLabel' => "Network", 'selectOptions' => network_options, 'required' => true, 'skipSingleOption' => false, 'description' => 'Choose a network for this interface.', 'defaultValue' => default_network_value}], options[:options])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkId', 'type' => 'select', 'fieldLabel' => "Network", 'selectOptions' => network_options, 'required' => true, 'skipSingleOption' => false, 'description' => 'Choose a network for this interface.', 'defaultValue' => default_network_value}], options[:options], api_client, {}, no_prompt, true)
       network_interface['network'] = {}
       network_interface['network']['id'] = v_prompt[field_context]['networkId'].to_s
       selected_network = networks.find {|it| it["id"].to_s == network_interface['network']['id'] }