morpheus-cli 2.10.0 → 2.10.1

data/lib/morpheus/cli/key_pairs.rb

@@ -9,55 +9,31 @@ require 'json'
 class Morpheus::Cli::KeyPairs
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-  
-  def initialize() 
-    @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+  register_subcommands :list, :get, :add, :update, :remove
+  alias_subcommand :details, :get
+
+  def initialize()
+    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
 
   def connect(opts)
-    @access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
-    if @access_token.empty?
-      print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
-      exit 1
-    end
-    @api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
+    @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
     @key_pairs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).key_pairs
   end
 
   def handle(args)
-    usage = "Usage: morpheus key-pairs [list,add,update,remove] [name]"
-    if args.empty?
-      puts "\n#{usage}\n\n"
-      exit 1
-    end
-
-    case args[0]
-      when 'list'
-        list(args[1..-1])
-      when 'details'
-        details(args[1..-1])
-      when 'add'
-        add(args[1..-1])
-      when 'update'
-        update(args[1..-1])
-      when 'remove'
-        remove(args[1..-1])
-      else
-        puts "\n#{usage}\n\n"
-        exit 127
-    end
+    handle_subcommand(args)
   end
 
   def list(args)
-    usage = "Usage: morpheus key-pairs list [options]"
     options = {}
     params = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = usage
+      opts.banner = subcommand_usage()
       build_common_options(opts, options, [:account, :list, :json])
     end
-    optparse.parse(args)
+    optparse.parse!(args)
     connect(options)
     begin
 
@@ -74,13 +50,23 @@ class Morpheus::Cli::KeyPairs
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Morpheus Key Pairs\n","==================", reset, "\n\n"
+        title = "Morpheus Hosts"
+        subtitles = []
+        if account
+          subtitles << "Account: #{account['name']}".strip
+        end
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        subtitle = subtitles.join(', ')
+        print "\n" ,cyan, bold, title, (subtitle.empty? ? "" : " - #{subtitle}"), "\n", "==================", reset, "\n\n"
         if key_pairs.empty?
           puts yellow,"No key pairs found.",reset
         else
           print_key_pairs_table(key_pairs)
+          print_results_pagination(json_response)
         end
-        print reset,"\n\n"
+        print reset,"\n"
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -88,33 +74,26 @@ class Morpheus::Cli::KeyPairs
     end
   end
 
-  def details(args)
-    usage = "Usage: morpheus key-pairs details [name] [options]"
+  def get(args)
     options = {}
     params = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = usage
+      opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:account, :json])
     end
-    optparse.parse(args)
+    optparse.parse!(args)
 
     if args.count < 1
-      puts "\n#{usage}\n\n"
+      puts optparse
       exit 1
     end
-    name = args[0]
 
     connect(options)
     begin
-    
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      # todo: key_pairs_response = @key_pairs_interface.list(account_id, {name: name})
-      #       there may be response data outside of account that needs to be displayed
-
-      # allow finding by ID since name is not unique!
-      key_pair = ((name.to_s =~ /\A\d{1,}\Z/) ? find_key_pair_by_id(account_id, name) : find_key_pair_by_name(account_id, name) )
+      key_pair = find_key_pair_by_name_or_id(account_id, args[0])
       exit 1 if key_pair.nil?
 
       if options[:json]
@@ -128,7 +107,7 @@ class Morpheus::Cli::KeyPairs
         puts "MD5: #{key_pair['md5']}"
         puts "Date Created: #{format_local_dt(key_pair['dateCreated'])}"
         #puts "Last Updated: #{format_local_dt(key_pair['lastUpdated'])}"
-        print reset,"\n\n"
+        print reset,"\n"
 
         # todo: show public key
 
@@ -142,8 +121,7 @@ class Morpheus::Cli::KeyPairs
   def add(args)
     options = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = "Usage: morpheus key-pairs add [name] [options]"
-
+      opts.banner = subcommand_usage("[name] [options]")
       opts.on('', '--public-key-file FILENAME', "Public Key File" ) do |filename|
         if File.exists?(File.expand_path(filename))
           options['publicKey'] = File.read(File.expand_path(filename))
@@ -178,19 +156,19 @@ class Morpheus::Cli::KeyPairs
         options[:options]['privateKey'] = options['privateKey']
       end
 
-      build_common_options(opts, options, [:account, :options, :json])
+      build_common_options(opts, options, [:account, :options, :json, :dry_run])
     end
-    
-    if args.count < 1
-      puts "\n#{optparse}\n\n"
-      exit 1
+    optparse.parse!(args)
+    # if args.count < 1
+    #   puts optparse
+    #   exit 1
+    # end
+    if args[0]
+      options[:options] ||= {}
+      options[:options]['name'] ||= args[0]
     end
-    optparse.parse(args)
-
     connect(options)
-    
     begin
-
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
@@ -203,12 +181,15 @@ class Morpheus::Cli::KeyPairs
         print_red_alert "privateKey is required"
         exit 1
       end
-      params['name'] = args[0]
+      #params['name'] = args[0]
 
       key_pair_payload = params.select {|k,v| ['name','publicKey', 'privateKey'].include?(k) }
-
-      request_payload = {keyPair: key_pair_payload}
-      json_response = @key_pairs_interface.create(account_id, request_payload)
+      payload = {keyPair: key_pair_payload}
+      if options[:dry_run]
+        print_dry_run @key_pairs_interface.dry.create(account_id, payload)
+        return
+      end
+      json_response = @key_pairs_interface.create(account_id, payload)
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
@@ -222,43 +203,44 @@ class Morpheus::Cli::KeyPairs
   end
 
   def update(args)
-    usage = "Usage: morpheus key-pairs update [name] [options]"
     options = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = usage
-      build_common_options(opts, options, [:account, :options, :json])
+      opts.banner = subcommand_usage("[name] [options]")
+      build_common_options(opts, options, [:account, :options, :json, :dry_run])
     end
-    optparse.parse(args)
+    optparse.parse!(args)
 
     if args.count < 1
-      puts "\n#{usage}\n\n"
+      puts optparse
       exit 1
     end
-    name = args[0]
 
     connect(options)
-    
     begin
 
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      key_pair = ((name.to_s =~ /\A\d{1,}\Z/) ? find_key_pair_by_id(account_id, name) : find_key_pair_by_name(account_id, name) )
+      key_pair = find_key_pair_by_name_or_id(account_id, args[0])
       exit 1 if key_pair.nil?
 
       #params = Morpheus::Cli::OptionTypes.prompt(update_key_pair_option_types, options[:options], @api_client, options[:params])
       params = options[:options] || {}
 
       if params.empty?
-        puts "\n#{usage}\n\n"
+        puts optparse
         option_lines = update_key_pair_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
         puts "\nAvailable Options:\n#{option_lines}\n\n"
         exit 1
       end
 
       key_pair_payload = params.select {|k,v| ['name'].include?(k) }
-      request_payload = {keyPair: key_pair_payload}
-      json_response = @key_pairs_interface.update(account_id, key_pair['id'], request_payload)
+      payload = {keyPair: key_pair_payload}
+      if options[:dry_run]
+        print_dry_run @key_pairs_interface.dry.update(account_id, key_pair['id'], payload)
+        return
+      end
+      json_response = @key_pairs_interface.update(account_id, key_pair['id'], payload)
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
@@ -272,19 +254,17 @@ class Morpheus::Cli::KeyPairs
   end
 
   def remove(args)
-    usage = "Usage: morpheus key-pairs remove [name]"
     options = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = usage
-      build_common_options(opts, options, [:account, :auto_confirm, :json])
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
     end
-    optparse.parse(args)
+    optparse.parse!(args)
 
     if args.count < 1
-      puts "\n#{usage}\n\n"
+      puts optparse
       exit 1
     end
-    name = args[0]
 
     connect(options)
     begin
@@ -292,11 +272,16 @@ class Morpheus::Cli::KeyPairs
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
       # allow finding by ID since name is not unique!
-      key_pair = ((name.to_s =~ /\A\d{1,}\Z/) ? find_key_pair_by_id(account_id, name) : find_key_pair_by_name(account_id, name) )
+      key_pair = find_key_pair_by_name_or_id(account_id, args[0])
       exit 1 if key_pair.nil?
+
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the key pair #{key_pair['name']}?")
         exit
       end
+      if options[:dry_run]
+        print_dry_run @key_pairs_interface.dry.destroy(account_id, key_pair['id'])
+        return
+      end
       json_response = @key_pairs_interface.destroy(account_id, key_pair['id'])
       if options[:json]
         print JSON.pretty_generate(json_response)
@@ -311,8 +296,15 @@ class Morpheus::Cli::KeyPairs
     end
   end
 
-private
-  
+  private
+  def find_key_pair_by_name_or_id(account_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_key_pair_by_id(account_id, val)
+    else
+      return find_key_pair_by_name(account_id, val)
+    end
+  end
+
   def find_key_pair_by_id(account_id, id)
     raise "#{self.class} has not defined @key_pairs_interface" if @key_pairs_interface.nil?
     begin
@@ -336,7 +328,7 @@ private
     elsif key_pairs.size > 1
       print_red_alert "#{key_pairs.size} key_pairs by name #{name}"
       print_key_pairs_table(key_pairs, {color: red})
-      print reset,"\n\n"
+      print reset,"\n"
       return nil
     else
       return key_pairs[0]
@@ -347,17 +339,16 @@ private
     table_color = opts[:color] || cyan
     rows = key_pairs.collect do |key_pair|
       {
-        id: key_pair['id'], 
-        name: key_pair['name'], 
+        id: key_pair['id'],
+        name: key_pair['name'],
         md5: key_pair['md5'],
-        dateCreated: format_local_dt(key_pair['dateCreated']) 
+        dateCreated: format_local_dt(key_pair['dateCreated'])
       }
     end
-    
     print table_color
     tp rows, [
-      :id, 
-      :name, 
+      :id,
+      :name,
       :md5,
       {:dateCreated => {:display_name => "Date Created"} }
     ]
@@ -367,6 +358,7 @@ private
 
   def add_key_pair_option_types
     [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'publicKey', 'fieldLabel' => 'Public Key', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
       {'fieldName' => 'privateKey', 'fieldLabel' => 'Private Key', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
     ]

data/lib/morpheus/cli/library.rb

@@ -6,496 +6,499 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::Library
   include Morpheus::Cli::CliCommand
 
-	def initialize() 
-		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-	end
-
-	def connect(opts)
-		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
-		if @access_token.empty?
-			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
-			exit 1
-		end
-		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
-		@custom_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).custom_instance_types
-		@provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-	end
-
-	def handle(args) 
-		usage = "Usage: morpheus library [list,details,add,update,remove,add-version] [name]"
-		case args[0]
-			when 'list'
-				list(args[1..-1])
-			when 'details'
-				details(args[1..-1])
-			when 'add'
-				add(args[1..-1])
-			when 'update'
-				update(args[1..-1])
-			when 'remove'
-				remove(args[1..-1])
-			when 'add-version'
-				add_version(args[1..-1])
-			else
-				puts "\n#{usage}\n\n"
-				exit 127
-		end
-	end
-
-	def list(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus library list"
-			build_common_options(opts, options, [:list, :json])
-		end
-		optparse.parse(args)
-		connect(options)
-		begin
-			params = {}
-			[:phrase, :offset, :max, :sort, :direction].each do |k|
-				params[k] = options[k] unless options[k].nil?
-			end
-
-			json_response = @custom_instance_types_interface.list(params)
-
-			if options[:json]
-				print JSON.pretty_generate(json_response), "\n"
-				return
-			end
-
-			instance_types = json_response['instanceTypes']
-			print "\n" ,cyan, bold, "Morpheus Custom Instance Types\n","==================", reset, "\n\n"
-			if instance_types.empty?
-				puts yellow,"No instance types currently configured.",reset
-			else
-				instance_types.each do |instance_type|
-					versions = instance_type['versions'].join(', ')
-					print cyan, "=  #{instance_type['name']} (#{instance_type['code']}) - #{versions}\n"
-					instance_type['instanceTypeLayouts'].each do |layout|
-						print green, "     - #{layout['name']}\n",reset
-					end
-				end
-			end
-			print reset,"\n\n"
-			
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def details(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus library details [name]"
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-		if args.count < 1
-			puts "\n#{optparse.banner}\n\n"
-			exit 1
-		end
-
-		connect(options)
-		begin
-			instance_type = find_custom_instance_type_by_name_or_code(args[0])
-			exit 1 if instance_type.nil?
-
-			if options[:json]
-				print JSON.pretty_generate({instanceType: instance_type}), "\n"
-				return
-			end
-
-			if instance_type.nil?
-				puts yellow,"No custom instance type found by name #{name}.",reset
-			else
-				print "\n" ,cyan, bold, "Custom Instance Type Details\n","==================", reset, "\n\n"
-				versions = instance_type['versions'].join(', ')
-				print cyan, "=  #{instance_type['name']} (#{instance_type['code']}) - #{versions}\n"
-				instance_type['instanceTypeLayouts'].each do |layout|
-					print green, "     - #{layout['name']}\n",reset
-				end
-				print reset,"\n\n"
-			end
-
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def add(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus library add"
-			build_common_options(opts, options, [:options, :json])
-		end
-		optparse.parse(args)
-		connect(options)
-		begin
-			params = Morpheus::Cli::OptionTypes.prompt(add_instance_type_option_types, options[:options], @api_client, options[:params])
-			instance_type_keys = ['name', 'description', 'category', 'visibility', 'environmentPrefix']
-			instance_type_payload = params.select {|k,v| instance_type_keys.include?(k) }
-			logo_file = nil
-			if params['logo']
-				filename = File.expand_path(params['logo'])
-				if !File.exists?(filename)
-					print_red_alert "File not found: #{filename}"
+  register_subcommands :list, :get, :add, :update, :remove, :'add-version'
+  alias_subcommand :details, :get
+
+  def initialize()
+    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+  end
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @custom_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).custom_instance_types
+    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+
+  def list(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:list, :dry_run, :json])
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      [:phrase, :offset, :max, :sort, :direction].each do |k|
+        params[k] = options[k] unless options[k].nil?
+      end
+
+      if options[:dry_run]
+        print_dry_run @custom_instance_types_interface.dry.list(params)
+        return
+      end
+
+      json_response = @custom_instance_types_interface.list(params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return
+      end
+
+      instance_types = json_response['instanceTypes']
+      print "\n" ,cyan, bold, "Morpheus Custom Instance Types\n","==================", reset, "\n\n"
+      if instance_types.empty?
+        puts yellow,"No instance types currently configured.",reset
+      else
+        instance_types.each do |instance_type|
+          versions = instance_type['versions'].join(', ')
+          print cyan, "=  #{instance_type['name']} (#{instance_type['code']}) - #{versions}\n"
+          instance_type['instanceTypeLayouts'].each do |layout|
+            print green, "     - #{layout['name']}\n",reset
+          end
+        end
+      end
+      print reset,"\n"
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:json, :dry_run])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+
+    connect(options)
+    begin
+      if options[:dry_run]
+        if args[0] =~ /code:/
+          print_dry_run @custom_instance_types_interface.dry.list({code: args[0]})
+        else
+          print_dry_run @custom_instance_types_interface.dry.list({name: args[0]})
+        end
+        return
+      end
+      instance_type = find_custom_instance_type_by_name_or_code(args[0])
+      exit 1 if instance_type.nil?
+
+      if options[:json]
+        print JSON.pretty_generate({instanceType: instance_type}), "\n"
+        return
+      end
+
+      if instance_type.nil?
+        puts yellow,"No custom instance type found by name #{name}.",reset
+      else
+        print "\n" ,cyan, bold, "Custom Instance Type Details\n","==================", reset, "\n\n"
+        versions = instance_type['versions'].join(', ')
+        print cyan, "=  #{instance_type['name']} (#{instance_type['code']}) - #{versions}\n"
+        instance_type['instanceTypeLayouts'].each do |layout|
+          print green, "     - #{layout['name']}\n",reset
+        end
+        print reset,"\n"
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def add(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = Morpheus::Cli::OptionTypes.prompt(add_instance_type_option_types, options[:options], @api_client, options[:params])
+      instance_type_keys = ['name', 'description', 'category', 'visibility', 'environmentPrefix']
+      instance_type_payload = params.select {|k,v| instance_type_keys.include?(k) }
+      logo_file = nil
+      if params['logo']
+        filename = File.expand_path(params['logo'])
+        if !File.exists?(filename)
+          print_red_alert "File not found: #{filename}"
           exit 1
-				end
-				#instance_type_payload['logo'] = File.new(filename, 'rb')
-				logo_file = File.new(filename, 'rb')
-			end
-			if params['hasAutoScale'] == 'on'
-				instance_type_payload['hasAutoScale'] = true
-			end
-			if params['hasDeployment'] == 'on'
-				instance_type_payload['hasDeployment'] = true
-			end
-			request_payload = {instanceType: instance_type_payload}
-			json_response = @custom_instance_types_interface.create(request_payload)
-
-			if json_response['success']
-				if logo_file
-					begin
-						@custom_instance_types_interface.update_logo(json_response['instanceType']['id'], logo_file)
-					rescue RestClient::Exception => e
-						print_red_alert "Failed to save logo!"
-						print_rest_exception(e, options)
-					end
-				end
-			end
-
-			if options[:json]
-				print JSON.pretty_generate(json_response), "\n"
-				return
-			end
-
-			print_green_success "Added Instance Type #{instance_type_payload['name']}"
-			
-			unless options[:no_prompt]
-				if ::Morpheus::Cli::OptionTypes::confirm("Add first version?", options)
-					puts "\n"
-					add_version(["code:#{json_response['code']}"])
-				end
-			end
-
-			#list([])
-
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def update(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus library update [name] [options]"
-			build_common_options(opts, options, [:options, :json])
-		end
-		optparse.parse(args)
-		if args.count < 1
-			puts "\n#{optparse.banner}\n\n"
-			exit 1
-		end
-		connect(options)
-		begin
-			instance_type = find_custom_instance_type_by_name_or_code(args[0])
-			exit 1 if instance_type.nil?
-			# option_types = update_instance_type_option_types(instance_type)
-			# params = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
-			params = options[:options] || {}
-			
-			instance_type_keys = ['name', 'description', 'category', 'visibility', 'environmentPrefix']
-			instance_type_payload = params.select {|k,v| instance_type_keys.include?(k) }
-			logo_file = nil
-			if params['logo']
-				filename = File.expand_path(params['logo'])
-				if !File.exists?(filename)
-					print_red_alert "File not found: #{filename}"
+        end
+        #instance_type_payload['logo'] = File.new(filename, 'rb')
+        logo_file = File.new(filename, 'rb')
+      end
+      if params['hasAutoScale'] == 'on'
+        instance_type_payload['hasAutoScale'] = true
+      end
+      if params['hasDeployment'] == 'on'
+        instance_type_payload['hasDeployment'] = true
+      end
+      payload = {instanceType: instance_type_payload}
+      if options[:dry_run]
+        print_dry_run @custom_instance_types_interface.dry.create(payload)
+        if logo_file
+          print_dry_run @custom_instance_types_interface.dry.update_logo(":id", logo_file)
+        end
+        return
+      end
+      json_response = @custom_instance_types_interface.create(payload)
+
+      if json_response['success']
+        if logo_file
+          begin
+            @custom_instance_types_interface.update_logo(json_response['instanceType']['id'], logo_file)
+          rescue RestClient::Exception => e
+            print_red_alert "Failed to save logo!"
+            print_rest_exception(e, options)
+          end
+        end
+      end
+
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return
+      end
+
+      print_green_success "Added Instance Type #{instance_type_payload['name']}"
+      unless options[:no_prompt]
+        if ::Morpheus::Cli::OptionTypes::confirm("Add first version?", options)
+          puts "\n"
+          add_version(["code:#{json_response['code']}"])
+        end
+      end
+
+      #list([])
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      instance_type = find_custom_instance_type_by_name_or_code(args[0])
+      exit 1 if instance_type.nil?
+      # option_types = update_instance_type_option_types(instance_type)
+      # params = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
+      params = options[:options] || {}
+      instance_type_keys = ['name', 'description', 'category', 'visibility', 'environmentPrefix']
+      instance_type_payload = params.select {|k,v| instance_type_keys.include?(k) }
+      logo_file = nil
+      if params['logo']
+        filename = File.expand_path(params['logo'])
+        if !File.exists?(filename)
+          print_red_alert "File not found: #{filename}"
           exit 1
-				end
-				#instance_type_payload['logo'] = File.new(filename, 'rb')
-				logo_file = File.new(filename, 'rb')
-			end
-			if params['hasAutoScale'] == 'on'
-				instance_type_payload['hasAutoScale'] = true
-			elsif params['hasAutoScale'] == 'off'
-				instance_type_payload['hasAutoScale'] = false
-			end
-			if params['hasDeployment'] == 'on'
-				instance_type_payload['hasDeployment'] = true
-			elsif params['hasDeployment'] == 'off'
-				instance_type_payload['hasDeployment'] = false
-			end
-			if instance_type_payload.empty? && logo_file.nil?
-				puts "\n#{optparse.banner}\n\n"
-				option_lines = update_instance_type_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-				puts "\nAvailable Options:\n#{option_lines}\n\n"
-				exit 1
-			end
-			if instance_type_payload.empty?
-				# just updating logo (separate request)
-				instance_type_payload['name'] = instance_type['name']
-			end
-			request_payload = {instanceType: instance_type_payload}
-			json_response = @custom_instance_types_interface.update(instance_type['id'], request_payload)
-
-			if json_response['success']
-				if logo_file
-					begin
-						@custom_instance_types_interface.update_logo(json_response['instanceType']['id'], logo_file)
-					rescue RestClient::Exception => e
-						print_red_alert "Failed to save logo!"
-						print_rest_exception(e, options)
-					end
-				end
-			end
-
-			if options[:json]
-				print JSON.pretty_generate(json_response), "\n"
-				return
-			end
-
-			print_green_success "Updated Instance Type #{instance_type_payload['name']}"
-			#list([])
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def remove(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus library remove [name]"
-			build_common_options(opts, options, [:json, :auto_confirm])
-		end
-		optparse.parse(args)
-		if args.count < 1
-			puts "\n#{optparse.banner}\n\n"
-			exit 1
-		end
-		code = args[0]
-		connect(options)
-
-		begin
-			
-			instance_type = find_custom_instance_type_by_name_or_code(args[0])
-			exit 1 if instance_type.nil?
-
-			unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the instance type #{instance_type['name']}?", options)
-				exit
-			end
-
-			json_response = @custom_instance_types_interface.destroy(instance_type['id'])
-
-			if options[:json]
-				print JSON.pretty_generate(json_response), "\n"
-				return
-			end
-
-			print_green_success "Removed Instance Type #{instance_type['name']}"
-			#list([])
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-	def add_version(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus library add-version [name]"
-			build_common_options(opts, options, [:options, :json])
-		end
-		optparse.parse(args)
-		if args.count < 1
-			puts "\n#{optparse.banner}\n\n"
-			exit 1
-		end
-		connect(options)
-		begin
-			instance_type = find_custom_instance_type_by_name_or_code(args[0])
-			exit 1 if instance_type.nil?
-
-			#params = Morpheus::Cli::OptionTypes.prompt(add_version_option_types, options[:options], @api_client, options[:params])
-			
-			provision_types = @provision_types_interface.get({customSupported: true})['provisionTypes']
-			if provision_types.empty?
-				print_red_alert "No available provision types found!"
-				exit 1
-			end
-			provision_type_options = provision_types.collect {|it| { 'name' => it['name'], 'value' => it['code']} }
-			
-			payload = {'containerType' => {}, 'instanceTypeLayout' => {}, 'instanceType' => {}}
-
-			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'instanceTypeLayout', 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true, 'description' => 'A name for this layout.'}], options[:options])
-			payload['instanceTypeLayout']['name'] = v_prompt['instanceTypeLayout']['name']
-
-			# shortName is only available for the first new version
-			if !instance_type['versions'] || instance_type['versions'].size == 0
-				v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'containerType', 'fieldName' => 'shortName', 'type' => 'text', 'fieldLabel' => 'Short Name', 'required' => true, 'description' => 'The short name is a lowercase name with no spaces used for display in your container list.'}], options[:options])
-				payload['containerType']['shortName'] = v_prompt['containerType']['shortName']
-			end
-
-			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'containerType', 'fieldName' => 'provisionTypeCode', 'type' => 'select', 'selectOptions' => provision_type_options, 'fieldLabel' => 'Technology', 'required' => true, 'description' => 'The type of container technology.'}], options[:options])
-			payload['containerType']['provisionTypeCode'] = v_prompt['containerType']['provisionTypeCode']
-			provision_type = provision_types.find {|it| it['code'] == payload['containerType']['provisionTypeCode'] }
-
-			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'instanceTypeLayout', 'fieldName' => 'instanceVersion', 'type' => 'text', 'fieldLabel' => 'Version', 'required' => true, 'description' => 'A Version Number eg. 0.0.1'}], options[:options])
-			payload['instanceTypeLayout']['instanceVersion'] = v_prompt['instanceTypeLayout']['instanceVersion']
-
-			custom_option_types = provision_type['customOptionTypes']
-
-			if (!custom_option_types || custom_option_types.empty?)
-				puts yellow,"Sorry, no options were found for #{provision_type['name']}.",reset
-				exit 1
-			end
-			
-			# prompt custom options for the selected provision type
-			field_group_name = custom_option_types.first['fieldGroup'] || "#{provision_type['name']} Options"
-			puts field_group_name
-			puts "==============="
-			v_prompt = Morpheus::Cli::OptionTypes.prompt(custom_option_types,options[:options],@api_client, {provisionTypCode: payload['provisionTypeCode']})
-
-			if v_prompt['containerType']
-				payload['containerType'].merge!(v_prompt['containerType'])
-			end
-			if v_prompt['containerType.config']
-				payload['containerType']['config'] = v_prompt['containerType.config']
-			end
-			if v_prompt['instanceTypeLayout']
-				payload['instanceTypeLayout'].merge!(v_prompt['instanceTypeLayout'])
-			end
-			# instanceType.backupType, which is not even persisted on the server?
-			if v_prompt['instanceType']
-				payload['instanceType'].merge!(v_prompt['instanceType'])
-			end
-
-			# puts "PAYLOAD:"
-			# puts JSON.pretty_generate(payload)
-			
-			# puts "\nexiting early"
-			# exit 0
-
-			payload['exposedPorts'] = prompt_exposed_ports(options, @api_client)
-
-			request_payload = payload
-			json_response = @custom_instance_types_interface.create_version(instance_type['id'], request_payload)
-
-			if options[:json]
-				print JSON.pretty_generate(json_response), "\n"
-				return
-			end
-
-			print_green_success "Added Instance Type Version #{instance_type['name']} - #{payload['instanceTypeLayout']['instanceVersion']}"
-			#list([])
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
-
-
-private
-
-	def find_custom_instance_type_by_code(code)
-		instance_type_results = @custom_instance_types_interface.list({code: code})
-		if instance_type_results['instanceTypes'].empty?
-			print_red_alert "Custom Instance Type not found by code #{code}"
-			return nil
-		end
-		return instance_type_results['instanceTypes'][0]
-	end
-
-	def find_custom_instance_type_by_name(name)
-		instance_type_results = @custom_instance_types_interface.list({name: name})
-		instance_types = instance_type_results['instanceTypes']
-		if instance_types.empty?
-			print_red_alert "Custom Instance Type not found by name #{name}"
-			return nil
-		elsif instance_types.size > 1
+        end
+        #instance_type_payload['logo'] = File.new(filename, 'rb')
+        logo_file = File.new(filename, 'rb')
+      end
+      if params['hasAutoScale'] == 'on'
+        instance_type_payload['hasAutoScale'] = true
+      elsif params['hasAutoScale'] == 'off'
+        instance_type_payload['hasAutoScale'] = false
+      end
+      if params['hasDeployment'] == 'on'
+        instance_type_payload['hasDeployment'] = true
+      elsif params['hasDeployment'] == 'off'
+        instance_type_payload['hasDeployment'] = false
+      end
+      if instance_type_payload.empty? && logo_file.nil?
+        puts optparse
+        option_lines = update_instance_type_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
+        puts "\nAvailable Options:\n#{option_lines}\n\n"
+        exit 1
+      end
+      if instance_type_payload.empty?
+        # just updating logo (separate request)
+        instance_type_payload['name'] = instance_type['name']
+      end
+      payload = {instanceType: instance_type_payload}
+      if options[:dry_run]
+        print_dry_run @custom_instance_types_interface.dry.update(instance_type['id'], payload)
+        if logo_file
+          print_dry_run @custom_instance_types_interface.dry.update_logo(":id", logo_file)
+        end
+        return
+      end
+      json_response = @custom_instance_types_interface.update(instance_type['id'], payload)
+
+      if json_response['success']
+        if logo_file
+          begin
+            @custom_instance_types_interface.update_logo(json_response['instanceType']['id'], logo_file)
+          rescue RestClient::Exception => e
+            print_red_alert "Failed to save logo!"
+            print_rest_exception(e, options)
+          end
+        end
+      end
+
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return
+      end
+
+      print_green_success "Updated Instance Type #{instance_type_payload['name']}"
+      #list([])
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+
+    begin
+      instance_type = find_custom_instance_type_by_name_or_code(args[0])
+      exit 1 if instance_type.nil?
+
+      unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the instance type #{instance_type['name']}?", options)
+        exit
+      end
+      if options[:dry_run]
+        print_dry_run @custom_instance_types_interface.dry.destroy(instance_type['id'])
+        return
+      end
+      json_response = @custom_instance_types_interface.destroy(instance_type['id'])
+
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return
+      end
+
+      print_green_success "Removed Instance Type #{instance_type['name']}"
+      #list([])
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def add_version(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:options, :json])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      instance_type = find_custom_instance_type_by_name_or_code(args[0])
+      exit 1 if instance_type.nil?
+
+      #params = Morpheus::Cli::OptionTypes.prompt(add_version_option_types, options[:options], @api_client, options[:params])
+      provision_types = @provision_types_interface.get({customSupported: true})['provisionTypes']
+      if provision_types.empty?
+        print_red_alert "No available provision types found!"
+        exit 1
+      end
+      provision_type_options = provision_types.collect {|it| { 'name' => it['name'], 'value' => it['code']} }
+      payload = {'containerType' => {}, 'instanceTypeLayout' => {}, 'instanceType' => {}}
+
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'instanceTypeLayout', 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true, 'description' => 'A name for this layout.'}], options[:options])
+      payload['instanceTypeLayout']['name'] = v_prompt['instanceTypeLayout']['name']
+
+      # shortName is only available for the first new version
+      if !instance_type['versions'] || instance_type['versions'].size == 0
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'containerType', 'fieldName' => 'shortName', 'type' => 'text', 'fieldLabel' => 'Short Name', 'required' => true, 'description' => 'The short name is a lowercase name with no spaces used for display in your container list.'}], options[:options])
+        payload['containerType']['shortName'] = v_prompt['containerType']['shortName']
+      end
+
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'containerType', 'fieldName' => 'provisionTypeCode', 'type' => 'select', 'selectOptions' => provision_type_options, 'fieldLabel' => 'Technology', 'required' => true, 'description' => 'The type of container technology.'}], options[:options])
+      payload['containerType']['provisionTypeCode'] = v_prompt['containerType']['provisionTypeCode']
+      provision_type = provision_types.find {|it| it['code'] == payload['containerType']['provisionTypeCode'] }
+
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'instanceTypeLayout', 'fieldName' => 'instanceVersion', 'type' => 'text', 'fieldLabel' => 'Version', 'required' => true, 'description' => 'A Version Number eg. 0.0.1'}], options[:options])
+      payload['instanceTypeLayout']['instanceVersion'] = v_prompt['instanceTypeLayout']['instanceVersion']
+
+      custom_option_types = provision_type['customOptionTypes']
+
+      if (!custom_option_types || custom_option_types.empty?)
+        puts yellow,"Sorry, no options were found for #{provision_type['name']}.",reset
+        exit 1
+      end
+      # prompt custom options for the selected provision type
+      field_group_name = custom_option_types.first['fieldGroup'] || "#{provision_type['name']} Options"
+      puts field_group_name
+      puts "==============="
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(custom_option_types,options[:options],@api_client, {provisionTypCode: payload['provisionTypeCode']})
+
+      if v_prompt['containerType']
+        payload['containerType'].merge!(v_prompt['containerType'])
+      end
+      if v_prompt['containerType.config']
+        payload['containerType']['config'] = v_prompt['containerType.config']
+      end
+      if v_prompt['instanceTypeLayout']
+        payload['instanceTypeLayout'].merge!(v_prompt['instanceTypeLayout'])
+      end
+      # instanceType.backupType, which is not even persisted on the server?
+      if v_prompt['instanceType']
+        payload['instanceType'].merge!(v_prompt['instanceType'])
+      end
+
+      # puts "PAYLOAD:"
+      # puts JSON.pretty_generate(payload)
+      # puts "\nexiting early"
+      # exit 0
+
+      payload['exposedPorts'] = prompt_exposed_ports(options, @api_client)
+
+      request_payload = payload
+      json_response = @custom_instance_types_interface.create_version(instance_type['id'], request_payload)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return
+      end
+
+      print_green_success "Added Instance Type Version #{instance_type['name']} - #{payload['instanceTypeLayout']['instanceVersion']}"
+      #list([])
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+  private
+
+  def find_custom_instance_type_by_code(code)
+    instance_type_results = @custom_instance_types_interface.list({code: code})
+    if instance_type_results['instanceTypes'].empty?
+      print_red_alert "Custom Instance Type not found by code #{code}"
+      return nil
+    end
+    return instance_type_results['instanceTypes'][0]
+  end
+
+  def find_custom_instance_type_by_name(name)
+    instance_type_results = @custom_instance_types_interface.list({name: name})
+    instance_types = instance_type_results['instanceTypes']
+    if instance_types.empty?
+      print_red_alert "Custom Instance Type not found by name #{name}"
+      return nil
+    elsif instance_types.size > 1
       print_red_alert "Found #{instance_types.size} instance types by name #{name}"
       print red, "\n"
       instance_types.each do |instance_type|
         print "= #{instance_type['name']} (#{instance_type['code']})\n"
       end
       print "\n", "Find by code:<code> instead"
-      print reset,"\n\n"
+      print reset,"\n"
       return nil
     else
       return instance_types[0]
     end
-	end
-
-	def find_custom_instance_type_by_name_or_code(val)
-		if val =~ /code:/
-			find_custom_instance_type_by_code(val.sub('code:', ''))
-		else
-			find_custom_instance_type_by_name(val)
-		end
-	end
-
-	def instance_type_categories
-		[
-			{'name' => 'Web', 'value' => 'web'},
-			{'name' => 'SQL', 'value' => 'sql'},
-			{'name' => 'NoSQL', 'value' => 'nosql'},
-			{'name' => 'Apps', 'value' => 'apps'},
-			{'name' => 'Network', 'value' => 'network'},
-			{'name' => 'Messaging', 'value' => 'messaging'},
-			{'name' => 'Cache', 'value' => 'cache'},
-			{'name' => 'OS', 'value' => 'os'},
-			{'name' => 'Cloud', 'value' => 'cloud'},
-			{'name' => 'Utility', 'value' => 'utility'}
-		]
-	end
-
-	def add_instance_type_option_types
-		[
-			{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-			{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-			{'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'select', 'selectOptions' => instance_type_categories, 'required' => true, 'displayOrder' => 3},
-			{'fieldName' => 'logo', 'fieldLabel' => 'Icon File', 'type' => 'text', 'displayOrder' => 4},
-			{'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 5},
-			{'fieldName' => 'environmentPrefix', 'fieldLabel' => 'Environment Prefix', 'type' => 'text', 'displayOrder' => 6, 'description' => 'Used for exportable environment variables when tying instance types together in app contexts. If not specified a name will be generated.'},
-			{'fieldName' => 'hasAutoScale', 'fieldLabel' => 'Enable Scaling (Horizontal)', 'type' => 'checkbox', 'displayOrder' => 7},
-			{'fieldName' => 'hasDeployment', 'fieldLabel' => 'Supports Deployments', 'type' => 'checkbox', 'displayOrder' => 8, 'description' => 'Requires a data volume be configured on each version. Files will be copied into this location.'}
-		]
-	end
-
-	def update_instance_type_option_types(instance_type=nil)
-		if instance_type
-			opts = add_instance_type_option_types
-			opts.find {|opt| opt['fieldName'] == 'name'}['defaultValue'] = instance_type['name']
-			opts
-		else
-			add_instance_type_option_types
-		end
-	end
-
-	def add_version_option_types
-		[
-			{'fieldName' => 'versionNumber', 'fieldLabel' => 'Version Number', 'type' => 'text', 'required' => true, 'displayOrder' => 1}
-		]
-	end
-
-	def update_version_option_types
-		add_version_option_types
-	end
-
-	def load_balance_protocols
-		[
-			{'name' => 'None', 'value' => ''},
-			{'name' => 'HTTP', 'value' => 'HTTP'},
-			{'name' => 'HTTPS', 'value' => 'HTTPS'},
-			{'name' => 'TCP', 'value' => 'TCP'}
-		]
-	end
-
-	# Prompts user for exposed ports array
+  end
+
+  def find_custom_instance_type_by_name_or_code(val)
+    if val =~ /code:/
+      find_custom_instance_type_by_code(val.sub('code:', ''))
+    else
+      find_custom_instance_type_by_name(val)
+    end
+  end
+
+  def instance_type_categories
+    [
+      {'name' => 'Web', 'value' => 'web'},
+      {'name' => 'SQL', 'value' => 'sql'},
+      {'name' => 'NoSQL', 'value' => 'nosql'},
+      {'name' => 'Apps', 'value' => 'apps'},
+      {'name' => 'Network', 'value' => 'network'},
+      {'name' => 'Messaging', 'value' => 'messaging'},
+      {'name' => 'Cache', 'value' => 'cache'},
+      {'name' => 'OS', 'value' => 'os'},
+      {'name' => 'Cloud', 'value' => 'cloud'},
+      {'name' => 'Utility', 'value' => 'utility'}
+    ]
+  end
+
+  def add_instance_type_option_types
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
+      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'select', 'selectOptions' => instance_type_categories, 'required' => true, 'displayOrder' => 3},
+      {'fieldName' => 'logo', 'fieldLabel' => 'Icon File', 'type' => 'text', 'displayOrder' => 4},
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 5},
+      {'fieldName' => 'environmentPrefix', 'fieldLabel' => 'Environment Prefix', 'type' => 'text', 'displayOrder' => 6, 'description' => 'Used for exportable environment variables when tying instance types together in app contexts. If not specified a name will be generated.'},
+      {'fieldName' => 'hasAutoScale', 'fieldLabel' => 'Enable Scaling (Horizontal)', 'type' => 'checkbox', 'displayOrder' => 7},
+      {'fieldName' => 'hasDeployment', 'fieldLabel' => 'Supports Deployments', 'type' => 'checkbox', 'displayOrder' => 8, 'description' => 'Requires a data volume be configured on each version. Files will be copied into this location.'}
+    ]
+  end
+
+  def update_instance_type_option_types(instance_type=nil)
+    if instance_type
+      opts = add_instance_type_option_types
+      opts.find {|opt| opt['fieldName'] == 'name'}['defaultValue'] = instance_type['name']
+      opts
+    else
+      add_instance_type_option_types
+    end
+  end
+
+  def add_version_option_types
+    [
+      {'fieldName' => 'versionNumber', 'fieldLabel' => 'Version Number', 'type' => 'text', 'required' => true, 'displayOrder' => 1}
+    ]
+  end
+
+  def update_version_option_types
+    add_version_option_types
+  end
+
+  def load_balance_protocols
+    [
+      {'name' => 'None', 'value' => ''},
+      {'name' => 'HTTP', 'value' => 'HTTP'},
+      {'name' => 'HTTPS', 'value' => 'HTTPS'},
+      {'name' => 'TCP', 'value' => 'TCP'}
+    ]
+  end
+
+  # Prompts user for exposed ports array
   # returns array of port objects
   def prompt_exposed_ports(options={}, api_client=nil, api_params={})
     #puts "Configure ports:"
@@ -503,37 +506,33 @@ private
 
     ports = []
     port_index = 0
-    
     has_another_port = options[:options] && options[:options]["exposedPort#{port_index}"]
     add_another_port = has_another_port || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add an exposed port?"))
-    
     while add_another_port do
-      
-      field_context = "exposedPort#{port_index}"
+        field_context = "exposedPort#{port_index}"
 
-      port = {}
-      #port['name'] ||= "Port #{port_index}"
+        port = {}
+        #port['name'] ||= "Port #{port_index}"
+        port_label = port_index == 0 ? "Port" : "Port [#{port_index+1}]"
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{port_label} Name", 'required' => false, 'description' => 'Choose a name for this port.', 'defaultValue' => port['name']}], options[:options])
+        port['name'] = v_prompt[field_context]['name']
 
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "Port #{port_index} Name", 'required' => false, 'description' => 'Choose a name for this port.', 'defaultValue' => port['name']}], options[:options])
-      port['name'] = v_prompt[field_context]['name']
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'port', 'type' => 'number', 'fieldLabel' => "#{port_label} Number", 'required' => true, 'description' => 'A port number. eg. 8001', 'defaultValue' => (port['port'] ? port['port'].to_i : nil)}], options[:options])
+        port['port'] = v_prompt[field_context]['port']
 
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'port', 'type' => 'number', 'fieldLabel' => "Port #{port_index} Number", 'required' => true, 'description' => 'Choose port number.', 'defaultValue' => (port['port'] ? port['port'].to_i : nil)}], options[:options])
-      port['port'] = v_prompt[field_context]['port']
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'loadBalanceProtocol', 'type' => 'select', 'fieldLabel' => "#{port_label} LB", 'selectOptions' => load_balance_protocols, 'required' => false, 'skipSingleOption' => true, 'description' => 'Choose a load balance protocol.', 'defaultValue' => port['loadBalanceProtocol']}], options[:options])
+        port['loadBalanceProtocol'] = v_prompt[field_context]['loadBalanceProtocol']
 
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'loadBalanceProtocol', 'type' => 'select', 'fieldLabel' => "Port #{port_index} LB", 'selectOptions' => load_balance_protocols, 'required' => false, 'skipSingleOption' => true, 'description' => 'Choose a load balance protocol.', 'defaultValue' => port['loadBalanceProtocol']}], options[:options])
-      port['loadBalanceProtocol'] = v_prompt[field_context]['loadBalanceProtocol']
+        ports << port
+        port_index += 1
+        has_another_port = options[:options] && options[:options]["exposedPort#{port_index}"]
+        add_another_port = has_another_port || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another exposed port?"))
+
+      end
 
-      ports << port
-      
-      port_index += 1
-      has_another_port = options[:options] && options[:options]["exposedPort#{port_index}"]
-      add_another_port = has_another_port || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another exposed port?"))
 
+      return ports
     end
 
 
-    return ports
   end
-
-
-end