morpheus-cli 5.5.1.5 → 5.5.2.1

data/lib/morpheus/cli/commands/library_layouts_command.rb

@@ -51,6 +51,12 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.on('--technology VALUE', String, "Filter by technology") do |val|
         params['provisionType'] = val
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List layouts."
     end
@@ -173,6 +179,7 @@ EOT
       "Version" => lambda {|it| it['instanceVersion'] },
       "Description" => lambda {|it| it['description'] },
       "Technology" => lambda {|it| format_layout_technology(it) },
+      "Labels" => lambda {|it| format_list(it['labels'], '') },
       "Min Memory" => lambda {|it| 
         if it['memoryRequirement'].to_i != 0
           (it['memoryRequirement'].to_i / (1024*1024)).to_s + " MB"
@@ -204,7 +211,18 @@ EOT
     description_cols.delete("Tfvar Secret") if !(layout['provisionType'] && layout['provisionType']['code'] == 'terraform')
     print_description_list(description_cols, layout)
 
-    
+    price_sets = layout['priceSets']
+      if price_sets && price_sets.size > 0
+        print_h2 "Price Sets"
+        price_set_columns = [
+          {"ID" => lambda {|it| it['id'] } },
+          {"NAME" => lambda {|it| it['name'] } },
+          {"PRICE UNIT" => lambda {|it| it['priceUnit'] } },
+        ]
+        print as_pretty_table(price_sets, price_set_columns)
+      else
+        # print cyan,"No price sets found for this instance type.","\n",reset
+      end
 
     layout_evars = layout['environmentVariables']
     if layout_evars && layout_evars.size > 0
@@ -295,6 +313,9 @@ EOT
       opts.on('--name VALUE', String, "Name for this layout") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('--version VALUE', String, "Version") do |val|
         params['instanceVersion'] = val
       end
@@ -343,6 +364,9 @@ EOT
       opts.on('--tfvar-secret VALUE', String, "Tfvar Secret name, eg. 'tfvars/dev-key'") do |val|
         params['tfvarSecret'] = val == 'null' ? nil : val
       end
+      opts.on('--price-sets [LIST]', Array, 'Price set(s), comma separated list of price set IDs') do |list|
+        params['priceSets'] = list.collect {|it| it.to_s.strip.empty? || !it.to_i ? nil : it.to_s.strip}.compact.uniq.collect {|it| {'id' => it.to_i}}
+      end
       add_perms_options(opts, options, layout_permission_excludes)
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
@@ -511,6 +535,9 @@ EOT
       opts.on('--name VALUE', String, "Name for this layout") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('--version VALUE', String, "Version") do |val|
         params['instanceVersion'] = val
       end
@@ -559,6 +586,9 @@ EOT
       opts.on('--tfvar-secret VALUE', String, "Tfvar Secret name, eg. 'tfvars/dev-key'") do |val|
         params['tfvarSecret'] = val == 'null' ? nil : val
       end
+      opts.on('--price-sets [LIST]', Array, 'Price set(s), comma separated list of price set IDs') do |list|
+        params['priceSets'] = list.collect {|it| it.to_s.strip.empty? || !it.to_i ? nil : it.to_s.strip}.compact.uniq.collect {|it| {'id' => it.to_i}}
+      end
       add_perms_options(opts, options, layout_permission_excludes)
       build_standard_update_options(opts, options)
             opts.footer = <<-EOT
@@ -792,6 +822,7 @@ EOT
       {"VERSION" => lambda {|layout| layout['instanceVersion'] } },
       {"TECHNOLOGY" => lambda {|layout| format_layout_technology(layout) } },
       {"DESCRIPTION" => lambda {|layout| layout['description'] } },
+      {"LABELS" => lambda {|layout| format_list(layout['labels'], '', 3) } },
       {"OWNER" => lambda {|layout| layout['account'] ? layout['account']['name'] : '' } }
     ]
     if opts[:include_fields]

data/lib/morpheus/cli/commands/library_option_lists_command.rb

@@ -25,8 +25,15 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   def list(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List option lists."
     end
@@ -37,7 +44,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
     end
     connect(options)
     begin
-      params = {}
+      
       params.merge!(parse_list_options(options))
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
@@ -60,6 +67,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           {
             id: option_type_list['id'],
             name: option_type_list['name'],
+            labels: option_type_list['labels'],
             description: option_type_list['description'],
             type: ((option_type_list['type'] == 'api') ? "#{option_type_list['type']} (#{option_type_list['apiType']})" : option_type_list['type'])
           }
@@ -67,6 +75,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           columns = [
           :id,
           :name,
+          {:labels => {:display_method => lambda {|it| format_list(it[:labels], '', 3) rescue '' }}},
           :description,
           :type
         ]
@@ -142,6 +151,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "ID" => 'id',
           "Name" => 'name',
           "Description" => 'description',
+          "Labels" => lambda {|it| format_list(it['labels']) },
           "Type" => lambda {|it| it['type'].to_s.capitalize },
         }, option_type_list)
         # print_h2 "Initial Dataset"
@@ -151,6 +161,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "ID" => 'id',
           "Name" => 'name',
           "Description" => 'description',
+          "Labels" => lambda {|it| format_list(it['labels']) },
           "Type" => lambda {|it| it['type'] },
           "API Type" => lambda {|it| it['apiType'] },
           "Source URL" => 'sourceUrl',
@@ -420,24 +431,25 @@ class Morpheus::Cli::LibraryOptionListsCommand
         # rest
         {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
         {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-        {'code' => 'optionTypeList.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'description' => 'Option List Type. eg. rest, api, ldap, manual', 'displayOrder' => 3},
-        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 4},
-        {'dependsOnCode' => 'optionTypeList.type:rest', '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' => 5},
-        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 6},
-        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
-        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 8},
-        {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 9, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
-        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "A Basic Auth Username for use when type is 'rest'.", 'displayOrder' => 9, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password,oauth2"},
-        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'servicePassword', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => "A Basic Auth Password for use when type is 'rest'.", 'displayOrder' => 10, "credentialFieldContext" => 'credential', "credentialFieldName" => 'password', "credentialType" => "username-password,oauth2"},
+        {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
+        {'code' => 'optionTypeList.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'description' => 'Option List Type. eg. rest, api, ldap, manual', 'displayOrder' => 4},
+        {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 5},
+        {'dependsOnCode' => 'optionTypeList.type:rest', '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' => 6},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 8},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 9},
+        {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 10, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "A Basic Auth Username for use when type is 'rest'.", 'displayOrder' => 11, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password,oauth2"},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'servicePassword', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => "A Basic Auth Password for use when type is 'rest'.", 'displayOrder' => 12, "credentialFieldContext" => 'credential', "credentialFieldName" => 'password', "credentialType" => "username-password,oauth2"},
         # sourceHeaders component (is done afterwards manually)
-        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api option list to use, eg. clouds, environments, groups, instances, instance-wiki, networks, servicePlans, resourcePools, securityGroups, servers, server-wiki', 'displayOrder' => 10},
-        {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 9, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 11, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password"},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'servicePassword', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 12, "credentialFieldContext" => 'credential', "credentialFieldName" => 'password', "credentialType" => "username-password"},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 13},
-        {'dependsOnCode' => 'optionTypeList.type:rest|api|manual', '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' => 14, 'dataType' => 'string'},
-        {'dependsOnCode' => 'optionTypeList.type:rest|api|ldap', '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' => 15, 'dataType' => 'string'},
-        {'dependsOnCode' => 'optionTypeList.type:rest|api', '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' => 16, 'dataType' => 'string'},
+        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api option list to use, eg. clouds, environments, groups, instances, instance-wiki, networks, servicePlans, resourcePools, securityGroups, servers, server-wiki', 'displayOrder' => 13},
+        {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 14, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 15, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password"},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'servicePassword', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 16, "credentialFieldContext" => 'credential', "credentialFieldName" => 'password', "credentialType" => "username-password"},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 17},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api|manual', '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' => 18, 'dataType' => 'string'},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api|ldap', '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' => 19, 'dataType' => 'string'},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api', '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' => 20, 'dataType' => 'string'},
       ]
 
   end

data/lib/morpheus/cli/commands/library_option_types_command.rb

@@ -25,19 +25,26 @@ class Morpheus::Cli::LibraryOptionTypesCommand
 
   def list(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List option types."
     end
     optparse.parse!(args)
     # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      options[:phrase] = args.join(" ")
+      params[:phrase] = args.join(" ")
     end
     connect(options)
     
-    params = {}
+    
     params.merge!(parse_list_options(options))
     @option_types_interface.setopts(options)
     if options[:dry_run]
@@ -60,6 +67,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
             id: option_type['id'],
             name: option_type['name'],
             type: option_type['type'],
+            labels: option_type['labels'],
             fieldLabel: option_type['fieldLabel'],
             fieldName: option_type['fieldName'],
             default: option_type['defaultValue'],
@@ -71,9 +79,10 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         print as_pretty_table(rows, [
           :id,
           :name,
+          {:labels => {:display_method => lambda {|it| format_list(it[:labels], '', 3) rescue '' }}},
           :type,
-          {:fieldLabel => {:display_name => "Field Label"} },
-          {:fieldName => {:display_name => "Field Name"} },
+          {:fieldLabel => {:display_name => "FIELD LABEL"} },
+          {:fieldName => {:display_name => "FIELD NAME"} },
           :default,
           :required,
           :export,
@@ -126,6 +135,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       columns = {
         "ID" => 'id',
         "Name" => 'name',
+        "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
         "Description" => 'description',
         "Field Label" => 'fieldLabel',
         # "Field Context" => 'fieldContext',
@@ -151,6 +161,9 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       build_option_type_options(opts, options, new_option_type_option_types)
       build_standard_add_options(opts, options)
       opts.footer = "Create a new option type."
@@ -195,6 +208,9 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       build_option_type_options(opts, options, update_option_type_option_types)
       build_standard_update_options(opts, options)
       opts.footer = "Update an option type.\n" +
@@ -286,16 +302,17 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldName' => 'fieldName', 'fieldLabel' => 'Field Name', 'type' => 'text', 'required' => true, 'description' => 'This is the input property that the value gets assigned to.', 'displayOrder' => 3},
-      {'code' => 'optionType.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Text', 'value' => 'text'}, {'name' => 'Password', 'value' => 'password'}, {'name' => 'Number', 'value' => 'number'}, {'name' => 'Checkbox', 'value' => 'checkbox'}, {'name' => 'Select', 'value' => 'select'}, {'name' => 'Hidden', 'value' => 'hidden'}], 'defaultValue' => 'text', 'required' => true, 'displayOrder' => 4},
-      {'fieldName' => 'optionList', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'optionTypeLists', 'required' => true, 'dependsOnCode' => 'optionType.type:select', 'description' => "The Option List to be the source of options when type is 'select'.", 'displayOrder' => 5},
-      {'fieldName' => 'fieldLabel', 'fieldLabel' => 'Field Label', 'type' => 'text', 'required' => true, 'description' => 'This is the input label that shows typically to the left of a custom option.', 'displayOrder' => 6},
-      {'fieldName' => 'placeHolder', 'fieldLabel' => 'Placeholder', 'type' => 'text', 'displayOrder' => 7},
-      {'fieldName' => 'helpBlock', 'fieldLabel' => 'Help Block', 'type' => 'text', 'description' => 'This is the explaination of the input that shows typically underneath the option.', 'displayOrder' => 8},
-      {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 9},
-      {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 10},
-      {'fieldName' => 'exportMeta', 'fieldLabel' => 'Export As Tag', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Export as Tag.', 'displayOrder' => 11},
-      {'fieldName' => 'verifyPattern', 'fieldLabel' => 'Verify Pattern', 'type' => 'text', 'dependsOnCode' => 'optionType.type:text', 'description' => 'A regexp string that validates the input, use (?i) to make the matcher case insensitive', 'displayOrder' => 12},
+      {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }, 'displayOrder' => 3},
+      {'fieldName' => 'fieldName', 'fieldLabel' => 'Field Name', 'type' => 'text', 'required' => true, 'description' => 'This is the input property that the value gets assigned to.', 'displayOrder' => 4},
+      {'code' => 'optionType.type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Text', 'value' => 'text'}, {'name' => 'Password', 'value' => 'password'}, {'name' => 'Number', 'value' => 'number'}, {'name' => 'Checkbox', 'value' => 'checkbox'}, {'name' => 'Select', 'value' => 'select'}, {'name' => 'Hidden', 'value' => 'hidden'}], 'defaultValue' => 'text', 'required' => true, 'displayOrder' => 5},
+      {'fieldName' => 'optionList', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'optionTypeLists', 'required' => true, 'dependsOnCode' => 'optionType.type:select', 'description' => "The Option List to be the source of options when type is 'select'.", 'displayOrder' => 6},
+      {'fieldName' => 'fieldLabel', 'fieldLabel' => 'Field Label', 'type' => 'text', 'required' => true, 'description' => 'This is the input label that shows typically to the left of a custom option.', 'displayOrder' => 7},
+      {'fieldName' => 'placeHolder', 'fieldLabel' => 'Placeholder', 'type' => 'text', 'displayOrder' => 8},
+      {'fieldName' => 'helpBlock', 'fieldLabel' => 'Help Block', 'type' => 'text', 'description' => 'This is the explaination of the input that shows typically underneath the option.', 'displayOrder' => 9},
+      {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 10},
+      {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 11},
+      {'fieldName' => 'exportMeta', 'fieldLabel' => 'Export As Tag', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Export as Tag.', 'displayOrder' => 12},
+      {'fieldName' => 'verifyPattern', 'fieldLabel' => 'Verify Pattern', 'type' => 'text', 'dependsOnCode' => 'optionType.type:text', 'description' => 'A regexp string that validates the input, use (?i) to make the matcher case insensitive', 'displayOrder' => 13},
     ]
   end
 

data/lib/morpheus/cli/commands/library_spec_templates_command.rb

@@ -21,6 +21,12 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List spec templates."
     end
@@ -54,6 +60,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
         columns = [
           {"ID" => lambda {|resource_spec| resource_spec['id'] } },
           {"NAME" => lambda {|resource_spec| resource_spec['name'] } },
+          {"LABELS" => lambda {|it| format_list(it['labels'], '', 3) rescue '' }},
           {"TYPE" => lambda {|resource_spec| resource_spec['type']['name'] rescue '' } },
           {"SOURCE" => lambda {|resource_spec| resource_spec['file']['sourceType'] rescue '' } },
           {"CREATED" => lambda {|resource_spec| format_local_dt(resource_spec['dateCreated']) } },
@@ -121,6 +128,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       description_cols = {
         "ID" => lambda {|it| it['id'] },
         "Name" => lambda {|it| it['name'] },
+        "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
         "Type" => lambda {|it| it['type']['name'] rescue '' },
         "Source" => lambda {|it| it['file']['sourceType'] rescue '' },
         #"Owner" => lambda {|it| it['account'] ? it['account']['name'] : '' },
@@ -183,6 +191,9 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-t', '--type TYPE', "Spec Template Type. i.e. arm, cloudFormation, helm, kubernetes, oneview, terraform, ucs") do |val|
         template_type = val.to_s
       end
@@ -336,6 +347,9 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-t', '--type TYPE', "Spec Template Type. kubernetes, helm, terraform, cloudFormation") do |val|
         template_type = val.to_s
       end

data/lib/morpheus/cli/commands/library_upgrades_command.rb

@@ -429,14 +429,14 @@ class Morpheus::Cli::LibraryUpgradesCommand
 
         # OPTION TYPES
         if option_type_ids
-          params['optionTypes'] = option_type_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['optionTypes'] = option_type_ids.collect {|it| it.to_i }
         else
           # prompt
         end
 
         # NODE TYPES
         if node_type_ids
-          params['containerTypes'] = node_type_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['containerTypes'] = node_type_ids.collect {|it| it.to_i }
         else
           # prompt
         end

data/lib/morpheus/cli/commands/network_pool_server_types.rb

@@ -0,0 +1,20 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::NetworkPoolServerTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::InfrastructureHelper
+
+  set_command_description "View network pool server types"
+  set_command_name :'network-pool-server-types'
+  register_subcommands :list, :get
+
+  # hidden in favor of get-type and list-types
+  set_command_hidden
+
+  # register_interfaces :network_pool_server_types
+
+  protected
+
+end
+