morpheus-cli 4.1.14 → 4.2

data/lib/morpheus/cli/networks_command.rb

@@ -6,6 +6,7 @@ require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworksCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::WhoamiHelper
   include Morpheus::Cli::InfrastructureHelper
 
   set_command_name :networks
@@ -26,6 +27,7 @@ class Morpheus::Cli::NetworksCommand
     @network_types_interface = @api_client.network_types
     @subnets_interface = @api_client.subnets
     @subnet_types_interface = @api_client.subnet_types
+    @groups_interface = @api_client.groups
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
   end
@@ -97,6 +99,7 @@ class Morpheus::Cli::NetworksCommand
             id: network['id'],
             name: network['name'],
             type: network['type'] ? network['type']['name'] : '',
+            group: network['group'] ? network['group']['name'] : 'Shared',
             cloud: network['zone'] ? network['zone']['name'] : '',
             cidr: network['cidr'],
             pool: network['pool'] ? network['pool']['name'] : '',
@@ -114,6 +117,7 @@ class Morpheus::Cli::NetworksCommand
                 name: "  #{subnet['name']}",
                 # type: subnet['type'] ? subnet['type']['name'] : '',
                 type: "Subnet",
+                group: network['group'] ? network['group']['name'] : 'Shared',
                 cloud: network['zone'] ? network['zone']['name'] : '',
                 cidr: subnet['cidr'],
                 pool: subnet['pool'] ? subnet['pool']['name'] : '',
@@ -126,7 +130,7 @@ class Morpheus::Cli::NetworksCommand
             end
           end
         end
-        columns = [:id, :name, :type, :cloud, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
+        columns = [:id, :name, :type, :group, :cloud, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
         end
@@ -190,6 +194,7 @@ class Morpheus::Cli::NetworksCommand
         "Name" => 'name',
         "Description" => 'description',
         "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+        "Group" => lambda {|it| it['group'] ? it['group']['name'] : 'Shared' },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
         "CIDR" => 'cidr',
         "Gateway" => 'gateway',
@@ -207,7 +212,9 @@ class Morpheus::Cli::NetworksCommand
       }
       print_description_list(description_cols, network)
 
-      if network['resourcePermission'].nil?
+      if network["group"]
+        # Group Access is n/a unless network is_a? Shared (no group)
+      elsif network['resourcePermission'].nil?
         print "\n", "No group access found", "\n"
       else
         print_h2 "Group Access"
@@ -272,6 +279,9 @@ class Morpheus::Cli::NetworksCommand
     group_defaults_list = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("-t TYPE")
+      opts.on( '-g', '--group GROUP', "Group Name or ID. Default is Shared." ) do |val|
+        options[:group] = val
+      end
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
         options[:cloud] = val
       end
@@ -411,19 +421,79 @@ class Morpheus::Cli::NetworksCommand
           payload['network']['description'] = v_prompt['description']
         end
 
+        # Group
+        # ok, networks list needs to know if they have full or groups permission
+        group = nil
+        groups_dropdown = nil
+        group_is_required = true
+        network_perm = (current_user_permissions || []).find {|perm| perm['code'] == 'infrastructure-networks'}
+        if network_perm && ['full','read'].include?(network_perm['access'])
+          group_is_required = false
+          groups_dropdown = get_available_groups_with_shared
+        else
+          # they have group access, shared cannot be selected.
+          groups_dropdown = get_available_groups
+        end
+        if options[:group]
+          group_id = options[:group]
+          group = groups_dropdown.find {|it| it["value"].to_s == group_id.to_s || it["name"].to_s == group_id}
+          if group.nil?
+            print_red_alert "Group not found by id #{group_id}"
+            return 1
+          end
+          if group_id.to_s == 'shared'
+            group_id = nil
+            group = nil
+          end
+        else
+          group_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => groups_dropdown, 'required' => group_is_required, 'description' => 'Select Group.'}],options,@api_client,{})
+          group_id = group_prompt['group']
+          if group_id.to_s == '' || group_id.to_s == 'shared'
+            group_id = nil
+            group = nil
+          else
+            group = groups_dropdown.find {|it| it["value"].to_s == group_id.to_s || it["name"].to_s == group_id}
+            if group.nil?
+              print_red_alert "Group not found by id #{group_id}"
+              return 1
+            end
+          end
+        end
+        if group
+          payload['network']['site'] = {'id' => group['id']}
+        else
+          # shared
+        end
+
         # Cloud
         cloud = nil
-        if options[:cloud]
-          cloud = find_cloud_by_name_or_id(options[:cloud])
-          # meh, should validate cloud is in the cloudsForNetworks dropdown..
-          return 1 if cloud.nil?
+        if group
+          if options[:cloud]
+            cloud_id = options[:cloud]
+            cloud = group["clouds"].find {|it| it["id"].to_s == cloud_id.to_s || it["name"].to_s == cloud_id}
+            if cloud.nil?
+              print_red_alert "Cloud not found by id #{cloud_id}"
+              return 1
+            end
+          else
+            api_params = {groupId:group['id']}
+            cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'optionSource' => 'cloudsForNetworks', 'required' => true, 'description' => 'Select Cloud.'}],options,@api_client,api_params)
+            cloud_id = cloud_prompt['cloud']
+            cloud = find_cloud_by_name_or_id(cloud_id) if cloud_id
+            return 1 if cloud.nil?
+          end
         else
-          # print_red_alert "Cloud not specified!"
-          # exit 1
-          cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'optionSource' => 'cloudsForNetworks', 'required' => true, 'description' => 'Select Cloud.'}],options,@api_client,{})
-          cloud_id = cloud_prompt['cloud']
-          cloud = find_cloud_by_name_or_id(cloud_id) if cloud_id
-          return 1 if cloud.nil?
+          if options[:cloud]
+            cloud = find_cloud_by_name_or_id(options[:cloud])
+            # meh, should validate cloud is in the cloudsForNetworks dropdown..
+            return 1 if cloud.nil?
+          else
+            api_params = {}
+            cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'optionSource' => 'cloudsForNetworks', 'required' => true, 'description' => 'Select Cloud.'}],options,@api_client,api_params)
+            cloud_id = cloud_prompt['cloud']
+            cloud = find_cloud_by_name_or_id(cloud_id) if cloud_id
+            return 1 if cloud.nil?
+          end
         end
         payload['network']['zone'] = {'id' => cloud['id']}
 
@@ -446,83 +516,84 @@ class Morpheus::Cli::NetworksCommand
           print_red_alert "Network Type not found by id '#{network_type_id}'"
           return 1
         end
-        network_type_option_types = network_type['optionTypes']
-        if network_type_option_types && network_type_option_types.size > 0
-          # prompt for option types
-          # JD: 3.6.2 has fieldContext: 'domain' , which is wrong
-          network_type_option_types.each do |option_type|
-            # if option_type['fieldContext'] == 'domain'
-            #   option_type['fieldContext'] = 'network'
-            # end
-            #option_type['fieldContext'] = nil
-          end
-          network_type_params = Morpheus::Cli::OptionTypes.prompt(network_type_option_types,options[:options],@api_client, {zoneId: cloud['id']})
-          # network context options belong at network level and not network.network
-          network_context_params = network_type_params.delete('network')
-          payload['network'].deep_merge!(network_context_params) if network_context_params
-          payload['network'].deep_merge!(network_type_params)
-
-        #todo: special handling of type: 'aciVxlan'
 
+        # CIDR
+        if options['cidr']
+          payload['network']['cidr'] = options['cidr']
         else
-          # DEFAULT INPUTS
+          #if network_type['cidrEditable']
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => 'CIDR', 'type' => 'text', 'required' => network_type['cidrRequired'], 'description' => ''}], options)
+            payload['network']['cidr'] = v_prompt['cidr']
+          #end
+        end
 
-          # Gateway
-          if options['gateway']
-            payload['network']['gateway'] = options['gateway']
-          else
+        # Gateway
+        if options['gateway']
+          payload['network']['gateway'] = options['gateway']
+        else
+          if network_type['gatewayEditable']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'gateway', 'fieldLabel' => 'Gateway', 'type' => 'text', 'required' => false, 'description' => ''}], options)
             payload['network']['gateway'] = v_prompt['gateway']
           end
+        end
 
-          # DNS Primary
-          if options['dnsPrimary']
-            payload['network']['dnsPrimary'] = options['dnsPrimary']
-          else
+        # DNS Primary
+        if options['dnsPrimary']
+          payload['network']['dnsPrimary'] = options['dnsPrimary']
+        else
+          if network_type['dnsEditable']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsPrimary', 'fieldLabel' => 'DNS Primary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
             payload['network']['dnsPrimary'] = v_prompt['dnsPrimary']
           end
+        end
 
-          # DNS Secondary
-          if options['dnsSecondary']
-            payload['network']['dnsSecondary'] = options['dnsSecondary']
-          else
+        # DNS Secondary
+        if options['dnsSecondary']
+          payload['network']['dnsSecondary'] = options['dnsSecondary']
+        else
+          if network_type['dnsEditable']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondary', 'fieldLabel' => 'DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
             payload['network']['dnsSecondary'] = v_prompt['dnsSecondary']
           end
+        end
 
-          # CIDR
-          if options['cidr']
-            payload['network']['cidr'] = options['cidr']
-          else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => 'CIDR', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-            payload['network']['cidr'] = v_prompt['cidr']
-          end
-
-          # VLAN ID
-          if options['vlanId']
-            payload['network']['vlanId'] = options['vlanId']
-          else
+        # VLAN ID
+        if options['vlanId']
+          payload['network']['vlanId'] = options['vlanId']
+        else
+          if network_type['vlanEditable']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'vlanId', 'fieldLabel' => 'VLAN ID', 'type' => 'number', 'required' => false, 'description' => ''}], options)
             payload['network']['vlanId'] = v_prompt['vlanId']
           end
+        end
 
-          # DHCP Server
-          if options['dhcpServer'] != nil
-            payload['network']['dhcpServer'] = options['dhcpServer']
-          else
+        # prompt for option types
+        network_type_option_types = network_type['optionTypes']
+        if network_type_option_types && network_type_option_types.size > 0
+          network_type_params = Morpheus::Cli::OptionTypes.prompt(network_type_option_types,options[:options],@api_client, {zoneId: cloud['id']})
+          # network context options belong at network level and not network.network
+          network_context_params = network_type_params.delete('network')
+          payload['network'].deep_merge!(network_context_params) if network_context_params
+          payload['network'].deep_merge!(network_type_params)
+
+        end
+
+        # DHCP Server
+        if options['dhcpServer'] != nil
+          payload['network']['dhcpServer'] = options['dhcpServer']
+        else
+          if network_type['dhcpServerEditable']
             v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServer', 'fieldLabel' => 'DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
             payload['network']['dhcpServer'] = v_prompt['dhcpServer']
           end
+        end
 
-          # Allow IP Override
-          if options['allowStaticOverride'] != nil
-            payload['network']['allowStaticOverride'] = options['allowStaticOverride']
-          else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowStaticOverride', 'fieldLabel' => 'Allow IP Override', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
-            payload['network']['allowStaticOverride'] = v_prompt['allowStaticOverride']
-          end
-
+        # Allow IP Override
+        if options['allowStaticOverride'] != nil
+          payload['network']['allowStaticOverride'] = options['allowStaticOverride']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowStaticOverride', 'fieldLabel' => 'Allow IP Override', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+          payload['network']['allowStaticOverride'] = v_prompt['allowStaticOverride']
         end
 
         ## IPAM Options
@@ -531,10 +602,12 @@ class Morpheus::Cli::NetworksCommand
         if options['pool']
           payload['network']['pool'] = options['pool'].to_i
         else
-          # todo: select dropdown
-          # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'select', 'optionSource' => 'networkPools', 'required' => false, 'description' => ''}], options, @api_client, {zoneId: cloud['id']})
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-          payload['network']['pool'] = v_prompt['pool'].to_i if v_prompt['pool']
+          if network_type['canAssignPool']
+            # todo: select dropdown
+            # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'select', 'optionSource' => 'networkPools', 'required' => false, 'description' => ''}], options, @api_client, {zoneId: cloud['id']})
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+            payload['network']['pool'] = v_prompt['pool'].to_i if v_prompt['pool']
+          end
         end
         
         ## Advanced Options
@@ -976,9 +1049,13 @@ class Morpheus::Cli::NetworksCommand
 
   def remove(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[network]")
       build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
+      opts.on( '-f', '--force', "Force Delete" ) do
+        params[:force] = 'true'
+      end
       opts.footer = "Delete a network." + "\n" +
                     "[network] is required. This is the name or id of a network."
     end
@@ -1000,10 +1077,10 @@ class Morpheus::Cli::NetworksCommand
       end
       @networks_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @networks_interface.dry.destroy(network['id'])
+        print_dry_run @networks_interface.dry.destroy(network['id'], params)
         return 0
       end
-      json_response = @networks_interface.destroy(network['id'])
+      json_response = @networks_interface.destroy(network['id'], params)
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
@@ -1223,4 +1300,19 @@ class Morpheus::Cli::NetworksCommand
 
   private
 
+  def get_available_groups(refresh=false)
+    if !@available_groups || refresh
+      option_results = @options_interface.options_for_source('groups',{})
+      @available_groups = option_results['data'].collect {|it|
+        {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
+      }
+    end
+    #puts "get_available_groups() rtn: #{@available_groups.inspect}"
+    return @available_groups
+  end
+
+  def get_available_groups_with_shared(refresh=false)
+    [{"id" => 'shared', "name" => 'Shared', "value" => 'shared'}] + get_available_groups(refresh)
+  end
+
 end

data/lib/morpheus/cli/option_types.rb

@@ -39,13 +39,18 @@ module Morpheus
         paging_enabled = false if Morpheus::Cli.windows?
         results = {}
         options = options || {}
+        # inject cli only stuff into option_types (should clone() here)
+        option_types.each do |option_type|
+          if options[:help_field_prefix]
+            option_type[:help_field_prefix] = options[:help_field_prefix]
+          end
+        end
         # puts "Options Prompt #{options}"
         option_types.sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |option_type|
           context_map = results
           value = nil
           value_found=false
 
-         
           # How about this instead?
           # option_type = option_type.clone
           # field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
@@ -56,7 +61,10 @@ module Morpheus
           #   end
           # end
 
+          # allow for mapping of domain to relevant type: domain.zone => router.zone
+          option_type['fieldContext'] = (options[:context_map] || {})[option_type['fieldContext']] || option_type['fieldContext']
           field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+          help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
           namespaces = field_key.split(".")
           field_name = namespaces.pop
 
@@ -78,33 +86,38 @@ module Morpheus
             end
           end
 
-          
           cur_namespace = options
+          parent_context_map = context_map
+          parent_ns = field_name
 
           namespaces.each do |ns|
             next if ns.empty?
+            parent_context_map = context_map
+            parent_ns = ns
             cur_namespace[ns.to_s] ||= {}
             cur_namespace = cur_namespace[ns.to_s]
             context_map[ns.to_s] ||= {}
             context_map = context_map[ns.to_s]
           end
+
           # use the value passed in the options map
-          if cur_namespace.key?(field_name)
+          if cur_namespace.respond_to?('key?') && cur_namespace.key?(field_name)
             value = cur_namespace[field_name]
+            input_value = ['select', 'multiSelect'].include?(option_type['type']) && option_type['fieldInput'] ? cur_namespace[option_type['fieldInput']] : nil
             if option_type['type'] == 'number'
               value = value.to_s.include?('.') ? value.to_f : value.to_i
-            elsif option_type['type'] == 'select'
+            elsif ['select', 'multiSelect'].include?(option_type['type'])
               # this should just fall down through below, with the extra params no_prompt, use_value
-              value = select_prompt(option_type.merge({'defaultValue' => value}), api_client, (api_params || {}).merge(results), true)
+              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
             end
             if options[:always_prompt] != true
               value_found = true
             end
           end
-          
-          # set the value that has been passed to the option type default value: options[fieldContext.fieldName]
+
+          # set the value that has been passed to the option type default value
           if value != nil # && value != ''
-            option_type = option_type.clone  
+            option_type = option_type.clone
             option_type['defaultValue'] = value
           end
           # no_prompt means skip prompting and instead
@@ -119,14 +132,14 @@ module Morpheus
               if !value_found
                 # select type is special because it supports skipSingleOption
                 # and prints the available options on error
-                if option_type['type'] == 'select'
-                  value = select_prompt(option_type.merge({'defaultValue' => value}), api_client, (api_params || {}).merge(results), true)
+                if ['select', 'multiSelect'].include?(option_type['type'])
+                  value = select_prompt(option_type, api_client, (api_params || {}).merge(results), true)
                   value_found = !!value
                 end
                 if !value_found
                   if option_type['required']
                     print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
-                    print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{field_key}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+                    print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{help_field_key}=] - #{option_type['description']}\n", Term::ANSIColor.reset
                     print "\n"
                     exit 1
                   else
@@ -150,7 +163,7 @@ module Morpheus
               value = multiline_prompt(option_type)
             elsif option_type['type'] == 'code-editor'
               value = multiline_prompt(option_type)
-            elsif option_type['type'] == 'select'
+            elsif ['select', 'multiSelect'].include?(option_type['type'])
               # so, the /api/options/source is may need ALL the previously
               # selected values that are being accumulated in options
               # api_params is just extra params to always send
@@ -158,70 +171,87 @@ module Morpheus
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
               value = select_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
-          elsif option_type['type'] == 'hidden'
-            value = option_type['defaultValue']
-            input = value
-          elsif option_type['type'] == 'file'
-            value = file_prompt(option_type)
+              if value && option_type['type'] == 'multiSelect'
+                value = [value]
+                while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
+                  if addn_value = select_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
+                    value << addn_value
+                  else
+                    break
+                  end
+                end
+              end
+            elsif option_type['type'] == 'hidden'
+              value = option_type['defaultValue']
+              input = value
+            elsif option_type['type'] == 'file'
+              value = file_prompt(option_type)
+            elsif option_type['type'] == 'file-content'
+              value = file_content_prompt(option_type, options, api_client, {})
+            else
+              value = generic_prompt(option_type)
+            end
+          end
+
+          if option_type['type'] == 'multiSelect'
+            value = [value] if !value.nil? && !value.is_a?(Array)
+            parent_context_map[parent_ns] = value
           else
-            value = generic_prompt(option_type)
+            context_map[field_name] = value
           end
         end
-        context_map[field_name] = value
+        results
       end
 
-      return results
-    end
-
-    def self.grails_params(data, context=nil)
-      params = {}
-      data.each do |k,v|
-        if v.is_a?(Hash)
-          params.merge!(grails_params(v, context ? "#{context}.#{k.to_s}" : k))
-        else
-          if context
-            params["#{context}.#{k.to_s}"] = v
+      def self.grails_params(data, context=nil)
+        params = {}
+        data.each do |k,v|
+          if v.is_a?(Hash)
+            params.merge!(grails_params(v, context ? "#{context}.#{k.to_s}" : k))
           else
-            params[k.to_s] = v
+            if context
+              params["#{context}.#{k.to_s}"] = v
+            else
+              params[k.to_s] = v
+            end
           end
         end
+        return params
       end
-      return params
-    end
 
-    def self.radio_prompt(option_type)
-      value_found = false
-      value = nil
-      options = []
-      if option_type['config'] and option_type['config']['radioOptions']
-        option_type['config']['radioOptions'].each do |radio_option|
-          options << {key: radio_option['key'], checked: radio_option['checked']}
-        end
-      end
-      optionString = options.collect{ |b| b[:checked] ? "(#{b[:key]})" : b[:key]}.join(', ')
-      while !value_found do
-        print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }[#{optionString}]: "
-        input = $stdin.gets.chomp!
-        if input == '?'
-          help_prompt(option_type)
-        else
-          if input.nil? || input.empty?
-            selectedOption = options.find{|o| o[:checked] == true}
-          else
-            selectedOption = options.find{|o| o[:key].downcase == input.downcase}
+      def self.radio_prompt(option_type)
+        value_found = false
+        value = nil
+        options = []
+        if option_type['config'] and option_type['config']['radioOptions']
+          option_type['config']['radioOptions'].each do |radio_option|
+            options << {key: radio_option['key'], checked: radio_option['checked']}
           end
-          if selectedOption
-            value = selectedOption[:key]
+        end
+        optionString = options.collect{ |b| b[:checked] ? "(#{b[:key]})" : b[:key]}.join(', ')
+        while !value_found do
+          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }[#{optionString}]: "
+          input = $stdin.gets.chomp!
+          if input == '?'
+            help_prompt(option_type)
           else
-            puts "Invalid Option. Please select from #{optionString}."
-          end
-          if !value.nil? || option_type['required'] != true
-            value_found = true
+            if input.nil? || input.empty?
+              selectedOption = options.find{|o| o[:checked] == true}
+            else
+              selectedOption = options.find{|o| o[:key].downcase == input.downcase}
+            end
+            if selectedOption
+              value = selectedOption[:key]
+            else
+              puts "Invalid Option. Please select from #{optionString}."
+            end
+            if !value.nil? || option_type['required'] != true
+              value_found = true
+            end
           end
         end
+        return value
       end
-      return value
-    end
 
       def self.number_prompt(option_type)
         value_found = false
@@ -251,10 +281,13 @@ module Morpheus
 
       def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false)
         paging_enabled = false if Morpheus::Cli.windows?
+        field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+        help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
         value_found = false
         value = nil
         value_field = (option_type['config'] ? option_type['config']['valueField'] : nil) || 'value'
         default_value = option_type['defaultValue']
+        default_value = default_value['id'] if default_value && default_value.is_a?(Hash) && !default_value['id'].nil?
         # local array of options
         if option_type['selectOptions']
           # calculate from inline lambda
@@ -330,7 +363,7 @@ module Morpheus
               value = select_options[0][value_field]
             elsif option_type['required']
               print Term::ANSIColor.red, "\nMissing Required Option\n\n", Term::ANSIColor.reset
-              print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''}#{option_type['fieldName']}=] - #{option_type['description']}\n", Term::ANSIColor.reset
+              print Term::ANSIColor.red, "  * #{option_type['fieldLabel']} [-O #{help_field_key}=] - #{option_type['description']}\n", Term::ANSIColor.reset
               if select_options && select_options.size > 10
                 display_select_options(option_type, select_options.first(10))
                 puts " (#{select_options.size-1} more)"
@@ -395,7 +428,12 @@ module Morpheus
             value_found = true
           end
         end
-        return value
+
+        # wrap in object when using fieldInput
+        if value && !option_type['fieldInput'].nil?
+          value = {option_type['fieldName'].split('.').last => value, option_type['fieldInput'] => (no_prompt ? option_type['defaultInputValue'] : field_input_prompt(option_type))}
+        end
+        value
       end
 
       # this is a funky one, the user is prompted for yes/no
@@ -436,6 +474,27 @@ module Morpheus
         return value
       end
 
+      def self.field_input_prompt(option_type)
+        value_found = false
+        value = nil
+
+        input_field_label = option_type['fieldInput'].gsub(/[A-Z]/, ' \0').split(' ').collect {|it| it.capitalize}.join(' ')
+        input_field_name = option_type['fieldName'].split('.').reverse.drop(1).reverse.push(option_type['fieldInput']).join('.')
+        input_option_type = option_type.merge({'fieldName' => input_field_name, 'fieldLabel' => input_field_label, 'required' => true, 'type' => 'text'})
+
+        while !value_found do
+          print "#{input_field_label}#{option_type['defaultInputValue'] ? " [#{option_type['defaultInputValue']}]" : ''}: "
+          input = $stdin.gets.chomp!
+          value = input.empty? ? option_type['defaultInputValue'] : input
+          if input == '?'
+            help_prompt(input_option_type)
+          elsif !value.nil?
+            value_found = true
+          end
+        end
+        return value
+      end
+
       def self.generic_prompt(option_type)
         value_found = false
         value = nil
@@ -528,14 +587,62 @@ module Morpheus
         return value
       end
 
+      # file_content_prompt() prompts for source (local,repository,url) and then content or repo or.
+      # returns a Hash like {sourceType:"local",content:"yadda",contentPath:null,contentRef:null}
+      def self.file_content_prompt(option_type, options={}, api_client=nil, api_params={})
+        file_params = {}
+        options ||= {}
+        full_field_key = option_type['fieldContext'] ? "#{option_type['fieldContext']}.#{option_type['fieldName']}" : "#{option_type['fieldName']}"
+        passed_file_params = get_object_value(options, full_field_key)
+        if passed_file_params.is_a?(Hash)
+          file_params = passed_file_params
+        end
+        is_required = option_type['required']
+        if file_params['source']
+          file_params['sourceType'] = file_params.delete('source')
+        end
+        source_type = file_params['sourceType']
+        # source
+        if source_type.nil?
+          source_type = select_prompt({'fieldContext' => full_field_key, 'fieldName' => 'source', 'fieldLabel' => 'Source', 'type' => 'select', 'optionSource' => 'fileContentSource', 'required' => is_required, 'defaultValue' => (is_required ? 'local' : nil)}, api_client, {}, options[:no_prompt])
+          file_params['sourceType'] = source_type
+        end
+        # source type options
+        if source_type == "local"
+          # prompt for content
+          if file_params['content'].nil?
+            file_params['content'] = multiline_prompt({'fieldContext' => full_field_key, 'fieldName' => 'content', 'type' => 'code-editor', 'fieldLabel' => 'Content', 'required' => true})
+          end
+        elsif source_type == "url"
+          if file_params['url']
+            file_params['contentPath'] = file_params.delete('url')
+          end
+          if file_params['contentPath'].nil?
+            file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true})
+          end
+        elsif source_type == "repository"
+          if file_params['repository'].nil?
+            repository_id = select_prompt({'fieldContext' => full_field_key, 'fieldName' => 'repositoryId', 'fieldLabel' => 'Repository', 'type' => 'select', 'optionSource' => 'codeRepositories', 'required' => true}, api_client, {}, options[:no_prompt])
+            file_params['repository'] = {'id' => repository_id}
+          end
+          if file_params['contentPath'].nil?
+            file_params['contentPath'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'path', 'fieldLabel' => 'File Path', 'type' => 'text', 'required' => true})
+          end
+          if file_params['contentRef'].nil?
+            file_params['contentRef'] = generic_prompt({'fieldContext' => full_field_key, 'fieldName' => 'ref', 'fieldLabel' => 'Version Ref', 'type' => 'text'})
+          end
+        end
+        return file_params
+      end
+
       def self.help_prompt(option_type)
-        full_field_name = option_type['fieldContext'] ? (option_type['fieldContext']+'.') : ''
-        full_field_name << option_type['fieldName'].to_s
+        field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+        help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
         # an attempt at prompting help for natural options without the -O switch
         if option_type[:fmt] == :natural
-          print Term::ANSIColor.green,"  * #{option_type['fieldLabel']} [--#{full_field_name}=] ", Term::ANSIColor.reset , "#{option_type['description']}\n"
+          print Term::ANSIColor.green,"  * #{option_type['fieldLabel']} [--#{help_field_key}=] ", Term::ANSIColor.reset , "#{option_type['description']}\n"
         else
-          print Term::ANSIColor.green,"  * #{option_type['fieldLabel']} [-O #{full_field_name}=] - ", Term::ANSIColor.reset , "#{option_type['description']}\n"
+          print Term::ANSIColor.green,"  * #{option_type['fieldLabel']} [-O #{help_field_key}=] - ", Term::ANSIColor.reset , "#{option_type['description']}\n"
         end
       end
 
@@ -559,17 +666,24 @@ module Morpheus
         end
       end
 
-      def self.format_option_types_help(option_types)
+      def self.format_option_types_help(option_types, opts={})
         if option_types.empty?
-          "Available Options:\nNone\n\n"
+          "#{opts[:color]}#{opts[:title] || "Available Options:"}\nNone\n\n"
         else
-          option_lines = option_types.collect {|it| "    -O #{it['fieldName']}=\"value\"" }.join("\n")
-          "Available Options:\n#{option_lines}\n\n"
+          if opts[:include_context]
+            option_lines = option_types.sort {|it| it['displayOrder']}.collect {|it|
+              field_context = (opts[:context_map] || {})[it['fieldContext']] || it['fieldContext']
+              "    -O #{field_context && field_context != '' ? "#{field_context}." : ''}#{it['fieldName']}=\"value\""
+            }
+          else
+            option_lines = option_types.sort {|it| it['displayOrder']}.collect {|it| "    -O #{it['fieldName']}=\"value\"" }
+          end
+          "#{opts[:color]}#{opts[:title] || "Available Options:"}\n#{option_lines.join("\n")}\n\n"
         end
       end
         
-      def self.display_option_types_help(option_types)
-        puts self.format_option_types_help(option_types)
+      def self.display_option_types_help(option_types, opts={})
+        puts self.format_option_types_help(option_types, opts)
       end
 
       def self.optional_label(option_type)