morpheus-cli 4.1.14 → 4.2

data/lib/morpheus/cli/library_container_types_command.rb

@@ -556,67 +556,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
   private
 
-  def find_container_type_by_name_or_id(layout_id, val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_container_type_by_id(layout_id, val)
-    else
-      return find_container_type_by_name(layout_id, val)
-    end
-  end
-
-  def find_container_type_by_id(layout_id, id)
-    begin
-      json_response = @library_container_types_interface.get(layout_id, id.to_i)
-      return json_response['containerType']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Instance Type not found by id #{id}"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_container_type_by_name(layout_id, name)
-    container_types = @library_container_types_interface.list(layout_id, {name: name.to_s})['containerTypes']
-    if container_types.empty?
-      print_red_alert "Node Type not found by name #{name}"
-      return nil
-    elsif container_types.size > 1
-      print_red_alert "#{container_types.size} node types found by name #{name}"
-      print_container_types_table(container_types, {color: red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return container_types[0]
-    end
-  end
-
-  def print_container_types_table(container_types, opts={})
-    columns = [
-      {"ID" => lambda {|it| it['id'] } },
-      {"TECHNOLOGY" => lambda {|it| format_container_type_technology(it) } },
-      {"NAME" => lambda {|it| it['name'] } },
-      {"SHORT NAME" => lambda {|it| it['shortName'] } },
-      {"VERSION" => lambda {|it| it['containerVersion'] } },
-      {"CATEGORY" => lambda {|it| it['category'] } },
-      {"OWNER" => lambda {|it| it['account'] ? it['account']['name'] : '' } }
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(container_types, columns, opts)
-  end
-
-  def format_container_type_technology(container_type)
-    if container_type
-      container_type['provisionType'] ? container_type['provisionType']['name'] : ''
-    else
-      ""
-    end
-  end
+  ## finders are in LibraryHelper
 
+  ## these layout methods should be consolidated as well
 
   def find_layout_by_name_or_id(instance_type_id, val)
     if val.to_s =~ /\A\d{1,}\Z/

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -244,9 +244,17 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     options = {}
     params = {}
     logo_file = nil
+    option_type_ids = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage()
+      opts.banner = subcommand_usage("[name]")
       build_option_type_options(opts, options, add_instance_type_option_types())
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          option_type_ids = []
+        else
+          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a new instance type."
     end
@@ -284,6 +292,17 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params['hasSettings'] = ['on','true','1'].include?(params['hasSettings'].to_s) if params.key?('hasSettings')
         params['hasAutoScale'] = ['on','true','1'].include?(params['hasAutoScale'].to_s) if params.key?('hasAutoScale')
         params['hasDeployment'] = ['on','true','1'].include?(params['hasDeployment'].to_s) if params.key?('hasDeployment')
+
+        # OPTION TYPES
+        if params['optionTypes']
+          prompt_results = prompt_for_option_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
+        end
+
         payload = {instanceType: params}
         @library_instance_types_interface.setopts(options)
         if options[:dry_run]
@@ -529,6 +548,8 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
   
   private
 
+  ## finders are in LibraryHelper
+
   def add_instance_type_option_types
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},

data/lib/morpheus/cli/library_layouts_command.rb

@@ -20,6 +20,7 @@ class Morpheus::Cli::LibraryLayoutsCommand
     @api_client = establish_remote_appliance_connection(opts)
     @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
     @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
+    @library_container_types_interface = @api_client.library_container_types
     @spec_templates_interface = @api_client.library_spec_templates
     @spec_template_types_interface = @api_client.library_spec_template_types
     @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
@@ -272,8 +273,6 @@ class Morpheus::Cli::LibraryLayoutsCommand
     options = {}
     params = {}
     instance_type_id = nil
-    option_type_ids = nil
-    node_type_ids = nil
     evars = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[instance-type]")
@@ -289,27 +288,36 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.on('--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
+      opts.on("--creatable [on|off]", ['on','off'], "Creatable") do |val|
+        params['creatable'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
       opts.on('--technology CODE', String, "Technology") do |val|
         params['provisionTypeCode'] = val
       end
       opts.on('--min-memory VALUE', String, "Minimum Memory (MB)") do |val|
         params['memoryRequirement'] = val
       end
+      opts.on("--auto-scale [on|off]", ['on','off'], "Enable Scaling (Horizontal)") do |val|
+        params['hasAutoScale'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
+      opts.on("--convert-to-managed [on|off]", ['on','off'], "Supports Convert To Managed") do |val|
+        params['supportsConvertToManaged'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
       opts.on('--workflow ID', String, "Workflow") do |val|
         params['taskSetId'] = val.to_i
       end
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
-          option_type_ids = []
+          params['optionTypes'] = []
         else
-          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       opts.on('--node-types [x,y,z]', Array, "List of Node Type IDs") do |list|
         if list.nil?
-          node_type_ids = []
+          params['containerTypes'] = []
         else
-          node_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['containerTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       opts.on('--spec-templates [x,y,z]', Array, "List of Spec Templates to include in this layout, comma separated list of names or IDs.") do |list|
@@ -319,7 +327,6 @@ class Morpheus::Cli::LibraryLayoutsCommand
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
-      #build_option_type_options(opts, options, add_layout_option_types())
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a new layout." + "\n" +
                     "[instance-type] is required and can be passed as --instance-type instead."
@@ -350,8 +357,6 @@ class Morpheus::Cli::LibraryLayoutsCommand
       if options[:payload]
         payload = options[:payload]
       else
-        # v_prompt = Morpheus::Cli::OptionTypes.prompt(add_layout_option_types, options[:options], @api_client, options[:params])
-        # params.deep_merge!(v_prompt)
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         
         if !params['name']
@@ -366,6 +371,10 @@ class Morpheus::Cli::LibraryLayoutsCommand
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false}], options[:options])
           params['description'] = v_prompt['description'] if v_prompt['description']
         end
+        if params['creatable'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'creatable', 'type' => 'checkbox', 'fieldLabel' => 'Creatable', 'defaultValue' => 'on'}], options[:options])
+          params['creatable'] = ['true','on'].include?(v_prompt['creatable'].to_s) if v_prompt['creatable'] != nil
+        end
 
         provision_types = @provision_types_interface.list({customSupported: true})['provisionTypes']
         if provision_types.empty?
@@ -386,7 +395,14 @@ class Morpheus::Cli::LibraryLayoutsCommand
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'memoryRequirement', 'type' => 'text', 'fieldLabel' => 'Min Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image'}], options[:options])
           params['memoryRequirement'] = v_prompt['memoryRequirement'] if v_prompt['memoryRequirement']
         end
-
+        if params['hasAutoScale'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hasAutoScale', 'type' => 'checkbox', 'fieldLabel' => 'Enable Scaling (Horizontal)'}], options[:options])
+          params['hasAutoScale'] = ['true','on'].include?(v_prompt['hasAutoScale'].to_s) if v_prompt['hasAutoScale'] != nil
+        end
+        if params['supportsConvertToManaged'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'supportsConvertToManaged', 'type' => 'checkbox', 'fieldLabel' => 'Supports Convert To Managed'}], options[:options])
+          params['supportsConvertToManaged'] = ['true','on'].include?(v_prompt['supportsConvertToManaged'].to_s) if v_prompt['supportsConvertToManaged'] != nil
+        end        
         if !params['taskSetId']
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSetId', 'type' => 'text', 'fieldLabel' => 'Workflow ID', 'required' => false, 'description' => 'Worflow ID'}], options[:options])
           params['taskSetId'] = v_prompt['taskSetId'].to_i if v_prompt['taskSetId']
@@ -400,17 +416,19 @@ class Morpheus::Cli::LibraryLayoutsCommand
         end
 
         # OPTION TYPES
-        if option_type_ids
-          params['optionTypes'] = option_type_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+        prompt_results = prompt_for_option_types(params, options, @api_client)
+        if prompt_results[:success]
+          params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
         else
-          # prompt
+          return 1
         end
 
         # NODE TYPES
-        if node_type_ids
-          params['containerTypes'] = node_type_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+        prompt_results = prompt_for_container_types(params, options, @api_client)
+        if prompt_results[:success]
+          params['containerTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
         else
-          # prompt
+          return 1
         end
 
         # SPEC TEMPLATES
@@ -452,8 +470,6 @@ class Morpheus::Cli::LibraryLayoutsCommand
     options = {}
     params = {}
     instance_type_id = nil
-    option_type_ids = nil
-    node_type_ids = nil
     evars = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
@@ -466,27 +482,36 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.on('--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
-      # opts.on('--technology CODE', String, "Technology") do |val|
-      #   params['provisionTypeCode'] = val
-      # end
+      opts.on("--creatable [on|off]", ['on','off'], "Creatable") do |val|
+        params['creatable'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
+      opts.on('--technology CODE', String, "Technology") do |val|
+        params['provisionTypeCode'] = val
+      end
       opts.on('--min-memory VALUE', String, "Minimum Memory (MB)") do |val|
         params['memoryRequirement'] = val
       end
+      opts.on("--auto-scale [on|off]", ['on','off'], "Enable Scaling (Horizontal)") do |val|
+        params['hasAutoScale'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
+      opts.on("--convert-to-managed [on|off]", ['on','off'], "Supports Convert To Managed") do |val|
+        params['supportsConvertToManaged'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
       opts.on('--workflow ID', String, "Workflow") do |val|
         params['taskSetId'] = val.to_i
       end
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
-          option_type_ids = []
+          params['optionTypes'] = []
         else
-          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       opts.on('--node-types [x,y,z]', Array, "List of Node Type IDs") do |list|
         if list.nil?
-          node_type_ids = []
+          params['containerTypes'] = []
         else
-          node_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['containerTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       opts.on('--spec-templates [x,y,z]', Array, "List of Spec Templates to include in this layout, comma separated list of names or IDs.") do |list|
@@ -496,7 +521,6 @@ class Morpheus::Cli::LibraryLayoutsCommand
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
-      #build_option_type_options(opts, options, update_layout_option_types())
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.footer = "Update a layout."
     end
@@ -513,8 +537,6 @@ class Morpheus::Cli::LibraryLayoutsCommand
       if options[:payload]
         payload = options[:payload]
       else
-        # option_types = update_layout_option_types(instance_type)
-        # params = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         
         # ENVIRONMENT VARIABLES
@@ -525,17 +547,23 @@ class Morpheus::Cli::LibraryLayoutsCommand
         end
 
         # OPTION TYPES
-        if option_type_ids
-          params['optionTypes'] = option_type_ids.collect {|it| it.to_i }.select { |it| it != 0 }
-        else
-          # prompt
+        if params['optionTypes']
+          prompt_results = prompt_for_option_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
         end
 
         # NODE TYPES
-        if node_type_ids
-          params['containerTypes'] = node_type_ids.collect {|it| it.to_i }.select { |it| it != 0 }
-        else
-          # prompt
+        if params['containerTypes']
+          prompt_results = prompt_for_container_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['containerTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
         end
 
         # SPEC TEMPLATES
@@ -549,8 +577,7 @@ class Morpheus::Cli::LibraryLayoutsCommand
         end
 
         if params.empty?
-          puts optparse
-          exit 1
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
 
         payload = {'instanceTypeLayout' => params}
@@ -685,31 +712,4 @@ class Morpheus::Cli::LibraryLayoutsCommand
     val.to_s # .capitalize
   end
 
-  def add_layout_option_types
-    [
-      # {'fieldName' => 'instanceTypeId', 'fieldLabel' => 'Instance Type ID', 'type' => 'text', 'required' => true, 'displayOrder' => 2, 'description' => 'The instance type this layout belongs to'},
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => true, 'displayOrder' => 2, 'description' => 'Useful shortcode for provisioning naming schemes and export reference.'},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 3},
-      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'select', 'optionSource' => 'categories', 'required' => true, 'displayOrder' => 4},
-      {'fieldName' => 'logo', 'fieldLabel' => 'Icon File', 'type' => 'text', 'displayOrder' => 5},
-      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 6},
-      {'fieldName' => 'environmentPrefix', 'fieldLabel' => 'Environment Prefix', 'type' => 'text', 'displayOrder' => 7, 'description' => 'Used for exportable environment variables when tying instance types together in app contexts. If not specified a name will be generated.'},
-      {'fieldName' => 'hasSettings', 'fieldLabel' => 'Enable Settings', 'type' => 'checkbox', 'displayOrder' => 8},
-      {'fieldName' => 'hasAutoScale', 'fieldLabel' => 'Enable Scaling (Horizontal)', 'type' => 'checkbox', 'displayOrder' => 9},
-      {'fieldName' => 'hasDeployment', 'fieldLabel' => 'Supports Deployments', 'type' => 'checkbox', 'displayOrder' => 10, 'description' => 'Requires a data volume be configured on each version. Files will be copied into this location.'}
-    ]
-  end
-
-  def update_layout_option_types(instance_type=nil)
-    if instance_type
-      opts = add_layout_option_types
-      opts.find {|opt| opt['fieldName'] == 'name'}['defaultValue'] = instance_type['name']
-      opts
-    else
-      add_layout_option_types
-    end
-  end
-
-
 end

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -31,8 +31,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :dry_run, :json, :remote])
-      opts.footer = "This outputs a list of custom Option List records."
+      build_standard_list_options(opts, options)
+      opts.footer = "List option lists."
     end
     optparse.parse!(args)
     connect(options)
@@ -46,11 +46,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
       end
 
       json_response = @option_type_lists_interface.list(params)
-
-      if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
-      end
+      render_result = render_with_format(json_response, options, 'optionTypeLists')
+      return 0 if render_result
 
       option_type_lists = json_response['optionTypeLists']
       subtitles = []
@@ -68,17 +65,20 @@ class Morpheus::Cli::LibraryOptionListsCommand
             size: option_type_list['listItems'] ? option_type_list['listItems'].size : ''
           }
         end
+          columns = [
+          :id,
+          :name,
+          :description,
+          :type,
+          :size
+        ]
+        print cyan
+        print as_pretty_table(rows, columns, options)
+        print reset
+        print_results_pagination(json_response)
       end
-      columns = [
-        :id,
-        :name,
-        :description,
-        :type,
-        :size
-      ]
-      print cyan
-      print as_pretty_table(rows, columns, options)
       print reset,"\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -87,35 +87,41 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   def get(args)
     options = {}
-    optparse = Morpheus::Cli::OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
-      opts.footer = "This outputs details about a particular Option List."
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about an option list.\n" + 
+                    "[name] is required. This is the name or id of an option list. Supports 1-N [name] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
-      puts optparse
-      exit 1
+      raise_command_error "wrong number of arguments, expected 1-N and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
     end
-
     connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+  
+  def _get(id, options)
+    
     begin
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @option_type_lists_interface.dry.get(args[0].to_i)
+        if id.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @option_type_lists_interface.dry.get(id.to_i)
         else
-          print_dry_run @option_type_lists_interface.dry.list({name: args[0]})
+          print_dry_run @option_type_lists_interface.dry.list({name: id})
         end
         return
       end
-      option_type_list = find_option_type_list_by_name_or_id(args[0])
-      exit 1 if option_type_list.nil?
+      option_type_list = find_option_type_list_by_name_or_id(id)
+      return 1 if option_type_list.nil?
 
-      if options[:json]
-        print JSON.pretty_generate({optionTypeList: option_type_list}), "\n"
-        return
-      end
+      json_response = {'optionTypeList' => option_type_list}
+      render_result = render_with_format(json_response, options, 'optionTypeList')
+      return 0 if render_result
 
       print_h1 "Option List Details", options
       print cyan
@@ -127,7 +133,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "Type" => lambda {|it| it['type'].to_s.capitalize },
         }, option_type_list)
         # print_h2 "Initial Dataset"
-        # print bright_black,"#{option_type_list['initialDataset']}","\n",reset
+        # print reset,"#{option_type_list['initialDataset']}","\n",reset
       else
         option_list_columns = {
           "ID" => 'id',
@@ -154,11 +160,11 @@ class Morpheus::Cli::LibraryOptionListsCommand
         end
         if !option_type_list['initialDataset'].empty?
           print_h2 "Initial Dataset"
-          print bright_black,"#{option_type_list['initialDataset']}","\n",reset
+          print reset,"#{option_type_list['initialDataset']}","\n",reset
         end
         if !option_type_list['translationScript'].empty?
           print_h2 "Translation Script"
-          print bright_black,"#{option_type_list['translationScript']}","\n",reset
+          print reset,"#{option_type_list['translationScript']}","\n",reset
         end
       end
       print_h2 "List Items"
@@ -176,8 +182,6 @@ class Morpheus::Cli::LibraryOptionListsCommand
   end
 
   def add(args)
-    # JD: this is annoying because our option_types (for prompting and help)
-    # are the same type of object being managed here.., options options options
     options = {}
     my_option_types = nil
     list_type = nil
@@ -189,7 +193,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
         # options[:options]['type'] = val
       end
       build_option_type_options(opts, options, new_option_type_list_option_types())
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      build_standard_add_options(opts, options)
+      opts.footer = "Create a new option list."
     end
     optparse.parse!(args)
     
@@ -222,9 +227,6 @@ class Morpheus::Cli::LibraryOptionListsCommand
             params['config']['sourceHeaders'] = source_headers
           end
         end
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
         list_payload = params
         payload = {'optionTypeList' => list_payload}
       end
@@ -234,10 +236,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
         return
       end
       json_response = @option_type_lists_interface.create(payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
-      end
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
       option_type_list = json_response['optionTypeList']
       print_green_success "Added Option List #{option_type_list['name']}"
       get([option_type_list['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
@@ -249,13 +249,13 @@ class Morpheus::Cli::LibraryOptionListsCommand
   end
 
   def update(args)
-    # JD: this is annoying because our option_types (for prompting and help)
-    # are the same type of object being managed here.., options options options
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_option_type_list_option_types())
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      build_standard_update_options(opts, options)
+      opts.footer = "Update an option list.\n" +
+                    "[name] is required. This is the name or id of an option list."
     end
     optparse.parse!(args)
     connect(options)
@@ -304,15 +304,13 @@ class Morpheus::Cli::LibraryOptionListsCommand
         return
       end
       json_response = @option_type_lists_interface.update(option_type_list['id'], payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
-      end
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
       print_green_success "Updated Option List #{list_payload['name']}"
       get([option_type_list['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
@@ -320,7 +318,9 @@ class Morpheus::Cli::LibraryOptionListsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      build_standard_remove_options(opts, options)
+      opts.footer = "Delete an option list.\n" +
+                    "[name] is required. This is the name or id of an option list."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -342,11 +342,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
         return
       end
       json_response = @option_type_lists_interface.destroy(option_type_list['id'])
-
-      if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
-      end
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
 
       print_green_success "Removed Option List #{option_type_list['name']}"
       #list([])
@@ -479,7 +476,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   def get_available_option_list_types
     [
-      {'name' => 'Rest', 'value' => 'rest'}, 
+      {'name' => 'REST', 'value' => 'rest'}, 
+      {'name' => 'Morpheus Api', 'value' => 'api'}, 
       {'name' => 'Manual', 'value' => 'manual'}
     ]
   end
@@ -494,18 +492,33 @@ class Morpheus::Cli::LibraryOptionListsCommand
         {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
         {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
         #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
+        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 3},
         {'fieldName' => 'sourceUrl', 'fieldLabel' => 'Source Url', 'type' => 'text', 'required' => true, 'description' => "A REST URL can be used to fetch list data and is cached in the appliance database.", 'displayOrder' => 4},
         {'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 5},
         {'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 6},
         {'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 7},
+        # sourceHeaders component (is done afterwards manually)
         {'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 8},
         {'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 9},
+        {'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 10},
+
+      ]
+    elsif list_type.to_s.downcase == 'api'
+      [
+        {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+        {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
+        #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Rest', 'value' => 'rest'}, {'name' => 'Manual', 'value' => 'manual'}], 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
+        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 3},
+        {'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api list to use, eg. clouds, servers, etc.', 'displayOrder' => 6},
+        {'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 9},
+        {'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 10},
       ]
     elsif list_type.to_s.downcase == 'manual'
       [
         {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
         {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
         #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Rest', 'value' => 'rest'}, {'name' => 'Manual', 'value' => 'manual'}], 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
+        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 3},
         {'fieldName' => 'initialDataset', 'fieldLabel' => 'Dataset', 'type' => 'code-editor', 'required' => true, 'description' => "Create an initial JSON or CSV dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'.", 'displayOrder' => 4},
       ]
     else