morpheus-cli 5.5.1.4 → 5.5.2

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

@@ -173,6 +173,8 @@ EOT
       Morpheus::Cli::Roles
     when "wikipage","wiki"
       Morpheus::Cli::WikiCommand
+    when "clients"
+      Morpheus::Cli::ClientsCommand
     else
       nil
     end

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

@@ -18,6 +18,7 @@ class Morpheus::Cli::SecurityGroups
     @options_interface = @api_client.options
     @active_security_group = ::Morpheus::Cli::SecurityGroups.load_security_group_file
     @network_security_servers = @api_client.network_security_servers
+    @network_servers = @api_client.network_servers
   end
 
   def handle(args)
@@ -26,57 +27,35 @@ class Morpheus::Cli::SecurityGroups
 
 
   def list(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List security groups."
     end
     optparse.parse!(args)
-    if args.count != 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
     end
     connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      @security_groups_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @security_groups_interface.dry.list(params)
-        return
-      end
-      json_response = @security_groups_interface.list(params)
-      
-      render_result = render_with_format(json_response, options, 'securityGroups')
-      return 0 if render_result
-
+    params.merge!(parse_list_options(options))
+    @security_groups_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @security_groups_interface.dry.list(params)
+      return
+    end
+    json_response = @security_groups_interface.list(params)
+    render_response(json_response, options, "securityGroups") do
+      security_groups = json_response['securityGroups']
       title = "Morpheus Security Groups"
       subtitles = []
       subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
-
-      security_groups = json_response['securityGroups']
-      
+      print_h1 title, subtitles, options
       if security_groups.empty?
         print cyan,"No security groups found.",reset,"\n"
       else
-        active_id = @active_security_group[@appliance_name.to_sym]
-        # table_color = options[:color] || cyan
-        # rows = security_groups.collect do |security_group|
-        #   {
-        #     id: security_group['id'].to_s + ((security_group['id'] == active_id.to_i) ? " (active)" : ""),
-        #     name: security_group['name'],
-        #     description: security_group['description']
-        #   }
-        # end
-
-        # columns = [
-        #   :id,
-        #   :name,
-        #   :description,
-        #   # :ports,
-        #   # :status,
-        # ]
         columns = {
           "ID" => 'id',
           "NAME" => 'name',
@@ -86,25 +65,12 @@ class Morpheus::Cli::SecurityGroups
           "SCOPED CLOUD" => lambda {|it| it['zone'] ? it['zone']['name'] : 'All' },
           "SOURCE" => lambda {|it| it['syncSource'] == 'external' ? 'SYNCED' : 'CREATED' }
         }
-        # custom pretty table columns ...
-        if options[:include_fields]
-          columns = options[:include_fields]
-        end
         print as_pretty_table(security_groups, columns, options)
-        print reset
-        if json_response['meta']
-          print_results_pagination(json_response)
-        else
-          print_results_pagination({'meta'=>{'total'=>(json_response['securityGroupCount'] ? json_response['securityGroupCount'] : security_groups.size),'size'=>security_groups.size,'max'=>(params['max']||25),'offset'=>(params['offset']||0)}})
-        end
-        # print reset
+        print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def get(args)
@@ -356,6 +322,7 @@ class Morpheus::Cli::SecurityGroups
             payload['securityGroup']['zoneId'] = v_prompt['zoneId']
 
             zone = find_cloud_by_id(payload['securityGroup']['zoneId'])
+            # networkServer needed here too? err
             if zone['securityServer']
               sec_server = @network_security_servers.get(zone['securityServer']['id'])['networkSecurityServer']
 
@@ -613,27 +580,12 @@ class Morpheus::Cli::SecurityGroups
                     "[security-group] is required. This is the name or id of the security group."
     end
     optparse.parse!(args)
-    if args.count != 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     begin
       security_group = find_security_group_by_name_or_id(args[0])
       return 1 if security_group.nil?
 
-      # load cloud
-      if cloud_id.nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: [cloud]\n#{optparse}"
-        return 1
-      end
-      cloud = find_cloud_by_name_or_id(cloud_id)
-      return 1 if cloud.nil?
-
-      if resource_pool_id
-        resource_pool = find_resource_pool_by_name_or_id(cloud['id'], resource_pool_id)
-        return 1 if resource_pool.nil?
-      end
-
       # construct payload
       passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       payload = nil
@@ -647,27 +599,63 @@ class Morpheus::Cli::SecurityGroups
           }
         }
         payload.deep_merge!({'securityGroupLocation' => passed_options})  unless passed_options.empty?
-        if cloud
-          payload['securityGroupLocation']['zoneId'] = cloud['id']
+
+        cloud = nil
+        if cloud_id
+          options[:options]['zoneId'] = cloud_id
+        end
+        # Cloud prompt
+        scoped_clouds = []
+        clouds_response = @options_interface.options_for_source('cloudsForSecurityGroup',{securityGroupId: security_group['id']})
+        if clouds_response['data']
+          clouds_response['data'].each do |it|
+            scoped_clouds << {"name" => it['name'], "value" => it['value']}
+          end
         end
+        if scoped_clouds.empty?
+          raise_command_error("Security group has 0 available clouds for adding a location", args, optparse)
+        end
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneId', 'fieldLabel' => 'Cloud', 'type' => 'select', 'selectOptions' => scoped_clouds, 'required' => true}], options[:options], @api_client)
+        payload['securityGroupLocation']['zoneId'] = v_prompt['zoneId']
+        cloud = find_cloud_by_id(payload['securityGroupLocation']['zoneId'])
+        return 1 if cloud.nil?
 
-        if cloud['securityServer']
-          if cloud['securityServer']['type'] == 'amazon'
-            if resource_pool
-              payload['securityGroupLocation']['customOptions'] = {'vpc' => resource_pool['externalId']}
-            elsif cloud['config'] && cloud['config']['vpc']
-              payload['securityGroupLocation']['customOptions'] = {'vpc' => cloud['config']['vpc']}
-            end
-          elsif cloud['securityServer']['type'] == 'azure'
-            if resource_pool
-              payload['securityGroupLocation']['customOptions'] = {'resourceGroup' => resource_pool['externalId']}
-            elsif cloud['config'] && cloud['config']['resourceGroup']
-              payload['securityGroupLocation']['customOptions'] = {'resourceGroup' => cloud['config']['resourceGroup']}
-            end
+        # parse --resource-pool
+        # if resource_pool_id
+        #   resource_pool = find_resource_pool_by_name_or_id(cloud['id'], resource_pool_id)
+        #   return 1 if resource_pool.nil?
+        # end
+
+        # Custom Options prompt
+        # securityServer is no longer used, it has been replaced by networkServer, 
+        # default to the cloud type code, since it's the same...
+        # no optionTypes returned here, so hard coded by type
+        network_server_type = cloud['networkServer'] ? cloud['networkServer']['type'] : (cloud['securityServer'] ? cloud['securityServer']['type'] : cloud["zoneType"]["code"])
+        custom_options_values = {}
+        if network_server_type == 'amazon'
+          if cloud['config'] && !cloud['config']['vpc'].to_s.empty?
+            custom_options_values.deep_merge!({'customOptions' => {'vpc' => cloud['config']['vpc']} })
+          else
+            options[:options].deep_merge!({'customOptions' => {'vpc' => resource_pool_id} }) if resource_pool_id
+            custom_options_values = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'customOptions', 'fieldName' => 'vpc', 'fieldLabel' => 'VPC', 'type' => 'select', 'optionSource' => 'zonePools', 'required' => true, 'config' => {'valueField' => 'externalId'}}], options[:options], @api_client, {zoneId: cloud['id'], ignoreDefaultPool: true})
+          end
+        elsif network_server_type == 'azure' || network_server_type == 'azurestack'
+          if cloud['config'] && !cloud['config']['resourceGroup'].to_s.empty?
+            custom_options_values.deep_merge!({'customOptions' => {'resourceGroup' => cloud['config']['resourceGroup']} })
+          else
+            options[:options].deep_merge!({'customOptions' => {'resourceGroup' => resource_pool_id} }) if resource_pool_id
+            custom_options_values = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'customOptions', 'fieldName' => 'resourceGroup', 'fieldLabel' => 'Resource Group', 'type' => 'select', 'optionSource' => 'zonePools', 'required' => true, 'config' => {'valueField' => 'externalId'}}], options[:options], @api_client, {zoneId: cloud['id'], ignoreDefaultPool: true})
+          end
+        elsif network_server_type == 'openstack' || network_server_type == 'opentelekom' || network_server_type == 'huawei'
+          if cloud['config'] && !cloud['config']['resourcePoolId'].to_s.empty?
+            custom_options_values.deep_merge!({'customOptions' => {'resourcePoolId' => cloud['config']['resourcePoolId']} })
+          else
+            options[:options].deep_merge!({'customOptions' => {'resourcePoolId' => resource_pool_id} }) if resource_pool_id
+            custom_options_values = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'customOptions', 'fieldName' => 'resourcePoolId', 'fieldLabel' => 'Resource Pool', 'type' => 'select', 'optionSource' => 'zonePools', 'required' => true}], options[:options], @api_client, {zoneId: cloud['id'], ignoreDefaultPool: true})
           end
         end
+        payload['securityGroupLocation'].deep_merge!(custom_options_values)
       end
-
       @security_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_groups_interface.dry.create_location(security_group['id'], payload)

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

@@ -0,0 +1,32 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::SecurityPackageTypesCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_description "View security_package types"
+  set_command_name :'security-package-types'
+  register_subcommands :list, :get
+
+  # register_interfaces :security_package_types
+
+  protected
+
+  def security_package_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+    }
+  end
+
+  def security_package_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+    }
+  end
+
+end
+

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

@@ -0,0 +1,84 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::SecurityPackagesCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_name :'security-packages'
+  set_command_description "View and manage security packages."
+  register_subcommands :list, :get, :add, :update, :remove
+
+  # RestCommand settings
+  register_interfaces :security_packages, :security_package_types
+  set_rest_has_type true
+  # set_rest_type :security_package_types
+
+  protected
+
+  def build_list_options(opts, options, params)
+    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)
+    super
+  end
+
+  def security_package_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Description" => 'description',
+    }
+  end
+
+  def security_package_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Description" => 'description',
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      # "Source" => 'sourceType',
+      "URL" => 'url',
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def add_security_package_option_types()
+    [
+      {'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Security Package Type', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
+        api_client.security_package_types.list({max:10000})['securityPackageTypes'].collect { |it| {"name" => it["name"], "value" => it["code"]} }
+      }, 'required' => true, 'defaultValue' => 'SCAP Package'},      
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'shorthand' => '-l', 'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'noPrompt' => true, 'processValue' => lambda {|val| parse_labels(val) }},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true},
+      # {'code' => 'securityPackage.sourceType', 'fieldName' => 'sourceType', 'fieldLabel' => 'Source', 'type' => 'select', 'selectOptions' => [{'name'=>'url','value'=>'url'}], 'defaultValue' => 'url', 'required' => true},
+      # {'code' => 'securityPackage.sourceType', 'fieldContext' => 'file', 'fieldName' => 'sourceType', 'fieldLabel' => 'Source', 'type' => 'hidden', 'defaultValue' => 'url', 'required' => true},
+      {'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true, 'description' => "URL to download the security package zip file from"},
+      # {'fieldName' => 'file', 'fieldLabel' => 'File Content', 'type' => 'file-content', 'required' => true},
+    ]
+  end
+
+  def add_security_package_advanced_option_types()
+    []
+  end
+
+  def update_security_package_option_types()
+    option_types = add_security_package_option_types.collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+    option_types.reject! {|it| it['fieldName'] == 'type' }
+    option_types
+  end
+
+  def update_security_package_advanced_option_types()
+    add_security_package_advanced_option_types().collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+  end
+
+end

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

@@ -0,0 +1,107 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::SecurityScansCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_name :'security-scans'
+  set_command_description "View and manage security scans."
+  register_subcommands :list, :get, :remove
+
+  # RestCommand settings
+  register_interfaces :security_scans, 
+                      :security_packages, :servers
+
+  # display argument as [id] since name is not supported
+  set_rest_has_name false
+  set_rest_arg "id"
+
+  protected
+
+  def build_list_options(opts, options, params)
+    opts.on('--security-package PACKAGE', String, "Filter by security package name or id") do |val|
+      options[:security_package] ||= []
+      options[:security_package] << val
+    end
+    opts.on('--server SERVER', String, "Filter by server name or id") do |val|
+      options[:server] ||= []
+      options[:server] << val
+    end
+    opts.on('--results', "Include the results object in the response under each security scan. This is a potentially very large object containing the raw results of the scan. Use with --json to see this data.") do
+      params['results'] = true
+    end
+    super
+  end
+
+  def parse_list_options!(args, options, params)
+    # parse --security-package
+    # todo: one liner with find_by_name_or_id!
+    if options[:security_package]
+      params['securityPackageId'] = options[:security_package].collect do |val|
+        record = find_by_name_or_id(:security_package, val)
+        if record.nil?
+          exit 1 #return 1, "Security Package not found by '#{val}'"
+        else 
+          record['id']
+        end
+      end
+    end
+    # parse --server
+    if options[:server]
+      params['serverId'] = options[:server].collect do |val|
+        record = find_by_name_or_id(:server, val)
+        if record.nil?
+          exit 1 # return 1, "Server not found by '#{val}'"
+        else
+          record['id']
+        end
+      end
+    end
+    super
+  end
+
+  def build_get_options(opts, options, params)
+    opts.on('--results', "Include the results object in the response under the security scan. This is a potentially very large object containing the raw results of the scan. Use with --json to see this data.") do
+      params['results'] = true
+    end
+    super
+  end
+
+  def security_scan_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Security Package" => lambda {|it| it['securityPackage']['name'] rescue '' },
+      "Type" => lambda {|it| it['securityPackage']['type']['name'] rescue '' },
+      "Server" => lambda {|it| it['server']['name'] rescue '' },
+      "Scan Date" => lambda {|it| format_local_dt(it['scanDate']) },
+      "Status" => lambda {|it| it['status'] },
+      "Score" => lambda {|it| it['scanScore'] },
+      "Results" => lambda {|it| format_security_scan_results_summary(it) },
+
+    }
+  end
+
+  def security_scan_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Security Package" => lambda {|it| it['securityPackage']['name'] rescue '' },
+      "Type" => lambda {|it| it['securityPackage']['type']['name'] rescue '' },
+      "Server" => lambda {|it| it['server']['name'] rescue '' },
+      "Scan Date" => lambda {|it| format_local_dt(it['scanDate']) },
+      "Status" => lambda {|it| it['status'] },
+      "Score" => lambda {|it| it['scanScore'] },
+      "Results" => lambda {|it| format_security_scan_results_summary(it) },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def format_security_scan_results_summary(security_scan)
+    totals = []
+    totals << "Run: #{security_scan['runCount']}" # if security_scan['runCount'].to_i > 0
+    totals << "Pass: #{security_scan['passCount']}" if security_scan['passCount'].to_i > 0
+    totals << "Fail: #{security_scan['failCount']}" if security_scan['failCount'].to_i > 0
+    totals << "Warn: #{security_scan['runCount']}" if security_scan['otherCount'].to_i > 0
+    totals.join(", ")
+  end
+end

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

@@ -249,12 +249,12 @@ class Morpheus::Cli::ServicePlanCommand
         params['editable'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       opts.on('--storage [AMOUNT]', String, "Storage size is required. Assumes GB unless optional modifier specified, ex: 512MB" ) do |val|
-        bytes = parse_bytes_param(val, '--storage', 'GB')
+        bytes = parse_bytes_param(val, '--storage', 'GB', true)
         params['maxStorage'] = bytes[:bytes]
         (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
       end
       opts.on('--memory [AMOUNT]', String, "Memory size is required. Assumes MB unless optional modifier specified, ex: 1GB" ) do |val|
-        bytes = parse_bytes_param(val, '--memory', 'MB')
+        bytes = parse_bytes_param(val, '--memory', 'MB', true)
         params['maxMemory'] = bytes[:bytes]
         (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
       end
@@ -287,25 +287,25 @@ class Morpheus::Cli::ServicePlanCommand
       end
       opts.on('--min-storage NUMBER', String, "Min storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
         # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val, '--min-storage', 'GB')
+        bytes = parse_bytes_param(val, '--min-storage', 'GB', true)
         ((params['config'] ||= {})['ranges'] ||= {})['minStorage'] = bytes[:number]
         (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
       end
       opts.on('--max-storage NUMBER', String, "Max storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
         # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val, '--max-storage', 'GB')
+        bytes = parse_bytes_param(val.to_s, '--max-storage', 'GB', true)
         ((params['config'] ||= {})['ranges'] ||= {})['maxStorage'] = bytes[:number]
         (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
       end
       opts.on('--min-memory NUMBER', String, "Min memory. Assumes MB unless optional modifier specified, ex: 1GB") do |val|
         # Memory does get converted to bytes
-        bytes = parse_bytes_param(val, '--min-memory', 'MB')
+        bytes = parse_bytes_param(val, '--min-memory', 'MB', true)
         ((params['config'] ||= {})['ranges'] ||= {})['minMemory'] = bytes[:bytes]
         (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
       end
       opts.on('--max-memory NUMBER', String, "Max memory. Assumes MB unless optional modifier specified, ex: 1GB") do |val|
         # Memory does get converted to bytes
-        bytes = parse_bytes_param(val, '--max-memory', 'MB')
+        bytes = parse_bytes_param(val, '--max-memory', 'MB', true)
         ((params['config'] ||= {})['ranges'] ||= {})['maxMemory'] = bytes[:bytes]
         (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
       end
@@ -368,9 +368,10 @@ class Morpheus::Cli::ServicePlanCommand
           while params['maxStorage'].nil? do
             begin
               bytes = parse_bytes_param(
-                  Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'storage', 'type' => 'text', 'fieldLabel' => 'Storage (GB) [can use MB modifier]', 'required' => true, 'description' => 'Storage (GB)'}],options[:options],@api_client,{}, options[:no_prompt])['storage'],
+                  Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'storage', 'type' => 'text', 'fieldLabel' => 'Storage (GB) [can use MB modifier]', 'required' => true, 'description' => 'Storage (GB)', 'defaultValue' => '0'}],options[:options],@api_client,{}, options[:no_prompt])['storage'],
                   'storage',
-                  'GB'
+                  'GB',
+                  true
               )
               params['maxStorage'] = bytes[:bytes]
               # (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
@@ -389,9 +390,10 @@ class Morpheus::Cli::ServicePlanCommand
           while params['maxMemory'].nil? do
             begin
               bytes = parse_bytes_param(
-                  Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'memory', 'type' => 'text', 'fieldLabel' => 'Memory (MB) [can use GB modifier]', 'required' => true, 'description' => 'Memory (MB)'}],options[:options],@api_client,{}, options[:no_prompt])['memory'],
+                  Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'memory', 'type' => 'text', 'fieldLabel' => 'Memory (MB) [can use GB modifier]', 'required' => true, 'description' => 'Memory (MB)', 'defaultValue' => '0'}],options[:options],@api_client,{}, options[:no_prompt])['memory'],
                   'memory',
-                  'MB'
+                  'MB',
+                  true
               )
               params['maxMemory'] = bytes[:bytes]
               # (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
@@ -479,12 +481,12 @@ class Morpheus::Cli::ServicePlanCommand
         params['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       opts.on('--storage [AMOUNT]', String, "Storage size is required. Assumes GB unless optional modifier specified, ex: 512MB" ) do |val|
-        bytes = parse_bytes_param(val, '--storage', 'GB')
+        bytes = parse_bytes_param(val, '--storage', 'GB', true)
         params['maxStorage'] = bytes[:bytes]
         (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
       end
       opts.on('--memory [AMOUNT]', String, "Memory size is required. Assumes MB unless optional modifier specified, ex: 1GB" ) do |val|
-        bytes = parse_bytes_param(val, '--memory', 'MB')
+        bytes = parse_bytes_param(val, '--memory', 'MB', true)
         params['maxMemory'] = bytes[:bytes]
         (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
       end
@@ -523,7 +525,7 @@ class Morpheus::Cli::ServicePlanCommand
       end
       opts.on('--max-storage NUMBER', String, "Max storage. Assumes GB unless optional modifier specified, ex: 512MB") do |val|
         # Storage doesn't get converted to bytes
-        bytes = parse_bytes_param(val, '--max-storage', 'GB')
+        bytes = parse_bytes_param(val, '--max-storage', 'GB', true)
         ((params['config'] ||= {})['ranges'] ||= {})['maxStorage'] = bytes[:number]
         (params['config'] ||= {})['storageSizeType'] = bytes[:unit].downcase
       end
@@ -535,7 +537,7 @@ class Morpheus::Cli::ServicePlanCommand
       end
       opts.on('--max-memory NUMBER', String, "Max memory. Assumes MB unless optional modifier specified, ex: 1GB") do |val|
         # Memory does get converted to bytes
-        bytes = parse_bytes_param(val, '--max-memory', 'MB')
+        bytes = parse_bytes_param(val, '--max-memory', 'MB', true)
         ((params['config'] ||= {})['ranges'] ||= {})['maxMemory'] = bytes[:bytes]
         (params['config'] ||= {})['memorySizeType'] = bytes[:unit].downcase
       end

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

@@ -44,11 +44,17 @@ class Morpheus::Cli::SubnetsCommand
       opts.on( '--network NETWORK', '--network NETWORK', "Filter by Network" ) do |val|
         options[:network] = 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
       opts.footer = "List subnets."
     end
     optparse.parse!(args)
     if args.count > 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     
@@ -103,6 +109,7 @@ class Morpheus::Cli::SubnetsCommand
       subnet_columns = {
         "ID" => 'id',
         "Name" => 'name',
+        "Labels" => lambda {|it| format_list(it['labels'], '', 3) },
         #"Description" => 'description',
         "Network" => lambda {|it| it['network']['name'] rescue it['network'] },
         "Type" => lambda {|it| it['type']['name'] rescue it['type'] },
@@ -170,6 +177,7 @@ class Morpheus::Cli::SubnetsCommand
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
+        "Labels" => lambda {|it| format_list(it['labels']) },
         "Description" => 'description',
         "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
         "Network" => lambda {|it| subnet['network']['name'] rescue subnet['network'] },
@@ -239,6 +247,9 @@ class Morpheus::Cli::SubnetsCommand
         # fill in silly names that vary by type
         options[:options].deep_merge!({'config' => {'subnetName' => val}})
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--cidr VALUE', String, "Name for this subnet") do |val|
         options[:options]['cidr'] = val
         # fill in silly names that vary by type
@@ -466,6 +477,9 @@ class Morpheus::Cli::SubnetsCommand
     group_defaults_list = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[subnet]")
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
         group_access_all = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end