morpheus-cli 2.9.3.1 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ad606bfeda37fd17e920c117fb7c137b9a5311
-  data.tar.gz: 53134a57f0230f128375239d942bfcdd5ebc0191
+  metadata.gz: 7efa35bc257cb762e29ce35995cc2291e5d21e54
+  data.tar.gz: ca41c50847ed8ee3a5e50d7e75c773332b1b64da
 SHA512:
-  metadata.gz: 57818d33486bcfe687f44428fc395c6b2c8258e2bd4a1727ef35fad6d5e3aa206e602829c9b0f9668638892ebfe2154ed9232cb7ca2dc1c9d6ef4fdf8334404c
-  data.tar.gz: 279d0d6179234c85b176678a7a5e2de383b127c4ec1bc9e16800dbf8010ee9aa66fb3ddbffba2030a78b9ab0b1ce3c2191642ce6b3c2d2f26c87df4cdb04b53e
+  metadata.gz: ff52228f42aca0f2caa7727e9a14f9e1004c3878d62fa5a121efff7f7b240141b9914c64ebdc060828079df1fb2fcbfcfbbbfc5fdb89568b2b4263f4302e372a
+  data.tar.gz: 37c3835e75478fc8b595e86486b237941798d66806aea5c8d607803cc5f49aad1715b364aa607f46a9e568ec9b8e9e1ac65d7bd70cfb8ab4407b4c78f664039b

data/lib/morpheus/api/instance_types_interface.rb

@@ -26,26 +26,4 @@ class Morpheus::InstanceTypesInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
-	def service_plans(layout_id, name=nil)
-		url = "#{@base_url}/api/instance-types/service-plans/#{layout_id}"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-		if !name.nil?
-			headers[:params][:name] = name
-		end
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 30, headers: headers, verify_ssl: false)
-		JSON.parse(response.to_s)
-	end
-
-	def service_plan_options(service_plan_id, params)
-		url = "#{@base_url}/api/instance-types/service-plans/#{service_plan_id}/options"
-		headers = { params: params, authorization: "Bearer #{@access_token}" }
-
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                            timeout: 30, headers: headers, verify_ssl: false)
-		JSON.parse(response.to_s)
-	end
-
-
 end

data/lib/morpheus/api/instances_interface.rb

@@ -155,10 +155,17 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
 		url = "#{@base_url}/api/instances/#{id}/security-groups"
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
 		payload = options
-		puts "payload #{payload}"
 		response = Morpheus::RestClient.execute(method: :post, url: url,
                             timeout: 30, headers: headers,verify_ssl: false, payload: payload.to_json)
 		JSON.parse(response.to_s)
 	end
 	
+	def service_plans(params)
+		url = "#{@base_url}/api/instances/service-plans"
+		headers = { params: params, authorization: "Bearer #{@access_token}" }
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 30, headers: headers, verify_ssl: false)
+		JSON.parse(response.to_s)
+	end
+
 end

data/lib/morpheus/api/servers_interface.rb

@@ -107,4 +107,13 @@ class Morpheus::ServersInterface < Morpheus::APIClient
                             timeout: 30, headers: headers, verify_ssl:false)
 		JSON.parse(response.to_s)
 	end
+
+	def service_plans(params)
+		url = "#{@base_url}/api/servers/service-plans"
+		headers = { params: params, authorization: "Bearer #{@access_token}" }
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 30, headers: headers, verify_ssl: false)
+		JSON.parse(response.to_s)
+	end
+
 end

data/lib/morpheus/cli/app_templates.rb

@@ -22,6 +22,7 @@ class Morpheus::Cli::AppTemplates
 		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
 		@app_templates_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).app_templates
     @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
+    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
     @instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
     @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
 	end
@@ -352,40 +353,17 @@ class Morpheus::Cli::AppTemplates
       exit 1
     end
 
-    groupId = app_template['config']['siteId']
-    # groupId = nil
-    # if !options[:group].nil?
-    #   group = find_group_by_name(options[:group])
-    #   if !group.nil?
-    #     groupId = group
-    #   end
-    # else
-    #   groupId = @active_groups[@appliance_name.to_sym]  
-    # end
+    group_id = app_template['config']['siteId']
 
-    if groupId.nil?
+    if group_id.nil?
       #puts "Group not found or specified! \n #{optparse}"
       print_red_alert("Group not found or specified for this template!")
       puts "#{optparse}"
       exit 1
     end
 
-    cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'optionSource' => 'clouds', 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: groupId})
-    cloud = cloud_prompt['cloud']
-
-    # if options[:cloud].nil?
-    #   #puts "Cloud not specified! \n #{optparse}"
-    #   print_red_alert("Cloud not specified!")
-    #   puts "#{optparse}"
-    #   exit 1
-    # end
-    # cloud = find_cloud_by_name(groupId,options[:cloud])
-    # if cloud.nil?
-    #   #puts "Cloud not found! \n #{optparse}"
-    #   #print_red_alert("Cloud not found!")
-    #   puts "#{optparse}"
-    #   exit 1
-    # end
+    cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'optionSource' => 'clouds', 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group_id})
+    cloud_id = cloud_prompt['cloud']
 
 
     instance_option_types = [{'fieldName' => 'name', 'fieldLabel' => 'Instance Name', 'type' => 'text'}]
@@ -395,11 +373,11 @@ class Morpheus::Cli::AppTemplates
     # copied from instances command, this payload isn't used
     payload = {
       :servicePlan => nil,
-      zoneId: cloud,
+      :zoneId => cloud_id,
       :instance => {
         :name => instance_name,
         :site => {
-          :id => groupId
+          :id => group_id
         },
         :instanceType => {
           :code => instance_type_code
@@ -407,22 +385,26 @@ class Morpheus::Cli::AppTemplates
       }
     }
 
-    version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],@api_client,{groupId: groupId, cloudId: cloud, instanceTypeId: instance_type['id']})
-    layout_prompt = 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.'}],options[:options],@api_client,{groupId: groupId, cloudId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+    version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
+    layout_prompt = 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.'}],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
     layout_id = layout_prompt['layout']
-    plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'optionSource' => 'instanceServicePlans', 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options],@api_client,{groupId: groupId, zoneId: cloud, instanceTypeId: instance_type['id'], layoutId: layout_id, version: version_prompt['version']})
-    payload[:servicePlan] = plan_prompt['servicePlan']
-
     layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'].to_i == layout_id.to_i}
-    instance_type['instanceTypeLayouts'].sort! { |x,y| y['sortOrder'] <=> x['sortOrder'] }
-    
     payload[:instance][:layout] = {id: layout['id']}
 
+    # prompt for service plan
+    service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, layoutId: layout_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' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
+    service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['servicePlan'].to_i }
+    payload[:servicePlan] = service_plan["id"]
+    
+
     type_payload = {}
     if !layout['optionTypes'].nil? && !layout['optionTypes'].empty?
-      type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+      type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
     elsif !instance_type['optionTypes'].nil? && !instance_type['optionTypes'].empty?
-      type_payload = Morpheus::Cli::OptionTypes.prompt(instance_type['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+      type_payload = Morpheus::Cli::OptionTypes.prompt(instance_type['optionTypes'],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
     end
     if !type_payload['config'].nil?
       payload.merge!(type_payload['config'])
@@ -431,7 +413,7 @@ class Morpheus::Cli::AppTemplates
     provision_payload = {}
     if !layout['provisionType'].nil? && !layout['provisionType']['optionTypes'].nil? && !layout['provisionType']['optionTypes'].empty?
       puts "Checking for option Types"
-      provision_payload = Morpheus::Cli::OptionTypes.prompt(layout['provisionType']['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+      provision_payload = Morpheus::Cli::OptionTypes.prompt(layout['provisionType']['optionTypes'],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
     end
 
     if !provision_payload.nil? && !provision_payload['config'].nil?
@@ -491,8 +473,8 @@ class Morpheus::Cli::AppTemplates
         # "volumes.storageType": nil,
 
         "version"=>version_prompt['version'],
-        "siteId"=>groupId.to_s,
-        "zoneId"=>cloud.to_s
+        "siteId"=>group_id.to_s,
+        "zoneId"=>cloud_id.to_s
       }, 
       "grabbable"=>true, "group"=>"nodes", "locked"=>false, 
       #"position"=>{"x"=>-79.83254449505226, "y"=>458.33806818181824}, 
@@ -845,8 +827,8 @@ private
     return group_results['groups'][0]
   end
 
-  def find_cloud_by_name(groupId,name)
-    option_results = @options_interface.options_for_source('clouds',{groupId: groupId})
+  def find_cloud_by_name(group_id, name)
+    option_results = @options_interface.options_for_source('clouds',{groupId: group_id})
     match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
     if match.nil?
       print_red_alert "Cloud not found by name #{name}"

data/lib/morpheus/cli/apps.rb

@@ -27,12 +27,13 @@ class Morpheus::Cli::Apps
 	end
 
 	def handle(args) 
-		usage = "Usage: morpheus apps [list,add,remove,stop,start,restart,resize,upgrade,clone,envs,setenv,delenv,firewall_disable,firewall_enable,security_groups,apply_security_groups] [name]"
+		usage = "Usage: morpheus apps [list,remove,stop,start,restart,resize,upgrade,clone,envs,setenv,delenv,firewall_disable,firewall_enable,security_groups,apply_security_groups] [name]"
 		case args[0]
 			when 'list'
 				list(args[1..-1])
-			when 'add'
-				add(args[1..-1])
+			# JD: this has never worked, it is time to implement it!
+			# when 'add'
+			# 	add(args[1..-1])
 			when 'remove'
 				remove(args[1..-1])
 			when 'stop'
@@ -101,6 +102,7 @@ class Morpheus::Cli::Apps
 			}
 		}
 
+		# JD: this is old and busted.. appTypeLayouts is not returned..
 		instance_type['appTypeLayouts'].sort! { |x,y| y['sortOrder'] <=> x['sortOrder'] }
 		puts "Configurations: "
 		instance_type['appTypeLayouts'].each_with_index do |layout, index|

data/lib/morpheus/cli/hosts.rb

@@ -3,11 +3,13 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/option_types'
 require 'json'
 
 class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::ProvisioningHelper
   
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -165,7 +167,7 @@ class Morpheus::Cli::Hosts
 			opts.on( '-t', '--type TYPE', "Server Type" ) do |server_type|
 				options[:server_type] = server_type
 			end
-			build_common_options(opts, options, [:options, :json, :remote])
+			build_common_options(opts, options, [:options, :json, :dry_run, :remote])
 		end
 		if args.count < 2
 			puts "\n#{optparse}\n\n"
@@ -180,7 +182,7 @@ class Morpheus::Cli::Hosts
 		zone=nil
 		if !options[:zone].nil?
 			zone = find_zone_by_name(nil, options[:zone])
-			options[:params][:zoneId] = zone['id']
+			options[:params][:zoneId] = zone['id'] if zone
 		end
 
 		if zone.nil?
@@ -190,7 +192,7 @@ class Morpheus::Cli::Hosts
 			zone_type = cloud_type_for_id(zone['zoneTypeId'])
 		end
 
-		cloud_server_types = zone_type['serverTypes'].select{|b| b['creatable'] == true }
+		cloud_server_types = zone_type['serverTypes'].select{|b| b['creatable'] == true }.sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
 		if options[:server_type]
 			server_type_code = options[:server_type]
 		else
@@ -206,11 +208,75 @@ class Morpheus::Cli::Hosts
 			exit 1
 		end
 
-		params = Morpheus::Cli::OptionTypes.prompt(server_type['optionTypes'],options[:options],@api_client, options[:params])
+		payload = {}
+		
+		# prompt for service plan
+		service_plans_json = @servers_interface.service_plans({zoneId: zone['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' => 'servicePlan', '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['servicePlan'].to_i }
+		# payload[:servicePlan] = plan_prompt['servicePlan']
+
+		# prompt for volumes
+		volumes = prompt_volumes(service_plan, options, @api_client, {})
+		if !volumes.empty?
+			payload[:volumes] = volumes
+		end
+
+		# prompt for network interfaces (if supported)
+		if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
+			begin
+				network_interfaces = prompt_network_interfaces(zone['id'], server_type["provisionType"]["id"], options, @api_client)
+				if !network_interfaces.empty?
+					payload[:networkInterfaces] = network_interfaces
+				end
+			rescue RestClient::Exception => e
+				print_yellow_warning "Unable to load network options. Proceeding..."
+				print_rest_exception(e, options) if Morpheus::Logging.print_stacktrace?
+			end
+		end
+
+		server_type_option_types = server_type['optionTypes']
+		# remove volume options if volumes were configured
+		if !payload[:volumes].empty?
+			server_type_option_types = reject_volume_option_types(server_type_option_types)
+		end
+		# remove networkId option if networks were configured above
+		if !payload[:networkInterfaces].empty?
+			server_type_option_types = reject_networking_option_types(server_type_option_types)
+		end
+		# remove cpu and memory option types, which now come from the plan
+		server_type_option_types = reject_service_plan_option_types(server_type_option_types)
+
+		params = Morpheus::Cli::OptionTypes.prompt(server_type_option_types,options[:options],@api_client, options[:params])
 		begin
 			params['server'] = params['server'] || {}
-			server_payload = {server: {name: name, zone: {id: zone['id']}, computeServerType: [id: server_type['id']]}.merge(params['server']), config: params['config'], network: params['network']}
-			json_response = @servers_interface.create(server_payload)
+			payload = payload.merge({
+				server: {
+					name: name, 
+					zone: {id: zone['id']}, 
+					computeServerType: {id: server_type['id']},
+					plan: {id: service_plan["id"]}
+				}.merge(params['server'])
+			})
+			payload[:network] = params['network'] if params['network']
+			payload[:config] = params['config'] if params['config']
+			if options[:dry_run]
+				print "\n" ,cyan, bold, "DRY RUN\n","==================", "\n\n", reset
+				print cyan
+				print "Request: ", "\n"
+				print reset
+				print "POST #{@appliance_url}/api/servers", "\n\n"
+				print cyan
+				print "JSON: ", "\n"
+				print reset
+				print JSON.pretty_generate(payload)
+				print "\n"
+				print reset
+				return
+			end
+			json_response = @servers_interface.create(payload)
 			if options[:json]
 				print JSON.pretty_generate(json_response)
 				print "\n"
@@ -526,8 +592,8 @@ private
 		return group_results['groups'][0]
 	end
 
-	def find_zone_by_name(groupId, name)
-		zone_results = @clouds_interface.get({groupId: groupId, name: name})
+	def find_zone_by_name(group_id, name)
+		zone_results = @clouds_interface.get({groupId: group_id, name: name})
 		if zone_results['zones'].empty?
 			puts "Zone not found by name #{name}"
 			return nil

data/lib/morpheus/cli/instances.rb

@@ -124,17 +124,14 @@ class Morpheus::Cli::Instances
 		if instance_type.nil?
 			exit 1
 		end
-		groupId = nil
+		group_id = nil
 		if !options[:group].nil?
-			group = find_group_by_name(options[:group])
-			if !group.nil?
-				groupId = group
-			end
+			group_id = find_group_by_name(options[:group])
 		else
-			groupId = @active_groups[@appliance_name.to_sym]	
+			group_id = @active_groups[@appliance_name.to_sym]	
 		end
 
-		if groupId.nil?
+		if group_id.nil?
 			puts "Group not found or specified! \n #{optparse}"
 			exit 1
 		end
@@ -143,19 +140,19 @@ class Morpheus::Cli::Instances
 			puts "Cloud not specified! \n #{optparse}"
 			exit 1
 		end
-		cloud = find_cloud_by_name(groupId,options[:cloud])
-		if cloud.nil?
+		cloud_id = find_cloud_by_name(group_id, options[:cloud])
+		if cloud_id.nil?
 			puts "Cloud not found! \n #{optparse}"
 			exit 1
 		end
 
 		payload = {
 			:servicePlan => nil,
-			zoneId: cloud,
+			:zoneId => cloud_id,
 			:instance => {
 				:name => instance_name,
 				:site => {
-					:id => groupId
+					:id => group_id
 				},
 				:instanceType => {
 					:code => instance_type_code
@@ -163,48 +160,45 @@ class Morpheus::Cli::Instances
 			}
 		}
 
-		version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],@api_client,{groupId: groupId, cloudId: cloud, instanceTypeId: instance_type['id']})
-		layout_prompt = 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.'}],options[:options],@api_client,{groupId: groupId, cloudId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+		version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select which version of the instance type to be provisioned.'}],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
+		layout_prompt = 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.'}],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		layout_id = layout_prompt['layout']
-		plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'optionSource' => 'instanceServicePlans', 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options],@api_client,{groupId: groupId, zoneId: cloud, instanceTypeId: instance_type['id'], layoutId: layout_id, version: version_prompt['version']})
-		payload[:servicePlan] = plan_prompt['servicePlan']
-
-		layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'].to_i == layout_id.to_i}
-		instance_type['instanceTypeLayouts'].sort! { |x,y| y['sortOrder'] <=> x['sortOrder'] }
-		
+		layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'] == layout_id.to_i}
 		payload[:instance][:layout] = {id: layout['id']}
 
-		
-		begin
-			service_plan_options_json = @instance_types_interface.service_plan_options(plan_prompt['servicePlan'], {cloudId: cloud, zoneId: cloud, layoutId: layout_id})
-			
-			# puts ""
-			# print JSON.pretty_generate(service_plan_options_json)
-			
-			plan_options = service_plan_options_json['plan']
-			volumes = prompt_instance_volumes(plan_options, options, @api_client, {})
+		# prompt for service plan
+		service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, layoutId: layout_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' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
+		service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['servicePlan'].to_i }
+		payload[:servicePlan] = service_plan["id"]
 
-			# puts "VOLUMES:"
-			# print JSON.pretty_generate(volumes)
+		# prompt for volumes
+		volumes = prompt_volumes(service_plan, options, @api_client, {})
+		if !volumes.empty?
+			payload[:volumes] = volumes
+		end
 
-			if !volumes.empty?
-				payload[:volumes] = volumes
+		if layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasNetworks"]
+			# prompt for network interfaces (if supported)
+			begin
+				network_interfaces = prompt_network_interfaces(cloud_id, layout["provisionType"]["id"], options, @api_client)
+				if !network_interfaces.empty?
+					payload[:networkInterfaces] = network_interfaces
+				end
+			rescue RestClient::Exception => e
+				print_yellow_warning "Unable to load network options. Proceeding..."
+				print_rest_exception(e, options) if Morpheus::Logging.print_stacktrace?
 			end
-
-			# puts "\nexiting early...\n"
-			# exit 1
-
-		rescue RestClient::Exception => e
-			print_red_alert "Unable to load options for selected plan."
-			print_rest_exception(e, options)
-			exit 1
 		end
-
+		
+		
 		type_payload = {}
 		if !layout['optionTypes'].nil? && !layout['optionTypes'].empty?
-			type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+			type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		elsif !instance_type['optionTypes'].nil? && !instance_type['optionTypes'].empty?
-			type_payload = Morpheus::Cli::OptionTypes.prompt(instance_type['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+			type_payload = Morpheus::Cli::OptionTypes.prompt(instance_type['optionTypes'],options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		end
 		if !type_payload['config'].nil?
 			payload.merge!(type_payload['config'])
@@ -212,8 +206,16 @@ class Morpheus::Cli::Instances
 
 		provision_payload = {}
 		if !layout['provisionType'].nil? && !layout['provisionType']['optionTypes'].nil? && !layout['provisionType']['optionTypes'].empty?
-			#puts "Checking for option Types"
-			provision_payload = Morpheus::Cli::OptionTypes.prompt(layout['provisionType']['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+			instance_type_option_types = layout['provisionType']['optionTypes']
+			# remove volume options if volumes were configured
+			if !payload[:volumes].empty?
+				instance_type_option_types = reject_volume_option_types(instance_type_option_types)
+			end
+			# remove networkId option if networks were configured above
+			if !payload[:networkInterfaces].empty?
+				instance_type_option_types = reject_networking_option_types(instance_type_option_types)
+			end
+			provision_payload = Morpheus::Cli::OptionTypes.prompt(instance_type_option_types,options[:options],@api_client,{groupId: group_id, cloudId: cloud_id, zoneId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		end
 
 		if !provision_payload.nil? && !provision_payload['config'].nil?
@@ -660,46 +662,28 @@ class Morpheus::Cli::Instances
 
 			puts "\nDue to limitations by most Guest Operating Systems, Disk sizes can only be expanded and not reduced.\nIf a smaller plan is selected, memory and CPU (if relevant) will be reduced but storage will not.\n\n"
 
-
-			#plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'optionSource' => 'instanceServicePlans', 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options],@api_client,{groupId: groupId, zoneId: cloud, instanceTypeId: instance_type['id'], layoutId: layout_id, version: version_prompt['version']})
-			available_plans_result = @options_interface.options_for_source('instanceServicePlans',{groupId: group_id, zoneId: cloud_id, instanceTypeId: instance['instanceType']['id'], layoutId: layout_id, version: instance['instanceVersion']})
-			available_plans = available_plans_result['data']
-			available_plans.each do |plan|
+			# prompt for service plan
+			service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, layoutId: layout_id})
+			service_plans = service_plans_json["plans"]
+			service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
+			service_plans_dropdown.each do |plan|
 				if plan['value'] && plan['value'].to_i == plan_id.to_i
 					plan['name'] = "#{plan['name']} (current)"
 				end
 			end
-
-			plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'New Plan', 'selectOptions' => available_plans, 'required' => true, 'description' => 'Choose the new plan for this instance'}],options[:options] )
-			new_plan_id = plan_prompt['servicePlan']
+			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'}],options[:options])
+			service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['servicePlan'].to_i }
+			new_plan_id = service_plan["id"]
+			#payload[:servicePlan] = new_plan_id # ew, this api uses servicePlanId instead
 			payload[:servicePlanId] = new_plan_id
 
 			volumes_response = @instances_interface.volumes(instance['id'])
 			current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
 
-			begin
-				service_plan_options_json = @instance_types_interface.service_plan_options(new_plan_id, {cloudId: cloud_id, zoneId: cloud_id, layoutId: layout_id})
-				
-				# puts ""
-				# print JSON.pretty_generate(service_plan_options_json)
-				
-				plan_options = service_plan_options_json['plan']
-				volumes = prompt_resize_instance_volumes(current_volumes, plan_options, options, @api_client, {})
-
-				# puts "VOLUMES:"
-				# print JSON.pretty_generate(volumes)
-
-				if !volumes.empty?
-					payload[:volumes] = volumes
-				end
-
-				# puts "\nexiting early...\n"
-				# exit 1
-
-			rescue RestClient::Exception => e
-				print_red_alert "Unable to load options for selected plan."
-				print_rest_exception(e, options)
-				exit 1
+			# prompt for volumes
+			volumes = prompt_resize_volumes(current_volumes, service_plan, options, @api_client, {})
+			if !volumes.empty?
+				payload[:volumes] = volumes
 			end
 
 			# only amazon supports this option
@@ -1048,8 +1032,8 @@ private
 		end
 	end
 
-	def find_cloud_by_name(groupId,name)
-		option_results = @options_interface.options_for_source('clouds',{groupId: groupId})
+	def find_cloud_by_name(group_id, name)
+		option_results = @options_interface.options_for_source('clouds',{groupId: group_id})
 		match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
 		if match.nil?
 			return nil

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

@@ -11,6 +11,10 @@ module Morpheus::Cli::PrintHelper
     print red, bold, "\n#{msg}\n\n", reset
   end
 
+  def print_yellow_warning(msg)
+    print yellow, bold, "\n#{msg}\n\n", reset
+  end
+
   def print_green_success(msg)
     print green, bold, "\n#{msg}\n\n", reset
   end

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

@@ -10,7 +10,7 @@ module Morpheus::Cli::ProvisioningHelper
 
   # This recreates the behavior of multi_disk.js
   # returns array of volumes based on service plan options (plan_info)
-  def prompt_instance_volumes(plan_info, options={}, api_client=nil, api_params={})
+  def prompt_volumes(plan_info, options={}, api_client=nil, api_params={})
     #puts "Configure Volumes:"
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
 
@@ -203,7 +203,7 @@ module Morpheus::Cli::ProvisioningHelper
 
   # This recreates the behavior of multi_disk.js
   # returns array of volumes based on service plan options (plan_info)
-  def prompt_resize_instance_volumes(current_volumes, plan_info, options={}, api_client=nil, api_params={})
+  def prompt_resize_volumes(current_volumes, plan_info, options={}, api_client=nil, api_params={})
     #puts "Configure Volumes:"
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
 
@@ -484,4 +484,136 @@ module Morpheus::Cli::ProvisioningHelper
     return volumes
   end
 
+
+  # This recreates the behavior of multi_networks.js
+  # This is used by both `instances add` and `hosts add`
+  # returns array of networkInterfaces based on provision type and cloud settings
+  def prompt_network_interfaces(zone_id, provision_type_id, options={}, api_client=nil)
+    #puts "Configure Networks:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+    
+    network_interfaces = []
+
+    zone_network_options_json = api_client.options.options_for_source('zoneNetworkOptions', {zoneId: zone_id, provisionTypeId: provision_type_id})
+    # puts "zoneNetworkOptions JSON"
+    # puts JSON.pretty_generate(zone_network_options_json)    
+    zone_network_data = zone_network_options_json['data'] || {}
+    networks = zone_network_data['networks']
+    network_interface_types = (zone_network_data['networkTypes'] || []).sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
+    enable_network_type_selection = (zone_network_data['enableNetworkTypeSelection'] == 'on' || zone_network_data['enableNetworkTypeSelection'] == true)
+    has_networks = zone_network_data["hasNetworks"] == true
+    max_networks = zone_network_data["maxNetworks"] ? zone_network_data["maxNetworks"].to_i : nil
+
+    # skip unless provision type supports networks
+    if !has_networks
+      return nil
+    end
+
+    # no networks available, shouldn't happen
+    if networks.empty?
+      return network_interfaces
+    end
+
+    network_options = []
+    networks.each do |opt|
+      if !opt.nil?
+        network_options << {'name' => opt['name'], 'value' => opt['id']}
+      end
+    end
+
+    network_interface_type_options = []
+    network_interface_types.each do |opt|
+      if !opt.nil?
+        network_interface_type_options << {'name' => opt['name'], 'value' => opt['id']}
+      end
+    end
+
+
+    interface_index = 1
+    
+    # has_another_interface = options[:options] && options[:options]["networkInterface"]
+    # add_another_interface = has_another_interface || (!no_prompt)
+    add_another_interface = true
+    
+    while add_another_interface do
+      
+      # if !no_prompt
+      #   if interface_index == 1
+      #     puts "Configure Network Interface"
+      #   else
+      #     puts "Configure Network Interface #{interface_index}"
+      #   end
+      # end
+
+      field_context = interface_index == 1 ? "networkInterface" : "networkInterface#{interface_index}"
+      
+      network_interface = {}
+
+      # 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' => network_interface['networkId']}], options[:options])
+      network_interface['network'] = {}
+      network_interface['network']['id'] = v_prompt[field_context]['networkId'].to_i
+
+      selected_network = networks.find {|it| it["id"] == network_interface['network']['id'] }
+
+      # choose network interface type
+      if enable_network_type_selection && !network_interface_type_options.empty?
+        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' => network_interface['networkInterfaceTypeId']}], options[:options])
+        network_interface['networkInterfaceTypeId'] = v_prompt[field_context]['networkInterfaceTypeId'].to_i
+      end
+
+      # choose IP unless network has a pool configured
+      if selected_network['pool']
+        puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
+      elsif selected_network['dhcpServer']
+        puts "IP Address: Using DHCP" if !no_prompt
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'ipAddress', 'type' => 'text', 'fieldLabel' => "IP Address", 'required' => true, 'description' => 'Enter an IP for this network interface. x.x.x.x', 'defaultValue' => network_interface['ipAddress']}], options[:options])
+        network_interface['ipAddress'] = v_prompt[field_context]['ipAddress']
+      end
+      
+      network_interfaces << network_interface
+      
+      interface_index += 1
+      has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]
+      add_another_interface = has_another_interface || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another network interface?"))
+      if max_networks && network_interfaces.size >= max_networks
+        add_another_interface = false
+      end
+
+    end
+
+    return network_interfaces
+
+  end
+
+  # reject old volume option types
+  # these will eventually get removed from the associated optionTypes
+  def reject_volume_option_types(option_types)
+    option_types.reject {|opt| 
+        ['osDiskSize', 'osDiskType',
+          'diskSize', 'diskType',
+          'datastoreId', 'storagePodId'
+        ].include?(opt['fieldName'])
+      }
+  end
+
+  # reject old networking option types
+  # these will eventually get removed from the associated optionTypes
+  def reject_networking_option_types(option_types)
+    option_types.reject {|opt| 
+        ['networkId', 'networkType', 'ipAddress', 'netmask', 'gateway', 'nameservers',
+          'vmwareNetworkType', 'vmwareIpAddress', 'vmwareNetmask', 'vmwareGateway', 'vmwareNameservers'
+        ].include?(opt['fieldName'])
+      }
+  end
+
+  # reject old option types that now come from the selected service plan
+  # these will eventually get removed from the associated optionTypes
+  def reject_service_plan_option_types(option_types)
+    option_types.reject {|opt| 
+        ['cpuCount', 'memorySize', 'memory'].include?(opt['fieldName'])
+      }
+  end
+
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.9.3.1"
+    VERSION = "2.9.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 2.9.3.1
+  version: 2.9.4
 platform: ruby
 authors:
 - David Estes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler