morpheus-cli 5.3.0.3 → 5.3.2.1

data/lib/morpheus/cli/option_types.rb

@@ -46,15 +46,29 @@ module Morpheus
           if options[:help_field_prefix]
             option_type[:help_field_prefix] = options[:help_field_prefix]
           end
+          # a lot of optionTypes have fieldGroup:'Options' instead of 'default'
+          if option_type['fieldGroup'].to_s.downcase == 'options'
+            option_type['fieldGroup'] = 'default'
+          end
         end
         # puts "Options Prompt #{options}"
-        # only sort if displayOrder is set
-        sorted_option_types = (option_types[0] && option_types[0]['displayOrder']) ? option_types.sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i } : option_types
-        sorted_option_types.each do |option_type|
+        # Sort options by default, group, advanced
+        cur_field_group = 'default'
+        (
+          option_types.reject {|it| (it['fieldGroup'] || 'default') != 'default'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
+          option_types.reject {|it| ['default', 'advanced'].include?(it['fieldGroup'] || 'default')}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
+          option_types.reject {|it| it['fieldGroup'] != 'advanced'}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
+        ).each do |option_type|
           context_map = results
           value = nil
           value_found=false
 
+          if cur_field_group != (option_type['fieldGroup'] || 'default')
+            cur_field_group = option_type['fieldGroup']
+            cur_field_group = cur_field_group.to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
+            print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
+          end
+
           # How about this instead?
           # option_type = option_type.clone
           # field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
@@ -78,46 +92,39 @@ module Morpheus
           if !option_type['visibleOnCode'].to_s.empty?
             visible_option_check_value = option_type['visibleOnCode']
           end
+
           if !visible_option_check_value.to_s.empty?
-            # support formats code=value or code:value OR code:(value|value2|value3)
-            # OR fieldContext.fieldName=value
-            parts = visible_option_check_value.include?("=") ? visible_option_check_value.split("=") : visible_option_check_value.split(":")
-            depends_on_code = parts[0]
-            depends_on_value = parts[1].to_s.strip
-            depends_on_values = []
-            if depends_on_value.size > 0
-              # strip parenthesis
-              if depends_on_value[0] && depends_on_value[0].chr == "("
-                depends_on_value = depends_on_value[1..-1]
-              end
-              depends_on_value.chomp(")")
-              depends_on_values = depends_on_value.split("|").collect { |it| it.strip }
-            end
-            depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
-            if !depends_on_option_type
-              depends_on_option_type = option_types.find {|it| 
-                (it['fieldContext'] ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName']) == depends_on_code
-              }
+            match_type = 'any'
+
+            if visible_option_check_value.include?('::')
+              match_type = 'all' if visible_option_check_value.start_with?('matchAll')
+              visible_option_check_value = visible_option_check_value[visible_option_check_value.index('::') + 2..-1]
             end
-            if depends_on_option_type
-              # dependent option type has a different value
-              depends_on_field_key = depends_on_option_type['fieldContext'] ? "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldName']}"
-              found_dep_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
-              if depends_on_values.size > 0
-                # must be in the specified values
-                # todo: uhh this actually needs to change to parse regex
-                if !depends_on_values.include?(found_dep_value)
-                  next
-                end
-              else
-                # no value found
-                if found_dep_value.to_s.empty?
-                  next
+
+            found_dep_value = match_type == 'all' ? true : false
+            visible_option_check_value.split(',').each do |value|
+              parts = value.split(':')
+              depends_on_code = parts[0]
+              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : '.'
+              depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
+              if !depends_on_option_type
+                depends_on_option_type = option_types.find {|it|
+                  (it['fieldContext'] ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName']) == depends_on_code
+                }
+              end
+
+              if depends_on_option_type
+                depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
+                field_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
+
+                if !field_value.nil? && field_value.match?(depends_on_value)
+                  found_dep_value = true if match_type != 'all'
+                else
+                  found_dep_value = false if match_type == 'all'
                 end
               end
-            else
-              # could not find the dependent option type, proceed and prompt
             end
+            next if !found_dep_value
           end
 
           cur_namespace = options
@@ -139,7 +146,9 @@ module Morpheus
             value = cur_namespace[field_name]
             input_value = ['select', 'multiSelect','typeahead', 'multiTypeahead'].include?(option_type['type']) && option_type['fieldInput'] ? cur_namespace[option_type['fieldInput']] : nil
             if option_type['type'] == 'number'
-              value = value.to_s.include?('.') ? value.to_f : value.to_i
+              if !value.to_s.empty?
+                value = value.to_s.include?('.') ? value.to_f : value.to_i
+              end
             # 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, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), true)
@@ -265,30 +274,13 @@ module Morpheus
 
           if option_type['type'] == 'multiSelect'
             value = [value] if !value.nil? && !value.is_a?(Array)
-            parent_context_map[parent_ns] = value
-          else
-            context_map[field_name] = value
+            # parent_context_map[parent_ns] = value
           end
+          context_map[field_name] = value
         end
         results
       end
 
-      def self.grails_params(data, context=nil)
-        params = {}
-        data.each do |k,v|
-          if v.is_a?(Hash)
-            params.merge!(grails_params(v, context ? "#{context}.#{k.to_s}" : k))
-          else
-            if context
-              params["#{context}.#{k.to_s}"] = v
-            else
-              params[k.to_s] = v
-            end
-          end
-        end
-        return params
-      end
-
       def self.radio_prompt(option_type)
         value_found = false
         value = nil
@@ -330,7 +322,9 @@ module Morpheus
           print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
           input = $stdin.gets.chomp!
           value = input.empty? ? option_type['defaultValue'] : input
-          value = value.to_s.include?('.') ? value.to_f : value.to_i
+          if !value.to_s.empty?
+            value = value.to_s.include?('.') ? value.to_f : value.to_i
+          end
           if input == '?'
             help_prompt(option_type)
           elsif !value.nil? || option_type['required'] != true
@@ -363,7 +357,7 @@ module Morpheus
         if option_type['selectOptions']
           # calculate from inline lambda
           if option_type['selectOptions'].is_a?(Proc)
-            select_options = option_type['selectOptions'].call(api_client, grails_params(api_params || {}))
+            select_options = option_type['selectOptions'].call(api_client, api_params || {})
           else
             # todo: better type validation
             select_options = option_type['selectOptions']
@@ -371,13 +365,13 @@ module Morpheus
         elsif option_type['optionSource']
           # calculate from inline lambda
           if option_type['optionSource'].is_a?(Proc)
-            select_options = option_type['optionSource'].call(api_client, grails_params(api_params || {}))
+            select_options = option_type['optionSource'].call(api_client, api_params || {})
           elsif option_type['optionSource'] == 'list'
             # /api/options/list is a special action for custom OptionTypeLists, just need to pass the optionTypeId parameter
-            select_options = load_source_options(option_type['optionSource'], api_client, grails_params(api_params || {}).merge({'optionTypeId' => option_type['id']}))
+            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {}.merge({'optionTypeId' => option_type['id']}))
           else
             # remote optionSource aka /api/options/$optionSource?
-            select_options = load_source_options(option_type['optionSource'], api_client, grails_params(api_params || {}))
+            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
           end
         else
           raise "option '#{field_key}' is type: 'select' and missing selectOptions or optionSource!"
@@ -571,6 +565,7 @@ module Morpheus
           # looking for help with this input
           if input == '?'
             help_prompt(option_type)
+            select_options = load_options(option_type, api_client, api_params)
             display_select_options(option_type, select_options) unless select_options.empty?
             next
           end
@@ -597,7 +592,7 @@ module Morpheus
           # actually that is redundant, it should already be filtered to matches
           # and can just do this:
           # select_option = select_options.size == 1 ? select_options[0] : nil
-          select_option = select_options.find{|b| (b[value_field] && (b[value_field].to_s == input.to_s)) || ((b[value_field].nil? || b[value_field].empty?) && (input == "")) }
+          select_option = select_options.find{|b| (b[value_field] && (b[value_field].to_s == input.to_s)) || ((b[value_field].nil? || b[value_field] == "") && (input == "")) }
           if select_option.nil?
             select_option = select_options.find{|b| b['name'] && b['name'] == input }
           end
@@ -888,7 +883,7 @@ module Morpheus
         if option_type['selectOptions']
           # calculate from inline lambda
           if option_type['selectOptions'].is_a?(Proc)
-            select_options = option_type['selectOptions'].call(api_client, grails_params(api_params || {}))
+            select_options = option_type['selectOptions'].call(api_client, api_params || {})
           else
             select_options = option_type['selectOptions']
           end
@@ -903,13 +898,13 @@ module Morpheus
         elsif option_type['optionSource']
           # calculate from inline lambda
           if option_type['optionSource'].is_a?(Proc)
-            select_options = option_type['optionSource'].call(api_client, grails_params(api_params || {}))
+            select_options = option_type['optionSource'].call(api_client, api_params || {})
           elsif option_type['optionSource'] == 'list'
             # /api/options/list is a special action for custom OptionTypeLists, just need to pass the optionTypeId parameter
-            select_options = load_source_options(option_type['optionSource'], api_client, grails_params(api_params || {}).merge({'optionTypeId' => option_type['id']}))
+            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {}.merge({'optionTypeId' => option_type['id']}))
           else
             # remote optionSource aka /api/options/$optionSource?
-            select_options = load_source_options(option_type['optionSource'], api_client, grails_params(api_params || {}))
+            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
           end
         else
           raise "option '#{field_key}' is type: 'typeahead' and missing selectOptions or optionSource!"
@@ -935,8 +930,8 @@ module Morpheus
       end
 
 
-      def self.load_source_options(source,api_client,params)
-        api_client.options.options_for_source(source,params)['data']
+      def self.load_source_options(source,sourceType,api_client,params)
+        api_client.options.options_for_source("#{sourceType ? "#{sourceType}/" : ''}#{source}",params)['data']
       end
 
       def self.format_select_options_help(opt, select_options = [], paging = nil)
@@ -951,7 +946,7 @@ module Morpheus
         out = ""
         out << "\n"
         out << "#{header}\n"
-        out << "===============\n"
+        out << "#{'=' * header.length}\n"
         select_options.each do |option|
           out << " * #{option['name']} [#{option['value']}]\n"
         end

data/lib/morpheus/cli/policies_command.rb

@@ -26,7 +26,6 @@ class Morpheus::Cli::PoliciesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    # @policies_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).policies
     @policies_interface = @api_client.policies
     @group_policies_interface = @api_client.group_policies
     @cloud_policies_interface = @api_client.cloud_policies

data/lib/morpheus/cli/power_schedules_command.rb

@@ -13,9 +13,9 @@ class Morpheus::Cli::PowerSchedulesCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @power_schedules_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).power_schedules
-    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
-    @servers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).servers
+    @power_schedules_interface = @api_client.power_schedules
+    @instances_interface = @api_client.instances
+    @servers_interface = @api_client.servers
   end
 
   def handle(args)

data/lib/morpheus/cli/preseed_scripts_command.rb

@@ -23,7 +23,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @image_builder_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).image_builder
+    @image_builder_interface = @api_client.image_builder
     @preseed_scripts_interface = @image_builder_interface.preseed_scripts
   end
 

data/lib/morpheus/cli/remote.rb

@@ -1337,7 +1337,7 @@ EOT
     include Term::ANSIColor
 
     # for caching the the contents of YAML file $home/appliances
-    # it is structured like :appliance_name => {:host => "htt[://api.gomorpheus.com", :active => true}
+    # it is structured like :appliance_name => {:host => "https://api.gomorpheus.com", :active => true}
     # not named @@appliances to avoid confusion with the instance variable . This is also a command class...
     @@appliance_config = nil 
 
@@ -1700,7 +1700,7 @@ EOT
         # wtf, no url...
         return appliance, json_response
       else
-        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: (appliance[:insecure] != true), timeout: timeout})
+        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: !appliance[:insecure], timeout: timeout})
         start_time = Time.now
         begin
           json_response = setup_interface.check(params)

data/lib/morpheus/cli/reports_command.rb

@@ -368,7 +368,6 @@ class Morpheus::Cli::ReportsCommand
     do_mkdir = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [file]")
-      build_common_options(opts, options, [:dry_run, :remote])
       opts.on( '--format VALUE', String, "Report Format for exported file, json or csv. Default is json." ) do |val|
         report_format = val
       end
@@ -379,6 +378,7 @@ class Morpheus::Cli::ReportsCommand
       opts.on( '-p', '--mkdir', "Create missing directories for [local-file] if they do not exist." ) do
         do_mkdir = true
       end
+      build_common_options(opts, options, [:dry_run, :remote])
       opts.footer = "Export a report result as json or csv." + "\n" +
                     "[id] is required. This is id of the report result." + "\n" +
                     "[file] is required. This is local destination for the downloaded file."
@@ -394,6 +394,9 @@ class Morpheus::Cli::ReportsCommand
 
       outfile = args[1]
       outfile = File.expand_path(outfile)
+      if outfile =~ /\.csv\Z/i
+        report_format = "csv"
+      end
       
       if Dir.exists?(outfile)
         print_red_alert "[file] is invalid. It is the name of an existing directory: #{outfile}"

data/lib/morpheus/cli/roles.rb

@@ -13,21 +13,21 @@ class Morpheus::Cli::Roles
   include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
-  register_subcommands :list, :get, :add, :update, :remove, :'list-permissions', :'update-feature-access', :'update-global-group-access', :'update-group-access', :'update-global-cloud-access', :'update-cloud-access', :'update-global-instance-type-access', :'update-instance-type-access', :'update-global-blueprint-access', :'update-blueprint-access', :'update-global-catalog-item-type-access', :'update-catalog-item-type-access', :'update-persona-access'
+  register_subcommands :list, :get, :add, :update, :remove, :'list-permissions', :'update-feature-access', :'update-global-group-access', :'update-group-access', :'update-global-cloud-access', :'update-cloud-access', :'update-global-instance-type-access', :'update-instance-type-access', :'update-global-blueprint-access', :'update-blueprint-access', :'update-global-catalog-item-type-access', :'update-catalog-item-type-access', :'update-persona-access', :'update-global-vdi-pool-access', :'update-vdi-pool-access'
   alias_subcommand :details, :get
   set_default_subcommand :list
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @whoami_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).whoami
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
-    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
-    @instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
-    @blueprints_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).blueprints
+    @whoami_interface = @api_client.whoami
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
+    @groups_interface = @api_client.groups
+    @options_interface = @api_client.options
+    @instances_interface = @api_client.instances
+    @instance_types_interface = @api_client.instance_types
+    @blueprints_interface = @api_client.blueprints
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 
@@ -102,19 +102,23 @@ class Morpheus::Cli::Roles
         options[:include_blueprint_access] = true
       end
       opts.on(nil,'--catalog-item-type-access', "Display Catalog Item Type Access") do
-        options[:include_catalog_item_types_access] = true
+        options[:include_catalog_item_type_access] = true
       end
       opts.on(nil,'--personas', "Display Persona Access") do
         options[:include_personas_access] = true
       end
+      opts.on(nil,'--vdi-pool-access', "Display VDI Pool Access") do
+        options[:include_vdi_pool_access] = true
+      end
       opts.on('-a','--all', "Display All Access Lists") do
         options[:include_feature_access] = true
         options[:include_group_access] = true
         options[:include_cloud_access] = true
         options[:include_instance_type_access] = true
         options[:include_blueprint_access] = true
-        options[:include_catalog_item_types_access] = true
+        options[:include_catalog_item_type_access] = true
         options[:include_personas_access] = true
+        options[:include_vdi_pool_access] = true
       end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
@@ -206,9 +210,9 @@ EOT
           rows = rows.select {|row| row[:code].to_s =~ phrase_regexp || row[:name].to_s =~ phrase_regexp }
         end
         print as_pretty_table(rows, [:code, :name, :access], options)
-        print reset,"\n"
+        # print reset,"\n"
       else
-        print cyan,"Use --permissions to list permissions","\n"
+        print cyan,"Use --permissions to list feature permissions","\n"
       end
 
       has_group_access = true
@@ -220,6 +224,7 @@ EOT
         "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']) },
+        "VDI Pools" => lambda {|it| get_access_string(it['globalVdiPoolAccess']) },
       }
       if role['roleType'].to_s.downcase == 'account'
         global_access_columns.delete("Groups")
@@ -228,7 +233,7 @@ EOT
         global_access_columns.delete("Clouds")
         has_cloud_access = false
       end
-      puts as_pretty_table([json_response], global_access_columns, options)
+      print as_pretty_table([json_response], global_access_columns, options)
 
       if has_group_access
         #print_h2 "Group Access: #{get_access_string(json_response['globalSiteAccess'])}", options
@@ -246,7 +251,7 @@ EOT
           else
             print cyan,"Use -g, --group-access to list custom access","\n"
           end
-          print reset,"\n"
+          # print reset,"\n"
         else
           # print "\n"
           # print cyan,bold,"Group Access: #{get_access_string(json_response['globalSiteAccess'])}",reset,"\n"
@@ -270,7 +275,7 @@ EOT
           else
             print cyan,"Use -c, --cloud-access to list custom access","\n"
           end
-          print reset,"\n"
+          # print reset,"\n"
         else
           # print "\n"
           # print cyan,bold,"Cloud Access: #{get_access_string(json_response['globalZoneAccess'])}",reset,"\n"
@@ -293,7 +298,7 @@ EOT
         else
           print cyan,"Use -i, --instance-type-access to list custom access","\n"
         end
-        print reset,"\n"
+        # print reset,"\n"
       else
         # print "\n"
         # print cyan,bold,"Instance Type Access: #{get_access_string(json_response['globalInstanceTypeAccess'])}",reset,"\n"
@@ -317,7 +322,7 @@ EOT
         else
           print cyan,"Use -b, --blueprint-access to list custom access","\n"
         end
-        print reset,"\n"
+        # print reset,"\n"
       else
         # print "\n"
         # print cyan,bold,"Blueprint Access: #{get_access_string(json_response['globalAppTemplateAccess'])}",reset,"\n"
@@ -331,7 +336,7 @@ EOT
       # print "\n"
       if catalog_item_type_global_access == 'custom'
         print_h2 "Catalog Item Type Access", options
-        if options[:include_catalog_item_types_access]
+        if options[:include_catalog_item_type_access]
           rows = catalog_item_type_permissions.collect do |it|
             {
               name: it['name'],
@@ -350,6 +355,7 @@ EOT
 
       persona_permissions = json_response['personaPermissions'] || json_response['personas'] || []
       # if options[:include_personas_access]
+      print cyan
       if persona_permissions
         print_h2 "Persona Access", options
         rows = persona_permissions.collect do |it|
@@ -358,13 +364,34 @@ EOT
             access: format_access_string(it['access'], ["none","read","full"]),
           }
         end
-        print as_pretty_table(rows, [:name, :access], options)
-        print reset,"\n"        
+        print as_pretty_table(rows, [:name, :access], options)        
       end
 
       # print reset,"\n"
       
+      vdi_pool_global_access = json_response['globalVdiPoolAccess']
+      vdi_pool_permissions = json_response['vdiPoolPermissions'] || []
+      print cyan
+      if vdi_pool_global_access == 'custom'
+        print_h2 "VDI Pool Access", options
+        if options[:include_vdi_pool_access]
+          rows = vdi_pool_permissions.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 --vdi-pool-access to list custom access","\n"
+        end
+      else
+        # print "\n"
+        # print cyan,bold,"VDI Pool Access: #{get_access_string(json_response['globalVdiPoolAccess'])}",reset,"\n"
+      end
+
     end
+    print reset,"\n"
 
     return 0, nil
   end
@@ -520,7 +547,7 @@ EOT
         end
 
         # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'optionSource' => 'personas', 'description' => 'Default Persona'}], options[:options], @api_client)
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'selectOptions' => [{'name'=>'Service Catalog','value'=>'serviceCatalog'},{'name'=>'Standard','value'=>'standard'}], 'description' => 'Default Persona'}], options[:options], @api_client)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'selectOptions' => get_persona_select_options(), 'description' => 'Default Persona'}], options[:options], @api_client)
         role_payload['defaultPersona'] = {'code' => v_prompt['defaultPersona']} unless v_prompt['defaultPersona'].to_s.strip.empty?
 
         payload = {"role" => role_payload}
@@ -782,14 +809,14 @@ EOT
   def update_group_access(args)
     options = {}
     name = nil
-    group_name = nil
+    group_id = nil
     access_value = nil
     do_all = false
     allowed_access_values = ['full', 'read', 'none']
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[role] [group] [access]")
       opts.on( '-g', '--group GROUP', "Group name or id" ) do |val|
-        group_name = val
+        group_id = val
       end
       opts.on( nil, '--all', "Update all groups at once." ) do
         do_all = true
@@ -845,9 +872,8 @@ EOT
       end
 
       group = nil
-      group_id = nil
       if !do_all
-        group = find_group_by_name_or_id_for_provisioning(group_name)
+        group = find_group_by_name_or_id_for_provisioning(group_id)
         return 1 if group.nil?
         group_id = group['id']
       end
@@ -932,15 +958,14 @@ EOT
 
   def update_cloud_access(args)
     options = {}
-    cloud_name = nil
+    cloud_id = 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|
-        puts "val is : #{val}"
-        cloud_name = val
+        cloud_id = val
       end
       opts.on( nil, '--all', "Update all clouds at once." ) do
         do_all = true
@@ -948,9 +973,6 @@ EOT
       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|
-        options[:group] = val
-      end
       build_common_options(opts, options, [:json, :dry_run, :remote])
       opts.footer = "Update role access for a cloud or all clouds.\n" +
                     "[role] is required. This is the name or id of a role.\n" + 
@@ -998,23 +1020,11 @@ EOT
         exit 1
       end
 
-      # crap, group_id is needed for this api, maybe just use infrastructure or some other optionSource instead.
-      group_id = nil
-      cloud_id = nil
+      cloud = nil
       if !do_all
-        group_id = nil
-        if !options[:group].nil?
-          group = find_group_by_name_or_id_for_provisioning(options[:group])
-          group_id = group['id']
-        else
-          group_id = @active_group_id
-        end
-        if group_id.nil?
-          print_red_alert "Group not found or specified!"
-          return 1
-        end
-        cloud_id = find_cloud_id_by_name(group_id, cloud_name)
-        return 1 if cloud_id.nil?
+        cloud = find_cloud_by_name_or_id_for_provisioning(nil, cloud_id)
+        return 1 if cloud.nil?
+        cloud_id = cloud['id']
       end
       params = {}
       if do_all
@@ -1037,7 +1047,7 @@ EOT
         if do_all
           print_green_success "Role #{role['authority']} access updated for all clouds"
         else
-          print_green_success "Role #{role['authority']} access updated for cloud id #{cloud_id}"
+          print_green_success "Role #{role['authority']} access updated for cloud #{cloud['name']}"
         end
       end
       return 0
@@ -1534,7 +1544,7 @@ EOT
       build_common_options(opts, options, [:json, :dry_run, :remote])
       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" + 
+                    "--persona or --all is required. This is the code of a persona. Service Catalog, Standard, or Virtual Desktop\n" + 
                     "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
     end
     optparse.parse!(args)
@@ -1606,6 +1616,160 @@ EOT
     end
   end
 
+  def update_global_vdi_pool_access(args)
+    usage = "Usage: morpheus roles update-global-vdi-pool-access [role] [full|custom|none]"
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[role] [full|custom|none]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count: 2)
+    name = args[0]
+    access_value = args[1].to_s.downcase
+    if !['full', 'custom', 'none'].include?(access_value)
+      raise_command_error("invalid access value: #{args[1]}", optparse)
+    end
+
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      exit 1 if role.nil?
+      # note: VdiPools being plural is odd, the others are singular
+      params = {permissionCode: 'VdiPools', access: access_value}
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_permission(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Role #{role['authority']} global vdi pool access updated"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_vdi_pool_access(args)
+    options = {}
+    vdi_pool_id = nil
+    access_value = nil
+    do_all = false
+    allowed_access_values = ['full', 'none']
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[role] [vdi-pool] [access]")
+      opts.on( '--vdi-pool ID', String, "VDI Pool ID or Name" ) do |val|
+        vdi_pool_id = val
+      end
+      opts.on( nil, '--all', "Update all VDI pools at once." ) do
+        do_all = true
+      end
+      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 VDI pool or all VDI pools.\n" +
+                    "[role] is required. This is the name or id of a role.\n" + 
+                    "--vdi-pool or --all is required. This is the name or id of a VDI pool.\n" + 
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
+    end
+    optparse.parse!(args)
+
+    # usage: update-vdi-pool-access [role] [access] --all
+    #        update-vdi-pool-access [role] [vdi-pool] [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)
+      vdi_pool_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !vdi_pool_id && !do_all
+      raise_command_error("missing required argument: [vdi-pool] or --all", optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", optparse)
+    end
+    access_value = access_value.to_s.downcase
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", optparse)
+      puts optparse
+      return 1
+    end
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      return 1 if role.nil?
+
+      role_json = @roles_interface.get(account_id, role['id'])
+      vdi_pool_global_access = role_json['globalVdiPoolAccess']
+      vdi_pool_permissions = role_json['vdiPoolPermissions'] || []
+      if vdi_pool_global_access != 'custom'
+        print "\n", red, "Global VDI Pool Access is currently: #{vdi_pool_global_access.to_s.capitalize}"
+        print "\n", "You must first set it to Custom via `morpheus roles update-global-vdi-pool-access \"#{name}\" custom`"
+        print "\n\n", reset
+        return 1
+      end
+
+      # hacky, but support name or code lookup via the list returned in the show payload
+      vdi_pool = nil
+      if !do_all
+        if vdi_pool_id.to_s =~ /\A\d{1,}\Z/
+          vdi_pool = vdi_pool_permissions.find {|b| b['id'] == vdi_pool_id.to_i }
+        else
+          vdi_pool = vdi_pool_permissions.find {|b| b['name'] == vdi_pool_id }
+        end
+        if vdi_pool.nil?
+          print_red_alert "VDI Pool not found: '#{vdi_pool_id}'"
+          return 1
+        end
+      end
+
+      params = {}
+      if do_all
+        params['allVdiPools'] = true
+      else
+        params['vdiPoolId'] = vdi_pool['id']
+      end
+      params['access'] = access_value
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_vdi_pool(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_vdi_pool(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all VDI pools"
+        else
+          print_green_success "Role #{role['authority']} access updated for VDI pool #{vdi_pool['name']}"
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
   
   def add_role_option_types
@@ -1616,7 +1780,7 @@ EOT
       {'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'}
+      {'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona', 'type' => 'select', 'selectOptions' => get_persona_select_options(), 'description' => 'Default Persona'}
     ]
   end
 
@@ -1624,20 +1788,16 @@ EOT
     add_role_option_types.reject {|it| ['roleType', 'baseRole'].include?(it['fieldName']) }
   end
 
-
-  def find_cloud_id_by_name(group_id, name)
-    option_results = @options_interface.options_for_source('clouds', {groupId: group_id})
-    match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
-    if match.nil?
-      print_red_alert "Cloud not found by name #{name}"
-      return nil
-    else
-      return match['value']
-    end
-  end
-
   def role_type_options
     [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}]
   end
 
+  def get_persona_select_options
+    [
+      {'name'=>'Service Catalog','value'=>'serviceCatalog'},
+      {'name'=>'Standard','value'=>'standard'},
+      {'name'=>'Virtual Desktop','value'=>'vdi'}
+    ]
+  end
+
 end