morpheus-cli 5.3.2.3 → 5.4.1

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

@@ -6,6 +6,7 @@ require 'ostruct'
 require 'io/console'
 require 'morpheus/logging'
 require 'fileutils'
+require 'filesize'
 
 module Morpheus::Cli::PrintHelper
 
@@ -201,7 +202,7 @@ module Morpheus::Cli::PrintHelper
     if options[:outfile]
       print_result = print_to_file(output, options[:outfile], options[:overwrite])
       # with_stdout_to_file(options[:outfile], options[:overwrite]) { print output }
-      print "#{cyan}Wrote output to file #{options[:outfile]} (#{format_bytes File.size(options[:outfile])})\n" unless options[:quiet]
+      print "#{cyan}Wrote output to file #{options[:outfile]} (#{format_bytes(File.size(options[:outfile]))})\n" unless options[:quiet]
       #return print_result
       return
     end
@@ -219,6 +220,14 @@ module Morpheus::Cli::PrintHelper
     return
   end
 
+  def print_system_command_dry_run(cmd, options={})
+    print "\n"
+    print "#{cyan}#{bold}#{dark}SYSTEM COMMAND#{reset}\n"
+    print cmd
+    print reset, "\n"
+    return
+  end
+
   def format_api_request(http_method, url, headers, payload=nil, options={})
     out = ""
     # out << "\n"
@@ -384,33 +393,57 @@ module Morpheus::Cli::PrintHelper
     if json_response.nil? || json_response.empty?
       return ""
     end
-    
-    # options = OpenStruct.new(options) # laff, let's do this instead
     color = options.key?(:color) ? options[:color] : cyan
     label = options[:label]
-    n_label = options[:n_label]
-    # label = n_label if !label && n_label
+    n_label = options[:n_label] || (label ? label.to_s.pluralize : nil)
     message = options[:message] || "Viewing %{start_index}-%{end_index} of %{total} %{label}"
     blank_message = options[:blank_message] || nil # "No %{label} found"
 
-    # support lazy passing of common json_response {"meta": {"size": {25}, "total": 56} }
-    # otherwise use the root values given
-    meta = OpenStruct.new(json_response)
-    if meta.meta
-      meta = OpenStruct.new(meta.meta)
-    end
-    offset, size, total = meta.offset.to_i, meta.size.to_i, meta.total.to_i
-    #objects = meta.objects || options[:objects_key] ? json_response[options[:objects_key]] : nil
-    #objects ||= meta.instances || meta.servers || meta.users || meta.roles
-    #size = objects.size if objects && size == 0
-    if total == 0
+    # support lazy passing of common list json_response {"meta": {"size": 25, "total": 56} }
+    # priority is:
+    # 1. "meta" that api response contains for list endpoints
+    # 2. "total" and "size" values if passed explicitely by the cli (pretty sure symbols are no longer used)
+    # 3. examine the first array found in the response
+    meta = nil
+    records = nil
+    # assume records is the first array in the response
+    records_key = json_response.keys.find { |k| json_response[k].is_a?(Array) }
+    if records_key
+      records = json_response[records_key]
+      meta = {'offset' => 0, 'size' => records.size, 'total' => records.size}
+    end
+    if json_response[:meta] || json_response["meta"]
+      meta = json_response[:meta] || json_response["meta"]
+    elsif json_response.key?('size') || json_response.key?('total')
+      meta = json_response
+    elsif json_response.key?(:size) || json_response.key?(:total)
+      meta = {'size' => json_response[:size], 'total' => json_response[:total], 'offset' => json_response[:offset]}
+    elsif records
+      # just use the first key in the response
+      meta = {'size' => records.size, 'total' => records.size}
+    end
+    # did not find pagination meta info?
+    if meta.nil?
+      return ""
+    end
+    # api should not need to return the size, just use records.size
+    if meta["size"].nil? && records
+      meta["size"] = records.size
+    end
+    offset = meta['offset'].to_i
+    size = meta['size'].to_i
+    total = meta['total'].to_i
+    # perhaps no total count returned, let total be equal to size of list
+    if total == 0 && size > 0
       total = size
     end
+    # plural label?
     if total != 1
-      label = n_label || label
+      label = n_label
     end
     out_str = ""
-    string_key_values = {start_index: format_number(offset + 1), end_index: format_number(offset + size), total: format_number(total), size: format_number(size), offset: format_number(offset), label: label}
+    string_key_values = {start_index: format_number(offset + 1), end_index: format_number(offset + size), 
+      total: format_number(total), size: format_number(size), offset: format_number(offset), label: label}
     if size > 0
       if message
         out_str << message % string_key_values

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

@@ -1,8 +1,7 @@
 require 'morpheus/cli/mixins/print_helper'
 
 # Mixin for Morpheus::Cli command classes
-# Provides common methods for fetching and printing accounts, roles, and users.
-# The including class must establish @accounts_interface, @roles_interface, @users_interface
+# Provides common methods for viewing process history
 module Morpheus::Cli::ProcessesHelper
 
   def self.included(klass)

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

@@ -57,9 +57,9 @@ module Morpheus::Cli::ProvisioningHelper
     @api_client.accounts
   end
 
-  def get_available_groups(refresh=false)
+  def get_available_groups(params = {}, refresh=false)
     if !@available_groups || refresh
-      option_results = options_interface.options_for_source('groups',{})
+      option_results = options_interface.options_for_source('groups', params)
       @available_groups = option_results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
       }
@@ -68,9 +68,9 @@ module Morpheus::Cli::ProvisioningHelper
     return @available_groups
   end
 
-  def get_available_clouds(group_id, refresh=false)
+  def get_available_clouds(group_id, params = {}, refresh=false)
     if !group_id
-      option_results = options_interface.options_for_source('clouds', {'default' => 'false'})
+      option_results = options_interface.options_for_source('clouds', params.merge({'default' => 'false'}))
       return option_results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"], "zoneTypeId" => it["zoneTypeId"]}
       }
@@ -80,7 +80,7 @@ module Morpheus::Cli::ProvisioningHelper
       return []
     end
     if !group["clouds"] || refresh
-      option_results = options_interface.options_for_source('clouds', {groupId: group_id})
+      option_results = options_interface.options_for_source('clouds', params.merge({groupId: group_id}))
       group["clouds"] = option_results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"], "zoneTypeId" => it["zoneTypeId"]}
       }
@@ -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/
@@ -584,7 +584,7 @@ module Morpheus::Cli::ProvisioningHelper
     if options[:description]
       options[:options]['description'] = options[:description]
     end
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_description]}], options[:options])
     payload['instance']['description'] = v_prompt['description'] if !v_prompt['description'].empty?
 
     # Environment
@@ -593,14 +593,14 @@ module Morpheus::Cli::ProvisioningHelper
     elsif options[:options]['instanceContext'] && !options[:options]['environment']
       options[:options]['environment'] = options[:options]['instanceContext']
     end
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments()}], options[:options])
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments(), 'defaultValue' => options[:default_environment]}], options[:options])
     payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
     # Labels (used to be called tags)
     if options[:labels]
       payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
     else
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false}], options[:options])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_labels]}], options[:options])
       payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
     end
 
@@ -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,9 +940,9 @@ 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']
+    api_params['resourcePoolId'] = api_params['poolId']
 
     # set option type defaults from config
     if options[:default_config]
@@ -935,10 +954,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 +980,6 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
-    ## Advanced Options
-
-    # scale factor
-
     # prompt for environment variables
     evars = prompt_evars(options)
     if !evars.empty?
@@ -961,20 +987,28 @@ module Morpheus::Cli::ProvisioningHelper
     end
 
     # metadata tags
-    if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
-      options[:metadata] = options[:options]['metadata']
+    # metadata_tag_key = 'metadata'
+    metadata_tag_key = 'tags'
+    if !options[:metadata]
+      if options[:options]['metadata'].is_a?(Array)
+        options[:metadata] = options[:options]['metadata']
+      end
+      if options[:options]['tags'].is_a?(Array)
+        options[:metadata] = options[:options]['tags']
+      end
     end
     if options[:metadata]
+      metadata = []
       if options[:metadata] == "[]" || options[:metadata] == "null"
-        payload['metadata'] = []
+        metadata = []
       elsif options[:metadata].is_a?(Array)
-        payload['metadata'] = options[:metadata]
+        metadata = options[:metadata]
       else
         # parse string into format name:value, name:value
         # merge IDs from current metadata
         # todo: should allow quoted semicolons..
-        metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
-        metadata_list = metadata_list.collect do |it|
+        metadata = options[:metadata].split(",").select {|it| !it.to_s.empty? }
+        metadata = metadata.collect do |it|
           metadata_pair = it.split(":")
           if metadata_pair.size < 2 && it.include?("=")
             metadata_pair = it.split("=")
@@ -984,13 +1018,13 @@ module Morpheus::Cli::ProvisioningHelper
           row['value'] = metadata_pair[1].to_s.strip
           row
         end
-        payload['metadata'] = metadata_list
       end
+      payload[metadata_tag_key] = metadata
     else
       # prompt for metadata tags
       metadata = prompt_metadata(options)
       if !metadata.empty?
-        payload['metadata'] = metadata
+        payload[metadata_tag_key] = metadata
       end
     end
 
@@ -1486,10 +1520,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)
@@ -1571,7 +1606,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'] }
@@ -1711,6 +1746,19 @@ module Morpheus::Cli::ProvisioningHelper
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     metadata_array = []
     metadata_index = 0
+    # Keep Current Tags (foo:bar,hello:world)
+    # this is used by clone()
+    if options[:current_tags] && !options[:current_tags].empty?
+      current_tags_string = options[:current_tags].collect { |tag| tag['name'].to_s + '=' + tag['value'].to_s }.join(', ')
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'keepExistingTags', 'type' => 'checkbox', 'fieldLabel' => "Keep existing metadata tags (#{current_tags_string}) ?", 'required' => true, 'description' => 'Whether or not to keep existing metadata tags', 'defaultValue' => true}], options[:options])
+      if ['on','true','1',''].include?(v_prompt['keepExistingTags'].to_s.downcase)
+        options[:current_tags].each do |tag|
+          current_tag = tag.clone
+          current_tag.delete('id')
+          metadata_array << current_tag
+        end
+      end
+    end
     has_another_metadata = options[:options] && options[:options]["metadata#{metadata_index}"]
     add_another_metadata = has_another_metadata || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add a metadata tag?", {default: false}))
     while add_another_metadata do
@@ -2046,6 +2094,15 @@ module Morpheus::Cli::ProvisioningHelper
     permissions
   end
 
+  def prompt_permissions_v2(options, excludes = [])
+    perms = prompt_permissions(options, excludes)
+    rtn = {}
+
+    rtn['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil?
+    rtn['tenants'] = ((perms['tenantPermissions'] || {})['accounts'] || []).collect {|it| {'id' => it}}
+    rtn
+  end
+
   def print_permissions(permissions, excludes = [])
     if permissions.nil?
       print_h2 "Permissions"