morpheus-cli 5.4.5 → 5.5.1

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

@@ -118,10 +118,10 @@ class Morpheus::Cli::LibraryContainerTypesCommand
     begin
       @library_container_types_interface.setopts(options)
       if options[:dry_run]
-        if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @library_container_types_interface.dry.get(layout_id, arg.to_i)
+        if id.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @library_container_types_interface.dry.get(layout_id, id.to_i)
         else
-          print_dry_run @library_container_types_interface.dry.list(layout_id, {name:arg})
+          print_dry_run @library_container_types_interface.dry.list(layout_id, {name:id})
         end
         return
       end
@@ -255,6 +255,24 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.on('--technology CODE', String, "Technology. This is the provision type code.") do |val|
         params['provisionTypeCode'] = val
       end
+      opts.on('--ports NAME=PORT,NAME=PORT', String, "List of exposed port definitions in the format NAME=PORT|PROTOCOL, Example: \"WEB=80|HTTP,SECURE=443|HTTPS\"") do |val|
+        params['containerPorts'] ||= []
+        parsed_ports = val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          value_array = v.split("|")
+          port_name = k.to_s.strip
+          port_number = value_array[0].to_s.strip.to_i
+          exposed_port = {'name' => port_name,'port' => port_number }
+          if value_array[1]
+            exposed_port['loadBalanceProtocol'] = value_array[1].strip
+          end
+          if exposed_port['name'].to_s.empty? || !exposed_port['port'] || exposed_port['port'].to_i <= 0
+            raise_command_error "Invalid exposed port definition: '#{value_pair}'. Expected format is 'NAME=PORT'", args, optparse
+          end
+          params['containerPorts'] << exposed_port
+        end
+        # options[:options]['containerPorts'] = params['containerPorts']
+      end
       opts.on('--scripts x,y,z', Array, "List of Script IDs") do |val|
         script_ids = val #.collect {|it| it.to_i }
       end
@@ -345,6 +363,12 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         
         # payload.deep_merge!(provision_type_v_prompt)
         
+        # PORTS 
+        # if !params['containerPorts']
+        #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerPorts', 'type' => 'exposedPorts', 'fieldLabel' => 'Exposed Ports', 'description' => 'The exposed ports in the format NAME=PORT,NAME=PORT for example HTTP=80,HTTPS=443'}], prompt_params)
+        #   params['containerPorts'] = v_prompt['containerPorts']
+        # end
+
         # ENVIRONMENT VARIABLES
         if evars
           params['environmentVariables'] = evars
@@ -367,6 +391,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
           # prompt
         end
 
+
         # payload = {'containerType' => params}
         payload['containerType'] ||= {}
         payload['containerType'].deep_merge!(params)
@@ -422,6 +447,24 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       # opts.on('--technology CODE', String, "Technology") do |val|
       #   params['provisionTypeCode'] = val
       # end
+      opts.on('--ports NAME=PORT,NAME=PORT', String, "List of exposed port definitions in the format NAME=PORT|PROTOCOL, Example: \"WEB=80|HTTP,SECURE=443|HTTPS\"") do |val|
+        params['containerPorts'] ||= []
+        parsed_ports = val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          value_array = v.split("|")
+          port_name = k.to_s.strip
+          port_number = value_array[0].to_s.strip.to_i
+          exposed_port = {'name' => port_name,'port' => port_number }
+          if value_array[1]
+            exposed_port['loadBalanceProtocol'] = value_array[1].strip
+          end
+          if exposed_port['name'].to_s.empty? || !exposed_port['port'] || exposed_port['port'].to_i <= 0
+            raise_command_error "Invalid exposed port definition: '#{value_pair}'. Expected format is 'NAME=PORT'", args, optparse
+          end
+          params['containerPorts'] << exposed_port
+        end
+        # options[:options]['containerPorts'] = params['containerPorts']
+      end
       opts.on('--scripts x,y,z', Array, "List of Script IDs") do |val|
         script_ids = val #.collect {|it| it.to_i }
       end
@@ -455,6 +498,12 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         # params = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
         payload.deep_merge!({'containerType' => passed_options}) unless passed_options.empty?
         
+        # PORTS 
+        # if !params['containerPorts']
+        #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerPorts', 'type' => 'exposedPorts', 'fieldLabel' => 'Exposed Ports', 'description' => 'The exposed ports in the format NAME=PORT,NAME=PORT for example HTTP=80,HTTPS=443'}], prompt_params)
+        #   params['containerPorts'] = v_prompt['containerPorts']
+        # end
+
         # ENVIRONMENT VARIABLES
         if evars
 

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

@@ -156,9 +156,15 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "Source URL" => 'sourceUrl',
           "Real Time" => lambda {|it| format_boolean it['realTime'] },
           "Ignore SSL Errors" => lambda {|it| format_boolean it['ignoreSSLErrors'] },
-          "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase }
+          "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase },
+          "Credentials" => lambda {|it| it['credential'] ? (it['credential']['type'] == 'local' ? '(Local)' : it['credential']['name']) : nil },
+          "Username" => 'serviceUsername',
+          "Password" => 'servicePassword',
         }
         option_list_columns.delete("API Type") if option_type_list['type'] != 'api'
+        option_list_columns.delete("Credentials") if !['rest','ldap'].include?(option_type_list['type']) # || !(option_type_list['credential'] && option_type_list['credential']['id'])
+        option_list_columns.delete("Username") if !['rest','ldap'].include?(option_type_list['type']) || !(option_type_list['serviceUsername'])
+        option_list_columns.delete("Password") if !['rest','ldap'].include?(option_type_list['type']) || !(option_type_list['servicePassword'])
         source_headers = []
         if option_type_list['config'] && option_type_list['config']['sourceHeaders']
           source_headers = option_type_list['config']['sourceHeaders'].collect do |header|
@@ -420,14 +426,18 @@ class Morpheus::Cli::LibraryOptionListsCommand
         {'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"},
         # 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' => 9},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourceUsername', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 10},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourcePassword', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 11},
-        {'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' => 12},
-        {'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' => 13, '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' => 14, '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' => 15, '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' => 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'},
       ]
 
   end

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

@@ -36,20 +36,18 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       options[:phrase] = args.join(" ")
     end
     connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      @option_types_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @option_types_interface.dry.list(params)
-        return
-      end
+    
+    params = {}
+    params.merge!(parse_list_options(options))
+    @option_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @option_types_interface.dry.list(params)
+      return
+    end
 
-      json_response = @option_types_interface.list(params)
-
-      render_result = render_with_format(json_response, options, 'optionTypes')
-      return 0 if render_result
+    json_response = @option_types_interface.list(params)
 
+    render_response(json_response, options, "optionTypes") do
       option_types = json_response['optionTypes']
       subtitles = []
       subtitles += parse_list_subtitles(options)
@@ -84,10 +82,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         print_results_pagination(json_response)
       end
       print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
    def get(args)
@@ -110,23 +106,21 @@ class Morpheus::Cli::LibraryOptionTypesCommand
   end
 
   def _get(id, options)
-    begin
-      @option_types_interface.setopts(options)
-      if options[:dry_run]
-        if id.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @option_types_interface.dry.get(id.to_i)
-        else
-          print_dry_run @option_types_interface.dry.list({name: id})
-        end
-        return
+    
+    @option_types_interface.setopts(options)
+    if options[:dry_run]
+      if id.to_s =~ /\A\d{1,}\Z/
+        print_dry_run @option_types_interface.dry.get(id.to_i)
+      else
+        print_dry_run @option_types_interface.dry.list({name: id})
       end
-      option_type = find_option_type_by_name_or_id(id)
-      return 1 if option_type.nil?
-      json_response = {'optionType' => option_type}
-
-      render_result = render_with_format(json_response, options, 'optionType')
-      return 0 if render_result
+      return
+    end
+    option_type = find_option_type_by_name_or_id(id)
+    return 1 if option_type.nil?
+    json_response = {'optionType' => option_type}
 
+    render_response(json_response, options, "optionType") do
       print_h1 "Option Type Details"
       print cyan
       columns = {
@@ -144,15 +138,13 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         "Default Value" => 'defaultValue',
         "Required" => lambda {|it| format_boolean(it['required']) },
         "Export As Tag" => lambda {|it| it['exportMeta'].nil? ? '' : format_boolean(it['exportMeta']) },
+        "Verify Pattern" => 'verifyPattern',
       }
       columns.delete("Option List") if option_type['optionList'].nil?
       print as_description_list(option_type, columns, options)
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    return 0, nil
   end
 
   def add(args)
@@ -165,37 +157,38 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     end
     optparse.parse!(args)
     connect(options)
-    begin
-      payload = nil
-      if options[:payload]
-        payload = options[:payload]
-        payload.deep_merge!({'optionType' => parse_passed_options(options)})
-      else
-        payload = {}
-        payload.deep_merge!({'optionType' => parse_passed_options(options)})
-        option_type_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client)
-        # tweak payload for API
-        option_type_payload['optionList'] = {'id' => option_type_payload['optionList'].to_i} if option_type_payload['optionList'].is_a?(String) || option_type_payload['optionList'].is_a?(Numeric)
-        option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
-        option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
-        payload.deep_merge!({'optionType' => option_type_payload})
-      end
-      @option_types_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @option_types_interface.dry.create(payload)
-        return
-      end
-      json_response = @option_types_interface.create(payload)
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
+    verify_args!(args:args, optparse:optparse, max:1)
+    if args[0]
+      options[:options]['name'] = args[0]
+    end
+    
+    payload = nil
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'optionType' => parse_passed_options(options)})
+    else
+      payload = {}
+      payload.deep_merge!({'optionType' => parse_passed_options(options)})
+      option_type_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client)
+      # tweak payload for API
+      option_type_payload['optionList'] = {'id' => option_type_payload['optionList'].to_i} if option_type_payload['optionList'].is_a?(String) || option_type_payload['optionList'].is_a?(Numeric)
+      option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
+      option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
+      payload.deep_merge!({'optionType' => option_type_payload})
+    end
+    @option_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @option_types_interface.dry.create(payload)
+      return
+    end
+    json_response = @option_types_interface.create(payload)
+      
+    render_response(json_response, options, "optionType") do
       option_type = json_response['optionType']
       print_green_success "Added Option Type #{option_type['name']}"
-      #list([])
-      get([option_type['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      _get(option_type['id'], options)
     end
+    return 0, nil
   end
 
   def update(args)
@@ -302,6 +295,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       {'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},
     ]
   end
 

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

@@ -4,6 +4,7 @@ class Morpheus::Cli::LoadBalancers
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::RestCommand
   include Morpheus::Cli::LoadBalancersHelper
+  include Morpheus::Cli::ProvisioningHelper
 
   set_command_description "View and manage load balancers."
   set_command_name :'load-balancers'
@@ -17,10 +18,12 @@ class Morpheus::Cli::LoadBalancers
   register_interfaces :load_balancers, :load_balancer_types
   set_rest_has_type true
   # set_rest_type :load_balancer_types
+  set_rest_perms_config({enabled:true, excludes:['plans', 'visibility']})
 
   def render_response_for_get(json_response, options)
     render_response(json_response, options, rest_object_key) do
       record = json_response[rest_object_key]
+      options[:exclude_username] = record['username'].nil?
       print_h1 rest_label, [], options
       print cyan
       print_description_list(rest_column_definitions(options), record, options)
@@ -94,19 +97,7 @@ EOT
 
   # filtering for NSX-T only
   def rest_list_types()
-    rest_type_interface.list({max:10000, creatable:true})[rest_type_list_key].reject {|it| it['code'] == 'nsx-t'}
-  end
-
-  def load_balancer_type_list_to_options(type_list)
-    type_list.reject {|it| it['code'] != 'nsx-t'}.collect {|it| {'name' => it['name'], 'value' => it['code']} }
-  end
-
-  def add_load_balancer_footer_addn
-    "#{bold}Available for NSX-T load balancers only#{reset}"
-  end
-
-  def update_load_balancer_footer_addn
-    "#{bold}Available for NSX-T load balancers only#{reset}"
+    rest_type_interface.list({max:10000, creatable:true})[rest_type_list_key] # .reject {|it| it['code'] == 'nsx-t'}
   end
 
   def load_balancer_list_column_definitions(options)
@@ -120,7 +111,7 @@ EOT
   end
 
   def load_balancer_column_definitions(options)
-    {
+    columns = {
       "ID" => 'id',
       "Name" => 'name',
       "Description" => 'description',
@@ -130,13 +121,14 @@ EOT
       "IP" => 'ip',
       "Host" => 'host',
       "Port" => 'port',
-      "Username" => 'username',
-      # "SSL Enabled" => lambda {|it| format_boolean it['sslEnabled'] },
-      # "SSL Cert" => lambda {|it| it['sslCert'] ? it['sslCert']['name'] : '' },
-      # "SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" },
+      "Price" => lambda {|it| it['price'].nil? ? 'No pricing configured' : "#{format_money(it['price']['price'], it['price']['currency'])} / #{it['price']['unit'].capitalize}"},
+      "Provider ID" => 'externalId'
+    }
+    columns.merge!({"Username" => 'username'}) if !options[:exclude_username]
+    columns.merge({
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-    }
+    })
   end
 
   # overridden to work with name or code

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

@@ -209,10 +209,13 @@ class Morpheus::Cli::NetworkPoolServersCommand
           print_red_alert "Pool Server Type not found by id '#{options['type']}'"
           return 1
         end
-        payload['networkPoolServer']['type'] = {'id' => network_type_id.to_i }
 
-        # ['name', 'serviceUsername', 'servicePassword', 'servicePort', 'serviceHost', 'serviceUrl', 'serviceMode', 'networkFilter', 'tenantMatch']
+        payload['networkPoolServer']['type'] = {'id' => network_type_id.to_i }
 
+        # prompt options
+        network_pool_server_type = @network_pool_servers_interface.get_type(network_type_id.to_i)['networkPoolServerType']
+        option_result = Morpheus::Cli::OptionTypes.prompt(network_pool_server_type['optionTypes'], options[:options].deep_merge({:context_map => {'networkPoolServer' => ''}}), @api_client, {}, options[:no_prompt], true)
+        payload['networkPoolServer'].deep_merge!(option_result)
       end
 
       @network_pool_servers_interface.setopts(options)

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

@@ -238,11 +238,7 @@ class Morpheus::Cli::PricesCommand
         end
       end
       opts.on("--currency [CURRENCY]", String, "Price currency") do |val|
-        if avail_currencies.include?(val.upcase)
-          params['currency'] = val.upcase
-        else
-          raise_command_error "Unsupported currency '#{val}'. Available currencies: #{avail_currencies.join(', ')}"
-        end
+        options[:currency] = val
       end
       opts.on("--cost [AMOUNT]", Float, "Price cost") do |val|
         params['cost'] = val
@@ -269,6 +265,15 @@ class Morpheus::Cli::PricesCommand
       return 1
     end
 
+    if options[:currency]
+      if avail_currencies.include?(options[:currency].upcase)
+        params['currency'] = options[:currency].upcase
+      else
+        raise_command_error "Unsupported currency '#{options[:currency]}'. Available currencies: #{avail_currencies.join(', ')}"
+        return 1
+      end
+    end
+
     begin
       payload = parse_payload(options)
 
@@ -402,11 +407,7 @@ class Morpheus::Cli::PricesCommand
         end
       end
       opts.on("--currency [CURRENCY]", String, "Price currency") do |val|
-        if avail_currencies.include?(val.upcase)
-          params['currency'] = val.upcase
-        else
-          raise_command_error "Unsupported currency '#{val}'. Available currencies: #{avail_currencies.join(', ')}"
-        end
+        options[:currency] = val
       end
       opts.on("--cost [AMOUNT]", Float, "Price cost") do |val|
         params['cost'] = val
@@ -431,11 +432,21 @@ class Morpheus::Cli::PricesCommand
     end
     optparse.parse!(args)
     connect(options)
+
     if args.count != 1
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
       return 1
     end
 
+    if options[:currency]
+      if avail_currencies.include?(options[:currency].upcase)
+        params['currency'] = options[:currency].upcase
+      else
+        raise_command_error "Unsupported currency '#{options[:currency]}'. Available currencies: #{avail_currencies.join(', ')}"
+        return 1
+      end
+    end
+
     begin
       price = find_price(args[0])
 
@@ -608,7 +619,10 @@ class Morpheus::Cli::PricesCommand
   end
 
   def avail_currencies
-    ['CAD','EUR', 'IDR', 'XCD', 'USD', 'XOF', 'NOK', 'AUD', 'XAF', 'NZD', 'MAD', 'DKK', 'GBP', 'CHF', 'XPF', 'ILS', 'ROL', 'TRL','SEK', 'ZAR']
+    if @avail_currencies.nil?
+      @avail_currencies = @prices_interface.list_currencies()['currencies'].collect {|it| it['value']}
+    end
+    @avail_currencies
   end
 
   def prompt_for_price_type(params, options, price={})