morpheus-cli 5.0.2 → 5.2.4

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

@@ -448,7 +448,8 @@ module Morpheus::Cli::PrintHelper
 
     if opts[:bar_color] == :rainbow
       rainbow_bar = ""
-      cur_rainbow_color = white
+      cur_rainbow_color = reset # default terminal color
+      rainbow_bar << cur_rainbow_color
       bars.each_with_index {|bar, i|
         reached_percent = (i / max_bars.to_f) * 100
         new_bar_color = cur_rainbow_color
@@ -458,6 +459,8 @@ module Morpheus::Cli::PrintHelper
           new_bar_color = yellow
         elsif reached_percent > 10
           new_bar_color = cyan
+        else
+          new_bar_color = reset
         end
         if cur_rainbow_color != new_bar_color
           cur_rainbow_color = new_bar_color
@@ -471,7 +474,7 @@ module Morpheus::Cli::PrintHelper
         #rainbow_bar <<  " " * padding
       end
       rainbow_bar << reset
-      bar_display = white + "[" + rainbow_bar + white + "]" + " #{cur_rainbow_color}#{percent_label}#{reset}"
+      bar_display = cyan + "[" + rainbow_bar + cyan + "]" + " #{cur_rainbow_color}#{percent_label}#{reset}"
       out << bar_display
     elsif opts[:bar_color] == :solid
       bar_color = cyan
@@ -479,12 +482,16 @@ module Morpheus::Cli::PrintHelper
         bar_color = red
       elsif percent > 50
         bar_color = yellow
+      elsif percent > 10
+        bar_color = cyan
+      else
+        bar_color = reset
       end
-      bar_display = white + "[" + bar_color + bars.join.ljust(max_bars, ' ') + white + "]" + " #{percent_label}" + reset
+      bar_display = cyan + "[" + bar_color + bars.join.ljust(max_bars, ' ') + cyan + "]" + " #{percent_label}" + reset
       out << bar_display
     else
-      bar_color = opts[:bar_color] || cyan
-      bar_display = white + "[" + bar_color + bars.join.ljust(max_bars, ' ') + white + "]" + " #{percent_label}" + reset
+      bar_color = opts[:bar_color] || reset
+      bar_display = cyan + "[" + bar_color + bars.join.ljust(max_bars, ' ') + cyan + "]" + " #{percent_label}" + reset
       out << bar_display
     end
     return out
@@ -504,7 +511,7 @@ module Morpheus::Cli::PrintHelper
       out << cyan + "Max CPU".rjust(label_width, ' ') + ": " + generate_usage_bar(cpu_usage.to_f, 100)  + "\n"
     end
     if opts[:include].include?(:avg_cpu)
-      cpu_usage = stats['cpuUsageAvg']
+      cpu_usage = stats['cpuUsageAvg'] || stats['cpuUsageAverage']
       out << cyan + "Avg. CPU".rjust(label_width, ' ') + ": " + generate_usage_bar(cpu_usage.to_f, 100)  + "\n"
     end
     if opts[:include].include?(:cpu)

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

@@ -596,14 +596,12 @@ module Morpheus::Cli::ProvisioningHelper
     v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments()}], options[:options])
     payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
-    # Labels (Provisioning API still refers to these as tags)
-    # and tags (metadata tags) is called metadata.
-    # todo: switch this from 'tags' to labels' when the api changes
+    # Labels (used to be called tags)
     if options[:labels]
-      payload['instance']['tags'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
+      payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
     else
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false}], options[:options])
-      payload['instance']['tags'] = v_prompt['tags'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['tags'].empty?
+      payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
     end
 
     # Version and Layout
@@ -1693,6 +1691,15 @@ module Morpheus::Cli::ProvisioningHelper
           row = {}
           row['name'] = metadata_pair[0].to_s.strip
           row['value'] = metadata_pair[1].to_s.strip
+          # hacky way to set masked flag to true of false to (masked) in the value itself
+          if(row['value'].include?("(masked)"))
+            row['value'] = row['value'].gsub("(masked)", "").strip
+            row['masked'] = true
+          end
+          if(row['value'].include?("(unmasked)"))
+            row['value'] = row['value'].gsub("(unmasked)", "").strip
+            row['masked'] = false
+          end
           row
         end
         metadata = metadata_list
@@ -2180,6 +2187,82 @@ module Morpheus::Cli::ProvisioningHelper
     return ports
   end
 
+  def format_instance_status(instance, return_color=cyan)
+    out = ""
+    status_string = instance['status'].to_s
+    if status_string == 'running'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'provisioning'
+      out << "#{cyan}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'stopped' or status_string == 'failed'
+      out << "#{red}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{yellow}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
+  def format_instance_connection_string(instance)
+    if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
+      connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
+    end
+  end
+
+  def format_app_status(app, return_color=cyan)
+    out = ""
+    status_string = app['status'] || app['appStatus'] || ''
+    if status_string == 'running'
+      out = "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'provisioning'
+      out = "#{cyan}#{status_string.upcase}#{cyan}"
+    elsif status_string == 'stopped' or status_string == 'failed'
+      out = "#{red}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'unknown'
+      out = "#{yellow}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'warning' && app['instanceCount'].to_i == 0
+      # show this instead of WARNING
+      out =  "#{cyan}EMPTY#{return_color}"
+    else
+      out =  "#{yellow}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+  
+  def format_container_status(container, return_color=cyan)
+    out = ""
+    status_string = container['status'].to_s
+    if status_string == 'running'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'provisioning'
+      out << "#{cyan}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'stopped' or status_string == 'failed'
+      out << "#{red}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{yellow}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
+  def format_container_connection_string(container)
+    if !container['ports'].nil? && container['ports'].empty? == false
+      connection_string = "#{container['ip']}:#{container['ports'][0]['external']}"
+    else
+      # eh? more logic needed here i think, see taglib morph:containerLocationMenu
+      connection_string = "#{container['ip']}"
+    end
+  end
+  
+  def format_instance_container_display_name(instance, plural=false)
+    #<span class="info-label">${[null,'docker'].contains(instance.layout?.provisionType?.code) ? 'Containers' : 'Virtual Machines'}:</span> <span class="info-value">${instance.containers?.size()}</span>
+    v = plural ? "Containers" : "Container"
+    if instance && instance['layout'] && instance['layout'].key?("provisionTypeCode")
+      if [nil, 'docker'].include?(instance['layout']["provisionTypeCode"])
+        v = plural ? "Virtual Machines" : "Virtual Machine"
+      end
+    end
+    return v
+  end
+
   def format_blueprint_type(type_code)
     return type_code.to_s # just show it as is
     if type_code.to_s.empty?

data/lib/morpheus/cli/option_types.rb

@@ -142,25 +142,25 @@ module Morpheus
               value = value.to_s.include?('.') ? value.to_f : value.to_i
             # these select prompts should just fall down through below, with the extra params no_prompt, use_value
             elsif option_type['type'] == 'select'
-              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
+              value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
             elsif option_type['type'] == 'multiSelect'
               # support value as csv like "thing1, thing2"
               value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
               input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
               select_value_list = []
               value_list.each_with_index do |v, i|
-                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (api_params || {}).merge(results), true)
+                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
               end
               value = select_value_list
             elsif option_type['type'] == 'typeahead'
-              value = typeahead_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
+              value = typeahead_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
             elsif option_type['type'] == 'multiTypeahead'
               # support value as csv like "thing1, thing2"
               value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
               input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
               select_value_list = []
               value_list.each_with_index do |v, i|
-                select_value_list << typeahead_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (api_params || {}).merge(results), true)
+                select_value_list << typeahead_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
               end
               value = select_value_list
             end
@@ -187,11 +187,11 @@ module Morpheus
                 # select type is special because it supports skipSingleOption
                 # and prints the available options on error
                 if ['select', 'multiSelect'].include?(option_type['type'])
-                  value = select_prompt(option_type, api_client, (api_params || {}).merge(results), true)
+                  value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
                   value_found = !!value
                 end
                 if ['typeahead', 'multiTypeahead'].include?(option_type['type'])
-                  value = typeahead_prompt(option_type, api_client, (api_params || {}).merge(results), true)
+                  value = typeahead_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
                   value_found = !!value
                 end
                 if !value_found
@@ -228,11 +228,11 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              value = select_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
+              value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
               if value && option_type['type'] == 'multiSelect'
                 value = [value]
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
-                  if addn_value = select_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
+                  if addn_value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
                     value << addn_value
                   else
                     break
@@ -240,11 +240,11 @@ module Morpheus
                 end
               end
             elsif ['typeahead', 'multiTypeahead'].include?(option_type['type'])
-              value = typeahead_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
+              value = typeahead_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
               if value && option_type['type'] == 'multiTypeahead'
                 value = [value]
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
-                  if addn_value = typeahead_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
+                  if addn_value = typeahead_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
                     value << addn_value
                   else
                     break

data/lib/morpheus/cli/projects_command.rb

@@ -42,7 +42,7 @@ class Morpheus::Cli::Projects
       opts.on('--owners [LIST]', Array, "Owner, comma separated list of usernames or IDs.") do |list|
         owner_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      build_standard_get_options(opts, options)
+      build_standard_list_options(opts, options)
       opts.footer = <<-EOT
 List projects.
 EOT

data/lib/morpheus/cli/roles.rb

@@ -211,56 +211,70 @@ EOT
         print cyan,"Use --permissions to list permissions","\n"
       end
 
+      has_group_access = true
+      has_cloud_access = true
       print_h2 "Global Access", options
-      puts as_pretty_table([json_response], [
-        {"Groups" => lambda {|it| get_access_string(it['globalSiteAccess']) } },
-        {"Clouds" => lambda {|it| get_access_string(it['globalZoneAccess']) } },
-        {"Instance Types" => lambda {|it| get_access_string(it['globalInstanceTypeAccess']) } },
-        {"Blueprints" => lambda {|it| get_access_string(it['globalAppTemplateAccess'] || it['globalBlueprintAccess']) } },
-        {"Catalog Item Types" => lambda {|it| get_access_string(it['globalCatalogItemTypeAccess']) } },
-      ], options)
-
-      #print_h2 "Group Access: #{get_access_string(json_response['globalSiteAccess'])}", options
-      print cyan
-      if json_response['globalSiteAccess'] == 'custom'
-        print_h2 "Group Access", options
-        if options[:include_group_access]
-          rows = json_response['sites'].collect do |it|
-            {
-              name: it['name'],
-              access: format_access_string(it['access'], ["none","read","full"]),
-            }
+      global_access_columns = {
+        "Groups" => lambda {|it| get_access_string(it['globalSiteAccess']) },
+        "Clouds" => lambda {|it| get_access_string(it['globalZoneAccess']) },
+        "Instance Types" => lambda {|it| get_access_string(it['globalInstanceTypeAccess']) },
+        "Blueprints" => lambda {|it| get_access_string(it['globalAppTemplateAccess'] || it['globalBlueprintAccess']) },
+        "Catalog Item Types" => lambda {|it| get_access_string(it['globalCatalogItemTypeAccess']) },
+      }
+      if role['roleType'].to_s.downcase == 'account'
+        global_access_columns.delete("Groups")
+        has_group_access = false
+      else
+        global_access_columns.delete("Clouds")
+        has_cloud_access = false
+      end
+      puts as_pretty_table([json_response], global_access_columns, options)
+
+      if has_group_access
+        #print_h2 "Group Access: #{get_access_string(json_response['globalSiteAccess'])}", options
+        print cyan
+        if json_response['globalSiteAccess'] == 'custom'
+          print_h2 "Group Access", options
+          if options[:include_group_access]
+            rows = json_response['sites'].collect do |it|
+              {
+                name: it['name'],
+                access: format_access_string(it['access'], ["none","read","full"]),
+              }
+            end
+            print as_pretty_table(rows, [:name, :access], options)
+          else
+            print cyan,"Use -g, --group-access to list custom access","\n"
           end
-          print as_pretty_table(rows, [:name, :access], options)
+          print reset,"\n"
         else
-          print cyan,"Use -g, --group-access to list custom access","\n"
+          # print "\n"
+          # print cyan,bold,"Group Access: #{get_access_string(json_response['globalSiteAccess'])}",reset,"\n"
         end
-        print reset,"\n"
-      else
-        # print "\n"
-        # print cyan,bold,"Group Access: #{get_access_string(json_response['globalSiteAccess'])}",reset,"\n"
       end
       
-      print cyan
-      #puts "Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}"
-      #print "\n"
-      if json_response['globalZoneAccess'] == 'custom'
-        print_h2 "Cloud Access", options
-        if options[:include_cloud_access]
-          rows = json_response['zones'].collect do |it|
-            {
-              name: it['name'],
-              access: format_access_string(it['access'], ["none","read","full"]),
-            }
+      if has_cloud_access
+        print cyan
+        #puts "Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}"
+        #print "\n"
+        if json_response['globalZoneAccess'] == 'custom'
+          print_h2 "Cloud Access", options
+          if options[:include_cloud_access]
+            rows = json_response['zones'].collect do |it|
+              {
+                name: it['name'],
+                access: format_access_string(it['access'], ["none","read","full"]),
+              }
+            end
+            print as_pretty_table(rows, [:name, :access], options)
+          else
+            print cyan,"Use -c, --cloud-access to list custom access","\n"
           end
-          print as_pretty_table(rows, [:name, :access], options)
+          print reset,"\n"
         else
-          print cyan,"Use -c, --cloud-access to list custom access","\n"
+          # print "\n"
+          # print cyan,bold,"Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}",reset,"\n"
         end
-        print reset,"\n"
-      else
-        # print "\n"
-        # print cyan,bold,"Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}",reset,"\n"
       end
 
       print cyan
@@ -326,7 +340,7 @@ EOT
           end
           print as_pretty_table(rows, [:name, :access], options)
         else
-          print cyan,"Use -b, --catalog-item-type-access to list custom access","\n"
+          print cyan,"Use --catalog-item-type-access to list custom access","\n"
         end
       else
         # print "\n"
@@ -335,7 +349,8 @@ EOT
       
 
       persona_permissions = json_response['personaPermissions'] || json_response['personas'] || []
-      if options[:include_catalog_item_types_access]
+      # if options[:include_personas_access]
+      if persona_permissions
         print_h2 "Persona Access", options
         rows = persona_permissions.collect do |it|
           {
@@ -552,7 +567,7 @@ EOT
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [options]")
+      opts.banner = subcommand_usage("[role] [options]")
       build_option_type_options(opts, options, update_role_option_types)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
@@ -630,7 +645,7 @@ EOT
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[role]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -770,41 +785,46 @@ EOT
     group_name = nil
     access_value = nil
     do_all = false
+    allowed_access_values = ['full', 'read', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[role] [group] [access]")
       opts.on( '-g', '--group GROUP', "Group name or id" ) do |val|
         group_name = val
       end
       opts.on( nil, '--all', "Update all groups at once." ) do
         do_all = true
       end
-      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
         access_value = val
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
       opts.footer = "Update role access for a group or all groups.\n" +
-                    "[name] is required. This is the name or id of a role.\n" + 
+                    "[role] is required. This is the name or id of a role.\n" + 
                     "--group or --all is required. This is the name or id of a group.\n" + 
-                    "--access is required. This is the new access value."
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      return 1
-    end
-    name = args[0]
-    # support old usage: [name] [group] [access]
-    group_name ||= args[1]
-    access_value ||= args[2]
 
-    if (!group_name && !do_all) || !access_value
-      puts optparse
-      return 1
+    # usage: update-group-access [role] [access] --all
+    #        update-group-access [role] [group] [access]
+    name = args[0]
+    if do_all
+      verify_args!(args:args, optparse:optparse, min:1, max:2)
+      access_value = args[1] if args[1]
+    else
+      verify_args!(args:args, optparse:optparse, min:1, max:3)
+      group_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !group_id && !do_all
+      raise_command_error("missing required argument: [group] or --all", optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", optparse)
     end
-    
     access_value = access_value.to_s.downcase
-
-    if !['full', 'read', 'none'].include?(access_value)
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", optparse)
       puts optparse
       return 1
     end
@@ -915,6 +935,7 @@ EOT
     cloud_name = nil
     access_value = nil
     do_all = false
+    allowed_access_values = ['full', 'read', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on( '-c', '--cloud CLOUD', "Cloud name or id" ) do |val|
@@ -924,7 +945,7 @@ EOT
       opts.on( nil, '--all', "Update all clouds at once." ) do
         do_all = true
       end
-      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
         access_value = val
       end
       opts.on( '-g', '--group GROUP', "Group to find cloud in" ) do |val|
@@ -932,32 +953,34 @@ EOT
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
       opts.footer = "Update role access for a cloud or all clouds.\n" +
-                    "[name] is required. This is the name or id of a role.\n" + 
+                    "[role] is required. This is the name or id of a role.\n" + 
                     "--cloud or --all is required. This is the name or id of a cloud.\n" + 
-                    "--access is required. This is the new access value."
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
 
-    if args.count < 1
-      puts optparse
-      return 1
-    end
+    # usage: update-cloud-access [role] [access] --all
+    #        update-cloud-access [role] [cloud] [access]
     name = args[0]
-    # support old usage: [name] [cloud] [access]
-    cloud_name ||= args[1]
-    access_value ||= args[2]
-
-    if (!cloud_name && !do_all) || !access_value
-      puts optparse
-      return 1
+    if do_all
+      verify_args!(args:args, optparse:optparse, min:1, max:2)
+      access_value = args[1] if args[1]
+    else
+      verify_args!(args:args, optparse:optparse, min:1, max:3)
+      cloud_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !cloud_id && !do_all
+      raise_command_error("missing required argument: [cloud] or --all", optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", optparse)
     end
-    puts "cloud_name is : #{cloud_name}"
-    puts "access_value is : #{access_value}"
     access_value = access_value.to_s.downcase
-
-    if !['full', 'none'].include?(access_value)
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", optparse)
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -1025,10 +1048,10 @@ EOT
   end
 
   def update_global_instance_type_access(args)
-    usage = "Usage: morpheus roles update-global-instance-type-access [name] [full|custom|none]"
+    usage = "Usage: morpheus roles update-global-instance-type-access [role] [full|custom|none]"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [full|custom|none]")
+      opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1077,22 +1100,23 @@ EOT
     instance_type_name = nil
     access_value = nil
     do_all = false
+    allowed_access_values = ['full', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[role] [type] [access]")
       opts.on( '--instance-type INSTANCE_TYPE', String, "Instance Type name" ) do |val|
         instance_type_name = val
       end
       opts.on( nil, '--all', "Update all instance types at once." ) do
         do_all = true
       end
-      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
         access_value = val
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
       opts.footer = "Update role access for an instance type or all instance types.\n" +
-                    "[name] is required. This is the name or id of a role.\n" + 
+                    "[role] is required. This is the name or id of a role.\n" + 
                     "--instance-type or --all is required. This is the name of an instance type.\n" + 
-                    "--access is required. This is the new access value."
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
 
@@ -1101,7 +1125,7 @@ EOT
       return 1
     end
     name = args[0]
-    # support old usage: [name] [instance-type] [access]
+    # support old usage: [role] [instance-type] [access]
     instance_type_name ||= args[1]
     access_value ||= args[2]
 
@@ -1170,10 +1194,10 @@ EOT
   end
 
   def update_global_blueprint_access(args)
-    usage = "Usage: morpheus roles update-global-blueprint-access [name] [full|custom|none]"
+    usage = "Usage: morpheus roles update-global-blueprint-access [role] [full|custom|none]"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [full|custom|none]")
+      opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1222,42 +1246,46 @@ EOT
     blueprint_id = nil
     access_value = nil
     do_all = false
+    allowed_access_values = ['full', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[role] [blueprint] [access]")
       opts.on( '--blueprint ID', String, "Blueprint ID or Name" ) do |val|
         blueprint_id = val
       end
       opts.on( nil, '--all', "Update all blueprints at once." ) do
         do_all = true
       end
-      opts.on( '--access VALUE', String, "Access value [full|read|none]" ) do |val|
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
         access_value = val
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
       opts.footer = "Update role access for an blueprint or all blueprints.\n" +
-                    "[name] is required. This is the name or id of a role.\n" + 
+                    "[role] is required. This is the name or id of a role.\n" + 
                     "--blueprint or --all is required. This is the name or id of a blueprint.\n" + 
-                    "--access is required. This is the new access value."
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
 
-    if args.count < 1
-      puts optparse
-      return 1
-    end
+    # usage: update-blueprint-access [role] [access] --all
+    #        update-blueprint-access [role] [blueprint] [access]
     name = args[0]
-    # support old usage: [name] [blueprint] [access]
-    blueprint_id ||= args[1]
-    access_value ||= args[2]
-
-    if (!blueprint_id && !do_all) || !access_value
-      puts_error optparse
-      return 1
+    if do_all
+      verify_args!(args:args, optparse:optparse, min:1, max:2)
+      access_value = args[1] if args[1]
+    else
+      verify_args!(args:args, optparse:optparse, min:1, max:3)
+      blueprint_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !blueprint_id && !do_all
+      raise_command_error("missing required argument: [blueprint] or --all", optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", optparse)
     end
-    
     access_value = access_value.to_s.downcase
-
-    if !['full', 'none'].include?(access_value)
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", optparse)
       puts optparse
       return 1
     end
@@ -1327,10 +1355,10 @@ EOT
   end
 
   def update_global_catalog_item_type_access(args)
-    usage = "Usage: morpheus roles update-global-catalog-item-type-access [name] [full|custom|none]"
+    usage = "Usage: morpheus roles update-global-catalog-item-type-access [role] [full|custom|none]"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [full|custom|none]")
+      opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1379,42 +1407,46 @@ EOT
     catalog_item_type_id = nil
     access_value = nil
     do_all = false
+    allowed_access_values = ['full', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[role] [catalog-item-type] [access]")
       opts.on( '--catalog-item-type ID', String, "Catalog Item Type ID or Name" ) do |val|
         catalog_item_type_id = val
       end
       opts.on( nil, '--all', "Update all catalog item types at once." ) do
         do_all = true
       end
-      opts.on( '--access VALUE', String, "Access value [full|none]" ) do |val|
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
         access_value = val
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
       opts.footer = "Update role access for an catalog item type or all types.\n" +
-                    "[name] is required. This is the name or id of a role.\n" + 
+                    "[role] is required. This is the name or id of a role.\n" + 
                     "--catalog-item-type or --all is required. This is the name or id of a catalog item type.\n" + 
-                    "--access is required. This is the new access value."
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
 
-    if args.count < 1
-      puts optparse
-      return 1
-    end
+    # usage: update-catalog_item_type-access [role] [access] --all
+    #        update-catalog_item_type-access [role] [catalog-item-type] [access]
     name = args[0]
-    # support old usage: [name] [catalog_item_type] [access]
-    catalog_item_type_id ||= args[1]
-    access_value ||= args[2]
-
-    if (!catalog_item_type_id && !do_all) || !access_value
-      puts_error optparse
-      return 1
+    if do_all
+      verify_args!(args:args, optparse:optparse, min:1, max:2)
+      access_value = args[1] if args[1]
+    else
+      verify_args!(args:args, optparse:optparse, min:1, max:3)
+      catalog_item_type_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !catalog_item_type_id && !do_all
+      raise_command_error("missing required argument: [catalog-item-type] or --all", optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", optparse)
     end
-    
     access_value = access_value.to_s.downcase
-
-    if !['full', 'none'].include?(access_value)
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", optparse)
       puts optparse
       return 1
     end
@@ -1484,44 +1516,49 @@ EOT
   def update_persona_access(args)
     options = {}
     persona_id = nil
+    name = nil
     access_value = nil
     do_all = false
+    allowed_access_values = ['full', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [serviceCatalog|standard]")
+      opts.banner = subcommand_usage("[role] [persona] [access]")
       opts.on( '--persona CODE', String, "Persona Code" ) do |val|
         persona_id = val
       end
       opts.on( nil, '--all', "Update all personas at once." ) do
         do_all = true
       end
-      opts.on( '--access VALUE', String, "Access value [full|none]" ) do |val|
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
         access_value = val
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
-      opts.footer = "Update role access for an persona or personas.\n" +
-                    "[name] is required. This is the name or id of a role.\n" + 
-                    "--persona or --all is required. This is the code of a persona.\n" + 
-                    "--access is required. This is the new access value."
+      opts.footer = "Update role access for a persona or all personas.\n" +
+                    "[role] is required. This is the name or id of a role.\n" + 
+                    "--persona or --all is required. This is the code of a persona. Service Catalog or Standard\n" + 
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
 
-    if args.count < 1
-      puts optparse
-      return 1
-    end
+    # usage: update-persona-access [role] [access] --all
+    #        update-persona-access [role] [persona] [access]
     name = args[0]
-    # support old usage: [name] [persona] [access]
-    persona_id ||= args[1]
-    access_value ||= args[2]
-
-    if (!persona_id && !do_all) || !access_value
-      puts_error optparse
-      return 1
+    if do_all
+      verify_args!(args:args, optparse:optparse, min:1, max:2)
+      access_value = args[1] if args[1]
+    else
+      verify_args!(args:args, optparse:optparse, min:1, max:3)
+      persona_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !persona_id && !do_all
+      raise_command_error("missing required argument: [persona] or --all", optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", optparse)
     end
-    
     access_value = access_value.to_s.downcase
-
-    if !['full', 'none'].include?(access_value)
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", optparse)
       puts optparse
       return 1
     end
@@ -1573,12 +1610,13 @@ EOT
   
   def add_role_option_types
     [
-      {'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldName' => 'roleType', 'fieldLabel' => 'Role Type', 'type' => 'select', 'selectOptions' => [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}], 'defaultValue' => 'user', 'displayOrder' => 3},
-      {'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 4},
-      {'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use', 'displayOrder' => 5},
-      {'fieldName' => 'multitenantLocked', 'fieldLabel' => 'Multitenant Locked', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'Prevents subtenants from branching off this role/modifying it. ', 'displayOrder' => 6}
+      {'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
+      {'fieldName' => 'roleType', 'fieldLabel' => 'Role Type', 'type' => 'select', 'selectOptions' => [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}], 'defaultValue' => 'user'},
+      {'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text'},
+      {'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use'},
+      {'fieldName' => 'multitenantLocked', 'fieldLabel' => 'Multitenant Locked', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'Prevents subtenants from branching off this role/modifying it. '},
+      {'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'selectOptions' => [{'name'=>'Service Catalog','value'=>'serviceCatalog'},{'name'=>'Standard','value'=>'standard'}], 'description' => 'Default Persona'}
     ]
   end