morpheus-cli 4.2.12 → 4.2.17

data/lib/morpheus/cli/library_layouts_command.rb

@@ -652,7 +652,7 @@ EOT
     connect(options)
     exit_code, err = 0, nil
     # if !is_master_account
-    #   print_red_alert "Permissions only available for master account"
+    #   print_red_alert "Permissions only available for master tenant"
     #   return 1
     # end
     layout = find_layout_by_name_or_id(nil, args[0])

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -186,49 +186,42 @@ class Morpheus::Cli::LibraryOptionListsCommand
     my_option_types = nil
     list_type = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[type] [options]")
-      opts.on( '-t', '--type TYPE', "Option List Type. (rest, manual)" ) do |val|
-        list_type = val
-        # options[:options] ||= {}
-        # options[:options]['type'] = val
-      end
+      opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, new_option_type_list_option_types())
       build_standard_add_options(opts, options)
       opts.footer = "Create a new option list."
     end
     optparse.parse!(args)
-    
-    
+    verify_args!(args:args, optparse:optparse, max:1)
+    if args.count == 1
+      options[:options]['name'] = args[0]
+    end
+
     connect(options)
     begin
-      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if !passed_options.empty?
-          payload['optionTypeList'] ||= {}
-          payload['optionTypeList'].deep_merge!(passed_options)
-        end
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
       else
-        if !list_type
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true}], options[:options], @api_client, {})
-          list_type = v_prompt['type']
-        end
-        params = passed_options
-        v_prompt = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
-        params.deep_merge!(v_prompt)
-        params['type'] = list_type
-        if params['type'] == 'rest'
+        payload = {}
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
+        list_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(), options[:options], @api_client, options[:params])
+        if list_payload['type'] == 'rest'
           # prompt for Source Headers
-          source_headers = prompt_source_headers(options)
-          if !source_headers.empty?
-            params['config'] ||= {}
-            params['config']['sourceHeaders'] = source_headers
+          if !(payload['optionTypeList']['config'] && payload['optionTypeList']['config']['sourceHeaders'])
+            source_headers = prompt_source_headers(options)
+            if !source_headers.empty?
+              list_payload['config'] ||= {}
+              list_payload['config']['sourceHeaders'] = source_headers
+            end
           end
         end
-        list_payload = params
-        payload = {'optionTypeList' => list_payload}
+        # tweak payload for API
+        ['ignoreSSLErrors', 'realTime'].each { |k|
+          list_payload[k] = ['on','true'].include?(list_payload[k].to_s) if list_payload.key?(k)
+        }
+        payload.deep_merge!({'optionTypeList' => list_payload})
       end
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
@@ -262,41 +255,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
     begin
       option_type_list = find_option_type_list_by_name_or_id(args[0])
       exit 1 if option_type_list.nil?
-      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if !passed_options.empty?
-          payload['optionTypeList'] ||= {}
-          payload['optionTypeList'].deep_merge!(passed_options)
-        end
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
       else
-        list_type = option_type_list['type']
-        prompt_options = update_option_type_list_option_types(list_type)
-        params = passed_options
-        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(prompt_options, options[:options], @api_client, options[:params])
-        params.deep_merge!(v_prompt)
-        
-        if list_type == 'rest'
+        payload = {}
+        payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
+        list_payload = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types(), options[:options], @api_client)
+        if list_payload['type'] == 'rest'
           # parse Source Headers
-          source_headers = prompt_source_headers(options.merge({no_prompt: true}))
-          if !source_headers.empty?
-            #params['config'] ||= option_type_list['config'] || {}
-            params['config'] ||= {}
-            params['config']['sourceHeaders'] = source_headers
+          if !(payload['optionTypeList']['config'] && payload['optionTypeList']['config']['sourceHeaders'])
+            source_headers = prompt_source_headers(options.merge({no_prompt: true}))
+            if !source_headers.empty?
+              #params['config'] ||= option_type_list['config'] || {}
+              params['config'] ||= {}
+              params['config']['sourceHeaders'] = source_headers
+            end
           end
         end
-        if params.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          exit 1
-        end
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        list_payload = params
-        payload = {'optionTypeList' => list_payload}
+        # tweak payload for API
+        ['ignoreSSLErrors', 'realTime'].each { |k|
+          list_payload[k] = ['on','true'].include?(list_payload[k].to_s) if list_payload.key?(k)
+        }
+        payload.deep_merge!({'optionTypeList' => list_payload})
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload['optionTypeList'].empty?
       end
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
@@ -355,42 +338,13 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   private
 
-  def find_option_type_list_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_option_type_list_by_id(val)
-    else
-      return find_option_type_list_by_name(val)
-    end
-  end
-
-  def find_option_type_list_by_id(id)
-    begin
-      json_response = @option_type_lists_interface.get(id.to_i)
-      return json_response['optionTypeList']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Option List not found by id #{id}"
-        exit 1
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_option_type_list_by_name(name)
-    json_results = @option_type_lists_interface.list({name: name.to_s})
-    if json_results['optionTypeLists'].empty?
-      print_red_alert "Option List not found by name #{name}"
-      exit 1
-    end
-    option_type_list = json_results['optionTypeLists'][0]
-    return option_type_list
-  end
+  # finders are in LibraryHelper
 
   def get_available_option_list_types
     [
       {'name' => 'REST', 'value' => 'rest'}, 
       {'name' => 'Morpheus Api', 'value' => 'api'}, 
+      {'name' => 'LDAP', 'value' => 'ldap'}, 
       {'name' => 'Manual', 'value' => 'manual'}
     ]
   end
@@ -399,49 +353,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
      get_available_option_list_types.find {|it| code == it['value'] || code == it['name'] }
   end
 
-  def new_option_type_list_option_types(list_type='rest')
-    if list_type.to_s.downcase == 'rest'
-      [
+  def new_option_type_list_option_types()
+    [
+        # rest
         {'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},
+        {'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},
         # 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},
-
+        {'dependsOnCode' => 'optionTypeList.type:api', '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' => 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},
+        {'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},
+        {'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},
       ]
-    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
-      print_red_alert "Unknown Option List type '#{list_type}'"
-      exit 1
-    end
+
   end
 
-  def update_option_type_list_option_types(list_type='rest')
-    list = new_option_type_list_option_types(list_type)
+  def update_option_type_list_option_types()
+    list = new_option_type_list_option_types()
     list.each {|it| 
       it.delete('required')
       it.delete('defaultValue')

data/lib/morpheus/cli/library_option_types_command.rb

@@ -65,7 +65,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
             fieldLabel: option_type['fieldLabel'],
             fieldName: option_type['fieldName'],
             default: option_type['defaultValue'],
-            required: option_type['required'] ? 'yes' : 'no'
+            required: (option_type['required'].nil? ? '' : format_boolean(option_type['required'])),
+            export: (option_type['exportMeta'].nil? ? '' : format_boolean(option_type['exportMeta']))
           }
         end
         print cyan
@@ -76,7 +77,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
           {:fieldLabel => {:display_name => "Field Label"} },
           {:fieldName => {:display_name => "Field Name"} },
           :default,
-          :required
+          :required,
+          :export,
         ], options)
         print reset
         print_results_pagination(json_response)
@@ -139,6 +141,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         "Placeholder" => 'placeHolder',
         "Default Value" => 'defaultValue',
         "Required" => lambda {|it| format_boolean(it['required']) },
+        "Export As Tag" => lambda {|it| it['exportMeta'].nil? ? '' : format_boolean(it['exportMeta']) },
       }, option_type)
       print reset,"\n"
       return 0
@@ -162,18 +165,16 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       payload = nil
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['optionType'] ||= {}
-          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
       else
-        params = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client, options[:params])
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        option_type_payload = params
-        payload = {optionType: option_type_payload}
+        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]
@@ -207,27 +208,19 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     begin
       option_type = find_option_type_by_name_or_id(args[0])
       exit 1 if option_type.nil?
-
       if options[:payload]
         payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['optionType'] ||= {}
-          payload['optionType'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
       else
-        #params = options[:options] || {}
-        params = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types, options[:options], @api_client, options[:params])
-        if params.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          exit 1
-        end
-        if params.key?('required')
-          params['required'] = ['on','true'].include?(params['required'].to_s)
-        end
-        option_type_payload = params
-        payload = {optionType: option_type_payload}
+        payload = {}
+        payload.deep_merge!({'optionType' => parse_passed_options(options)})
+        option_type_payload = Morpheus::Cli::OptionTypes.no_prompt(update_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})
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload['optionType'].empty?
       end
       @option_types_interface.setopts(options)
       if options[:dry_run]
@@ -296,12 +289,14 @@ 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 fieldName property that the value gets assigned to.', 'displayOrder' => 3},
-      {'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' => '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' => 5},
-      {'fieldName' => 'placeHolder', 'fieldLabel' => 'Placeholder', 'type' => 'text', 'displayOrder' => 6},
-      {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 7},
-      {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 8},
+      {'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' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 8},
+      {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 9},
+      {'fieldName' => 'exportMeta', 'fieldLabel' => 'Export As Tag', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Export as Tag.', 'displayOrder' => 10},
     ]
   end
 

data/lib/morpheus/cli/login.rb

@@ -30,7 +30,7 @@ class Morpheus::Cli::Login
     username, password = nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
-      opts.on( '-u', '--username USERNAME', "Username" ) do |val|
+      opts.on( '-u', '--username USERNAME', "Username. Sub-tenant users must format their username with a prefix like {subdomain}\\{username}" ) do |val|
         username = val
       end
       opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
@@ -50,11 +50,15 @@ class Morpheus::Cli::Login
       opts.footer = <<-EOT
 Login to a remote appliance with a username and password or using an access token.
 Logging in with username and password will make an authentication api request to obtain an access token.
+[username] is required, this is the username of the Morpheus User
+[password] is required, this is the password of the Morpheus User
+Sub-tenant users will need to pass their tenant subdomain prefix. ie. {subdomain}\\{username}
+By default, the subdomain is the tenant account ID. Example: 2\\neo
 The --token option can be used to login with a valid access token instead of username and password.
 The specified token will be verified by making a whoami api request
 If successful, the access token will be saved with the active session for the remote appliance.
-This command will first logout any active session before attempting authorization.
-The --test option is available for testing credentials without updating your active session, neithing logging you out or in.
+This command will first logout any active session before attempting authentication.
+The --test option can be used to test credentials without updating the stored credentials for the appliance, neither logging you in or out.
 EOT
                     
     end
@@ -106,6 +110,8 @@ EOT
           if options[:test_only]
             print green,"Success! Test Credentials verified for #{wallet['username']}", reset, "\n"
           else
+            # clear whoami cache, it will be lazily load_saved_credentials
+            ::Morpheus::Cli::Whoami.clear_whoami(@appliance_name, wallet['username'])
             print green,"Success! Logged in as #{wallet['username']}", reset, "\n"
           end
         end

data/lib/morpheus/cli/logs_command.rb

@@ -63,9 +63,9 @@ class Morpheus::Cli::LogsCommand
       #   options[:interval] = parse_time(val).utc.iso8601
       # end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
-      opts.on('--table', '--table', "Format ouput as a table.") do
+      opts.on('-t', '--table', "Format ouput as a table.") do
         options[:table] = true
       end
       opts.on('-a', '--all', "Display all details: entire message." ) do
@@ -81,6 +81,7 @@ class Morpheus::Cli::LogsCommand
     end
     connect(options)
     begin
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -33,6 +33,43 @@ module Morpheus::Cli::AccountsHelper
     @roles_interface
   end
 
+  ## Tenants (Accounts)
+
+  def account_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      # "Name" => lambda {|it| it['name'].to_s + (it['master'] ? " (Master Tenant)" : '') },
+      "Description" => 'description',
+      "Subdomain" => 'subdomain',
+      "# Instances" => 'stats.instanceCount',
+      "# Users" => 'stats.userCount',
+      "Role" => lambda {|it| it['role']['authority'] rescue nil },
+      "Master" => lambda {|it| format_boolean(it['master']) },
+      "Currency" => 'currency',
+      "Status" => lambda {|it| 
+        status_state = nil
+        if it['active']
+          status_state = "#{green}ACTIVE#{cyan}"
+        else
+          status_state = "#{red}INACTIVE#{cyan}"
+        end
+        status_state
+      },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def list_account_column_definitions()
+    columns = account_column_definitions
+    columns.delete("Subdomain")
+    columns.delete("Master")
+    columns.delete("Currency")
+    return columns.upcase_keys!
+  end
+
+
   def find_account_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_account_by_id(val)
@@ -47,7 +84,7 @@ module Morpheus::Cli::AccountsHelper
       return json_response['account']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
-        print_red_alert "Account not found by id #{id}"
+        print_red_alert "Tenant not found by id #{id}"
       else
         raise e
       end
@@ -57,12 +94,12 @@ module Morpheus::Cli::AccountsHelper
   def find_account_by_name(name)
     accounts = accounts_interface.list({name: name.to_s})['accounts']
     if accounts.empty?
-      print_red_alert "Account not found by name #{name}"
+      print_red_alert "Tenant not found by name #{name}"
       return nil
     elsif accounts.size > 1
-      print_red_alert "#{accounts.size} accounts found by name #{name}"
-      print_accounts_table(accounts, {color: red})
-      print_red_alert "Try using -A ID instead"
+      print_red_alert "Found #{accounts.size} tenants by name '#{name}'. Try using ID instead: #{format_list(accounts.collect {|it| it['id']}, 'or', 3)}"
+      print "\n"
+      print as_pretty_table(accounts, [:id, :name, :description], {color: red, thin: true})
       print reset,"\n"
       return nil
     else
@@ -87,6 +124,35 @@ module Morpheus::Cli::AccountsHelper
     return account
   end
 
+  ## Roles
+
+  def role_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Name" => 'authority',
+      "Description" => 'description',
+      #"Scope" => lambda {|it| it['scope'] },
+      "Type" => lambda {|it| format_role_type(it) },
+      "Multitenant" => lambda {|it| 
+        format_boolean(it['multitenant']).to_s + (it['multitenantLocked'] ? " (LOCKED)" : "")
+      },
+      "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
+      #"Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  def subtenant_role_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Name" => 'authority',
+      "Description" => 'description',
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
   def find_role_by_name_or_id(account_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_role_by_id(account_id, val)
@@ -114,9 +180,11 @@ module Morpheus::Cli::AccountsHelper
       print_red_alert "Role not found by name #{name}"
       return nil
     elsif roles.size > 1
-      print_red_alert "#{roles.size} roles by name #{name}"
-      print_roles_table(roles, {color: red, thin: true})
-      print reset,"\n\n"
+      print_red_alert "Found #{roles.size} roles by name '#{name}'. Try using ID instead: #{format_list(roles.collect {|it| it['id']}, 'or', 3)}"
+      print "\n"
+      # print as_pretty_table(accounts, [:id, :name, :description], {color: red, thin: true})
+      print as_pretty_table(roles, {"ID" => 'id', "Name" => 'authority',"Description" => 'description'}.upcase_keys!, {color: red, thin: true})
+      print reset,"\n"
       return nil
     else
       return roles[0]
@@ -125,17 +193,57 @@ module Morpheus::Cli::AccountsHelper
 
   alias_method :find_role_by_authority, :find_role_by_name
 
-  def find_user_by_username_or_id(account_id, val)
+
+  ## Users
+
+  def user_column_definitions()
+    {
+      "ID" => 'id',
+      "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "First Name" => 'firstName',
+      "Last Name" => 'lastName',
+      "Username" => 'username',
+      "Email" => 'email',
+      "Role" => lambda {|it| format_user_role_names(it) },
+      "Notifications" => lambda {|it| it['receiveNotifications'].nil? ? '' : format_boolean(it['receiveNotifications']) },
+      "Status" => lambda {|it| format_user_status(it) },
+      "Last Login" => lambda {|it| format_duration_ago(it['lastLoginDate']) },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def list_user_column_definitions()
+    columns = user_column_definitions
+    columns.delete("Notifications")
+    return columns.upcase_keys!
+  end
+
+  def format_user_status(user, return_color=cyan)
+    if user["enabled"] != true
+      red + "DISABLED" + return_color
+    elsif user["accountLocked"]
+      red + "ACCOUNT LOCKED" + return_color
+    elsif user["accountExpired"]
+      yellow + "ACCOUNT EXPIRED" + return_color
+    elsif user["passwordExpired"]
+      yellow + "PASSWORD EXPIRED" + return_color
+    else
+      green + "ACTIVE" + return_color
+    end
+  end
+
+  def find_user_by_username_or_id(account_id, val, params={})
     if val.to_s =~ /\A\d{1,}\Z/
-      return find_user_by_id(account_id, val)
+      return find_user_by_id(account_id, val, params)
     else
-      return find_user_by_username(account_id, val)
+      return find_user_by_username(account_id, val, params)
     end
   end
 
-  def find_user_by_id(account_id, id)
+  def find_user_by_id(account_id, id, params={})
     begin
-      json_response = users_interface.get(account_id, id.to_i, {includePermissions:true})
+      json_response = users_interface.get(account_id, id.to_i, params)
       return json_response['user']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
@@ -146,22 +254,23 @@ module Morpheus::Cli::AccountsHelper
     end
   end
 
-  def find_user_by_username(account_id, username)
-    users = users_interface.list(account_id, {username: username.to_s})['users']
+  def find_user_by_username(account_id, username, params={})
+    users = users_interface.list(account_id, params.merge({username: username.to_s}))['users']
     if users.empty?
       print_red_alert "User not found by username #{username}"
       return nil
     elsif users.size > 1
-      print_red_alert "#{users.size} users by username #{username}"
-      print_users_table(users, {color: red, thin: true})
-      print reset,"\n\n"
+      print_red_alert "Found #{users.size} users by username '#{username}'. Try using ID instead: #{format_list(users.collect {|it| it['id']}, 'or', 3)}"
+      print "\n"
+      print as_pretty_table(users, list_user_column_definitions, {color: red, thin: true})
+      print reset,"\n"
       return nil
     else
       return users[0]
     end
   end
 
-  def find_all_user_ids(account_id, usernames)
+  def find_all_user_ids(account_id, usernames, params={})
     user_ids = []
     if usernames.is_a?(String)
       usernames = usernames.split(",").collect {|it| it.to_s.strip }.select {|it| it }.uniq
@@ -170,11 +279,11 @@ module Morpheus::Cli::AccountsHelper
     end
     usernames.each do |username|
       # save a query
-      #user = find_user_by_username_or_id(nil, username)
+      #user = find_user_by_username_or_id(nil, username, params)
       if username.to_s =~ /\A\d{1,}\Z/
         user_ids << username.to_i
       else
-        user = find_user_by_username(account_id, username)
+        user = find_user_by_username(account_id, username, params)
         if user.nil?
           return nil
         else
@@ -185,6 +294,32 @@ module Morpheus::Cli::AccountsHelper
     user_ids
   end
 
+
+  ## User Groups
+
+  def user_group_column_definitions()
+    {
+      "ID" => lambda {|it| it['id'] },
+      #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Name" => lambda {|it| it['name'] },
+      "Description" => lambda {|it| it['description'] },
+      "Server Group" => lambda {|it| it['serverGroup'] },
+      "Sudo Access" => lambda {|it| format_boolean it['sudoAccess'] },
+      # "Shared User" => lambda {|it| format_boolean it['sharedUser'] },
+      "# Users" => lambda {|it| it['users'].size rescue nil },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  def list_user_group_column_definitions()
+    columns = user_group_column_definitions
+    columns.delete("Sudo Access")
+    columns.delete("Server Group")
+    columns.delete("Updated")
+    return columns.upcase_keys!
+  end
+
   def find_user_group_by_name_or_id(account_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_user_group_by_id(account_id, val)
@@ -212,9 +347,8 @@ module Morpheus::Cli::AccountsHelper
       print_red_alert "User Group not found by name #{name}"
       return nil
     elsif user_groups.size > 1
-      print_red_alert "#{user_groups.size} user groups found by name #{name}"
-      print_user_groups_table(user_groups, {color: red})
-      print_red_alert "Try using ID instead"
+      print_red_alert "Found #{user_groups.size} user groups by name '#{name}'. Try using ID instead: #{format_list(user_groups.collect {|it| it['id']}, 'or', 3)}"
+      print as_pretty_table(user_groups, [:id, :name, :description], {color: red, thin: true})
       print reset,"\n"
       return nil
     else
@@ -222,36 +356,6 @@ module Morpheus::Cli::AccountsHelper
     end
   end
 
-  def print_accounts_table(accounts, options={})
-    table_color = options.key?(:color) ? options[:color] : cyan
-    rows = accounts.collect do |account|
-      status_state = nil
-      if account['active']
-        status_state = "#{green}ACTIVE#{table_color}"
-      else
-        status_state = "#{red}INACTIVE#{table_color}"
-      end
-      {
-        id: account['id'],
-        name: account['name'],
-        description: account['description'],
-        role: account['role'] ? account['role']['authority'] : nil,
-        status: status_state,
-        dateCreated: format_local_dt(account['dateCreated'])
-      }
-    end
-    print table_color if table_color
-    print as_pretty_table(rows, [
-      :id,
-      :name,
-      :description,
-      :role,
-      {:dateCreated => {:display_name => "Date Created"} },
-      :status
-    ], options.merge({color:table_color}))
-    print reset if table_color
-  end
-
   def format_role_type(role)
     str = ""
     if role['roleType'] == "account"
@@ -271,52 +375,6 @@ module Morpheus::Cli::AccountsHelper
     return str
   end
 
-  def print_roles_table(roles, options={})
-    table_color = options.key?(:color) ? options[:color] : cyan
-    rows = roles.collect do |role|
-      {
-        id: role['id'],
-        name: role['authority'],
-        description: role['description'],
-        scope: role['scope'],
-        multitenant: role['multitenant'] ? 'Yes' : 'No',
-        type: format_role_type(role),
-        owner: role['owner'] ? role['owner']['name'] : "System",
-        dateCreated: format_local_dt(role['dateCreated'])
-      }
-    end
-    columns = [
-      :id,
-      :name,
-      :description,
-      # options[:is_master_account] ? :scope : nil,
-      options[:is_master_account] ? :type : nil,
-      options[:is_master_account] ? :multitenant : nil,
-      options[:is_master_account] ? :owner : nil,
-      {:dateCreated => {:display_name => "Date Created"} }
-    ].compact
-    if options[:include_fields]
-      columns = options[:include_fields]
-    end
-    # print table_color if table_color
-    print as_pretty_table(rows, columns, options)
-    # print reset if table_color
-  end
-
-  def print_users_table(users, options={})
-    table_color = options[:color] || cyan
-    rows = users.collect do |user|
-      {id: user['id'], username: user['username'], name: user['displayName'], first: user['firstName'], last: user['lastName'], email: user['email'], role: format_user_role_names(user), account: user['account'] ? user['account']['name'] : nil}
-    end
-    columns = [:id, :account, :first, :last, :username, :email, :role]
-    if options[:include_fields]
-      columns = options[:include_fields] 
-    end
-    #print table_color if table_color
-    print as_pretty_table(rows, columns, options)
-    #print reset if table_color
-  end
-
   ## These user access formatted methods should probably move up to PrintHelper to be more ubiquitous.
 
   def format_user_role_names(user)