morpheus-cli 8.1.2 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b70de51756c24d66d525a95fa915fad33ba69bd53fe631dc160966830b1cd80
-  data.tar.gz: ed8478518da781a70c3fda18cef5b07061b65c433cb73d16fd714128cb666ec5
+  metadata.gz: 1f2fdd08e0bf0dbe8567812778748a10d38dbb6efd64430fc50fdf1134528be3
+  data.tar.gz: 2219cdf94a929a790e75d727068567adb10d09a80c30971e96365726812d3334
 SHA512:
-  metadata.gz: 1e7bc745768d69b29f5285a7c86d7390e83ced97e1db36cce9d686c771bda49ac832b48f724c6fe80059ed2d8e0bd7a304f4212bf2abf563ed66b1b440126c53
-  data.tar.gz: fcb53e94eadb615e960ad1c6e6410b13d40ce8f45076a675a8bb3e4e37c3a0be31b2c4797106e3ac98c05f79981bd5d7bb9a6d80a4f3fee5ddf26155f31f21e9
+  metadata.gz: 7b276775f4746e397b8d4b05c3c09c04d9b02409c7511e6a40a3ac80a160642d376fb10a2bf78477bfe84f3b3fc9abc1680ca332307efe4c250ec2b478a961f3
+  data.tar.gz: 7046dcbfff992519d64e93c1fd1383b0bb1c3166dfad466d56661a2ee65e0b45038a9d94d4c7812ab423c285267347609337e0312fddeeae82fe5f001b67cc6e

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.1.2
+RUN gem install morpheus-cli -v 9.0.1
 
-ENTRYPOINT ["morpheus"]
+ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -1034,6 +1034,10 @@ class Morpheus::APIClient
     Morpheus::MigrationsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def tokens
+    Morpheus::TokensInterface.new(common_interface_options).setopts(@options)
+  end
+
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end
@@ -1048,6 +1052,10 @@ class Morpheus::APIClient
   end
   alias :get_interface :interface
 
+  def support_bundles
+    Morpheus::SupportBundlesInterface.new(common_interface_options).setopts(@options)
+  end
+
   # add new interfaces here
 
   protected

data/lib/morpheus/api/clusters_interface.rb

@@ -389,5 +389,29 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :delete, url: url, headers: headers)
   end
+
+  def available_updates(id, params={})
+    url = "#{base_path}/#{id}/available-updates"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def list_updates(id, update_id, params={})
+    url = "#{base_path}/#{id}/available-updates"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+  
+  def get_update(id, update_id, params={})
+    url = "#{base_path}/#{id}/available-updates/#{update_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def execute_update(id, payload)
+    url = "#{base_path}/#{id}/execute-update"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
   
 end

data/lib/morpheus/api/groups_interface.rb

@@ -9,7 +9,7 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def get(options=nil)
+  def get(options=nil, params={})
     url = "#{@base_url}/api/groups"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
 
@@ -17,6 +17,7 @@ class Morpheus::GroupsInterface < Morpheus::APIClient
       headers[:params].merge!(options)
     elsif options.is_a?(Numeric)
       url = "#{@base_url}/api/groups/#{options}"
+      headers[:params] = params
     elsif options.is_a?(String)
       headers[:params]['name'] = options
     end

data/lib/morpheus/api/instances_interface.rb

@@ -296,7 +296,7 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
   def service_plans(params={})
     url = "#{@base_url}/api/instances/service-plans"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
+    opts = {method: :get, url: url, headers: headers, timeout: 180}
     execute(opts)
   end
 

data/lib/morpheus/api/options_interface.rb

@@ -12,6 +12,6 @@ class Morpheus::OptionsInterface < Morpheus::APIClient
       url = "#{@base_url}/api/options/#{option_source_type}/#{source}"
     end
     headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+    execute(method: :get, url: url, headers: headers, timeout: 180)
   end
 end

data/lib/morpheus/api/servers_interface.rb

@@ -219,5 +219,4 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
-
 end

data/lib/morpheus/api/storage_volumes_interface.rb

@@ -13,4 +13,12 @@ class Morpheus::StorageVolumesInterface < Morpheus::RestInterface
     execute(opts)
   end
 
+  # Transfer ownership of a storage volume to another tenant.
+  # The server expects { "storageVolume": { "tenant": { "id": <id> } } }
+  # and handles all authorization and business-rule validation.
+  def update_tenant(id, payload, params={}, headers={})
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, payload: payload, headers: headers)
+  end
+
 end

data/lib/morpheus/api/support_bundles_interface.rb

@@ -0,0 +1,46 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::SupportBundlesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/support-bundles"
+  end
+
+  # Download uses chunked streaming to write directly to a file.
+  # Follows the same pattern as file_copy_request_interface.rb#download_file_chunked.
+  def download(id, outfile, params={})
+    raise "#{self.class}.download() passed a blank id!" if id.to_s == ''
+    url = "#{base_path}/#{CGI::escape(id.to_s)}/download"
+    headers = { params: params }
+    opts = {method: :get, url: url, headers: headers, parse_json: false}
+    if Dir.exist?(outfile)
+      raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
+    end
+    if @dry_run
+      return execute(opts)
+    end
+    http_response = nil
+    begin
+      File.open(outfile, 'w') {|f|
+        block = proc { |response|
+          response.read_body do |chunk|
+            f.write chunk
+          end
+        }
+        opts[:block_response] = block
+        http_response = execute(opts)
+      }
+    rescue
+      if File.exist?(outfile) && File.file?(outfile)
+        File.delete(outfile)
+      end
+      raise
+    end
+    return http_response
+  end
+
+  def cancel(id, payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(id.to_s)}/cancel", params: params, payload: payload, headers: headers)
+  end
+
+end

data/lib/morpheus/api/systems_interface.rb

@@ -20,4 +20,36 @@ class Morpheus::SystemsInterface < Morpheus::RestInterface
     execute(method: :get, url: "#{base_path}/#{CGI::escape(id.to_s)}/validate", params: params, headers: headers)
   end
 
+  def list_compute_server_update_definitions(system_id, server_id, params={}, headers={})
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/servers/#{CGI::escape(server_id.to_s)}/update-definitions", params: params, headers: headers)
+  end
+
+  def apply_compute_server_update_definition(system_id, server_id, update_definition_id, payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/servers/#{CGI::escape(server_id.to_s)}/update-definitions/#{CGI::escape(update_definition_id.to_s)}", params: params, payload: payload, headers: headers)
+  end
+
+  def list_storage_server_update_definitions(system_id, server_id, params={}, headers={})
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/storage-servers/#{CGI::escape(server_id.to_s)}/update-definitions", params: params, headers: headers)
+  end
+
+  def apply_storage_server_update_definition(system_id, server_id, update_definition_id, payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/storage-servers/#{CGI::escape(server_id.to_s)}/update-definitions/#{CGI::escape(update_definition_id.to_s)}", params: params, payload: payload, headers: headers)
+  end
+
+  def list_network_server_update_definitions(system_id, server_id, params={}, headers={})
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/network-servers/#{CGI::escape(server_id.to_s)}/update-definitions", params: params, headers: headers)
+  end
+
+  def apply_network_server_update_definition(system_id, server_id, update_definition_id, payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/network-servers/#{CGI::escape(server_id.to_s)}/update-definitions/#{CGI::escape(update_definition_id.to_s)}", params: params, payload: payload, headers: headers)
+  end
+
+  def list_cluster_update_definitions(system_id, cluster_id, params={}, headers={})
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/clusters/#{CGI::escape(cluster_id.to_s)}/update-definitions", params: params, headers: headers)
+  end
+
+  def apply_cluster_update_definition(system_id, cluster_id, update_definition_id, payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(system_id.to_s)}/clusters/#{CGI::escape(cluster_id.to_s)}/update-definitions/#{CGI::escape(update_definition_id.to_s)}", params: params, payload: payload, headers: headers)
+  end
+
 end

data/lib/morpheus/api/tokens_interface.rb

@@ -0,0 +1,39 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::TokensInterface < Morpheus::APIClient
+
+  def base_path
+    "/api/tokens"
+  end
+
+  def list(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
+  end
+
+  def get(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
+  end
+
+  def create(payload, params={})
+    execute(method: :post, url: "#{base_path}", payload: payload, params: params)
+  end
+
+  # def update(id, payload, params={})
+  #   execute(method: :put, url: "#{base_path}/#{id}", params: params, headers: headers)
+  # end
+
+  def destroy(id, params={})
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{id}", params: params)
+  end
+  
+  def destroy_all(params={})
+    execute(method: :delete, url: "#{base_path}", params: params)
+  end
+
+  def available_clients(params={})
+    execute(method: :get, url: "#{base_path}/api-clients", params: params)
+  end
+
+end

data/lib/morpheus/api/virtual_images_interface.rb

@@ -117,7 +117,11 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
          gz.close
       }
       http_opts[:body] = Morpheus::BodyIO.new(rd)
-      response = http.post(url, http_opts)
+      if Gem::Version.new(HTTP::VERSION) >= Gem::Version.new("6.0.0")
+        response = http.post(url, **http_opts)
+      else
+        response = http.post(url, http_opts)
+      end
     else
       if @dry_run
         return {method: :post, url: url, headers: headers, params: query_params, payload: payload}
@@ -126,7 +130,11 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
       http = HTTP.headers(headers)
       http_opts[:params] = query_params
       http_opts[:body] = payload
-      response = http.post(url, http_opts)
+      if Gem::Version.new(HTTP::VERSION) >= Gem::Version.new("6.0.0")
+        response = http.post(url, **http_opts)
+      else
+        response = http.post(url, http_opts)
+      end
     end
     # puts "Took #{Time.now.to_i - start_time.to_i}"
     # return response

data/lib/morpheus/cli/cli_command.rb

@@ -1485,7 +1485,12 @@ module Morpheus
       # returns Array of subtitles as strings in the format ["Phrase: blah", "Max: 100"]
       def parse_list_subtitles(options={})
         subtitles = []
-        list_params = {}
+        if options[:tenant]
+          subtitles << "Tenant: #{options[:tenant]}".strip
+        end
+        if options[:include_tenants]
+          subtitles << "Include Tenants: true".strip
+        end
         [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
           if options.key?(k)
             subtitles << "#{k.to_s}: #{options[k]}"

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

@@ -96,6 +96,8 @@ EOT
       print_h1 "Backup Details", [], options
       print cyan
       columns = backup_column_definitions
+      columns.delete("Backup Provider") if backup['backupProvider'].nil?
+      columns.delete("Storage Provider") if backup['storageProvider'].nil?
       columns.delete("Instance") if backup['instance'].nil?
       columns.delete("Container ID") if backup['containerId'].nil?
       columns.delete("Host") if backup['server'].nil?
@@ -541,8 +543,9 @@ EOT
     {
       "ID" => 'id',
       "Name" => 'name',
-      "Backup Type" => lambda {|it| format_backup_type_tag(it) },
-      "Backup Location" => lambda {|it| format_backup_location_tag(it) },
+      "Backup Type" => lambda {|it| (it['backupType'] && it['backupType']['name']) ? it['backupType']['name'] : format_backup_type_tag(it) },
+      "Backup Provider" => lambda {|it| it['backupProvider']['name'] rescue '' },
+      "Storage Provider" => lambda {|it| it['storageProvider']['name'] rescue '' },
       "Location Type" => lambda {|it| 
         if it['locationType'] == "instance"
           "Instance"
@@ -610,11 +613,11 @@ EOT
   def format_backup_location_tag(backup)
     # check storage provider or backup provider indicating remote storage
     if backup['storageProvider'] && backup['storageProvider']['id']
-      provider_type = backup['storageProvider']['type'] || backup['storageProvider']['providerType'] || ''
-      "#{green}REMOTE#{reset} (#{provider_type})"
+      provider_label = backup['storageProvider']['type'] || backup['storageProvider']['providerType'] || backup['storageProvider']['name'] || ''
+      "#{green}REMOTE#{reset} (#{provider_label})"
     elsif backup['backupProvider'] && backup['backupProvider']['id']
-      provider_type = backup['backupProvider']['type'] || backup['backupProvider']['providerType'] || ''
-      "#{green}REMOTE#{reset} (#{provider_type})"
+      provider_label = backup['backupProvider']['type'] || backup['backupProvider']['providerType'] || backup['backupProvider']['name'] || ''
+      "#{green}REMOTE#{reset} (#{provider_label})"
     else
       "#{blue}LOCAL#{reset}"
     end

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

@@ -30,41 +30,29 @@ class Morpheus::Cli::ClientsCommand
     end
     optparse.parse!(args)
     connect(options)
-
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     params.merge!(parse_list_options(options))
     @clients_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @clients_interface.dry.list(params)
       return 0
     end
-
     json_response = @clients_interface.list(params)
     render_response(json_response, options, "clients") do 
-      clients = json_response["clients"]
-      if clients.empty?
-        print cyan,"No clients found",reset,"\n"
-      else
-        rows = clients.collect {|client|
-          row = {
-            id: client['id'],
-            client_id: client['clientId'],
-            access_token_seconds: client['accessTokenValiditySeconds'],
-            refresh_token_seconds: client['refreshTokenValiditySeconds']
-          }
-          row
-        }
-        columns = [:id, {:client_id => {:max_width => 50}}, :access_token_seconds, :refresh_token_seconds]
-        print_h1 "Morpheus Clients", [], options
-        print as_pretty_table(rows, columns, options)
-        print reset
-        print_results_pagination(json_response)
-      end
+      clients = json_response['clients']
+      print_h1 "Morpheus Clients", [], options
+      print as_pretty_table(clients, client_columns.upcase_keys!, options)
+      print reset
+      print_results_pagination(json_response)
       print reset,"\n"
     end
-    return 0, nil
   end
 
   def get(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[client]")
@@ -74,47 +62,28 @@ class Morpheus::Cli::ClientsCommand
 
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
-    begin
-      @clients_interface.setopts(options)
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @clients_interface.dry.get(args[0])
-        else
-          print_dry_run @clients_interface.dry.list({name: args[0].to_s})
-        end
-        return 0
-      end
-      client = find_client_by_name_or_id(args[0])
+    id = args[0]
+    if id.to_s !~ /\A\d{1,}\Z/
+      client = find_client_by_client_id(id)
       return 1 if client.nil?
-      json_response = {'client' => client}
-      render_result = render_with_format(json_response, options, 'client')
-      return 0 if render_result
-
-      unless options[:quiet]
-        print_h1 "Client Details"
-        print cyan
-        client_columns = {
-          "ID" => 'id',
-          "Client ID" => 'clientId',
-          "Access Token Validity Seconds" => 'accessTokenValiditySeconds',
-          "Refresh Token Validity Seconds" => 'refreshTokenValiditySeconds',
-          # "Scopes" => lambda {|client| client['scopes'].join(", ")},
-          "Redirect URI" => lambda {|client| client['redirectUris'].join(", ")}
-        }
-        print_description_list(client_columns, client)
-        print reset,"\n"
-
-      end
+      id = client['id']
+    else
+      id = id.to_i
+    end
+    @clients_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clients_interface.dry.get(id, params)
+      return
+    end
+    json_response = @clients_interface.get(id, params)
+    render_response(json_response, options, 'client') do
+      client = json_response['client']
+      print_h1 "Client Details", [], options
+      print cyan
+      print_description_list(client_columns, client)
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
   end
 
@@ -151,6 +120,7 @@ class Morpheus::Cli::ClientsCommand
         payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
         # prompt for options
         params = Morpheus::Cli::OptionTypes.prompt(add_client_option_types, options[:options], @api_client, options[:params])
+        params.booleanize!
         if params['redirectUris'] && params['redirectUris'].is_a?(String)
           params['redirectUris'] = params['redirectUris'].split(',').collect {|it| it.strip}.reject {|it| it.empty?}
         end
@@ -182,7 +152,7 @@ class Morpheus::Cli::ClientsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[clientId] [options]")
-      build_option_type_options(opts, options, client_option_types)
+      build_option_type_options(opts, options, update_client_option_types)
       build_standard_update_options(opts, options)
       opts.footer = "Update Oauth Client Record."
     end
@@ -212,8 +182,9 @@ class Morpheus::Cli::ClientsCommand
         # allow arbitrary -O options
         payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
         # prompt for options
-        #params = Morpheus::Cli::OptionTypes.prompt(update_wiki_page_option_types, options[:options], @api_client, options[:params])
+        #params = Morpheus::Cli::OptionTypes.no_prompt(update_client_option_types, options[:options], @api_client, options[:params])
         params = passed_options
+        params.booleanize!
         if params['redirectUris'] && params['redirectUris'].is_a?(String)
           params['redirectUris'] = params['redirectUris'].split(',').collect {|it| it.strip}.reject {|it| it.empty?}
         end
@@ -325,21 +296,36 @@ class Morpheus::Cli::ClientsCommand
     end
   end
 
-  def client_option_types
-    [
-      {'fieldName' => 'clientId', 'fieldLabel' => 'Client Id', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'accessTokenValiditySeconds', 'fieldLabel' => 'Access Token Validity Length (Seconds)', 'type' => 'number', 'required' => true, 'defaultValue' => 43200,'displayOrder' => 2},
-      {'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh Token Validity Length (Seconds)', 'type' => 'number', 'required' => true, 'defaultValue' => 43200,'displayOrder' => 3}
-    ]
+  def client_columns
+    {
+      "ID" => lambda {|it| it['id'] },
+      "Client ID" => lambda {|it| it['clientId'] },
+      "TTL" => lambda {|it| it['accessTokenValiditySeconds'] },
+      "Refresh TTL" => lambda {|it| it['refreshTokenValiditySeconds'] },
+      "Redirect URI" => lambda {|client| client['redirectUris'].join(", ")},
+      "Requires Consent" => lambda {|it| format_boolean it['requireConsent']}
+    }
   end
 
-   def add_client_option_types
+
+  def add_client_option_types
     [
-      {'fieldName' => 'clientId', 'fieldLabel' => 'Client Id', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'clientSecret', 'fieldLabel' => 'Client Secret', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldName' => 'accessTokenValiditySeconds', 'fieldLabel' => 'Access Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 3},
-      {'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 4},
-      {'fieldName' => 'redirectUris', 'fieldLabel' => 'Redirect URI', 'type' => 'text', 'displayOrder' => 5}
+      {'fieldName' => 'clientId', 'fieldLabel' => 'Client Id', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'clientSecret', 'fieldLabel' => 'Client Secret', 'type' => 'text'},
+      {'switch' => 'ttl', 'fieldName' => 'accessTokenValiditySeconds', 'fieldLabel' => 'TTL (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'description' => 'Access Token Validity Seconds'},
+      {'switch' => 'refresh-ttl', 'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh TTL (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'description' => 'Refresh Token Validity Seconds'},
+      {'fieldName' => 'redirectUris', 'fieldLabel' => 'Redirect URI', 'type' => 'text', 'description' => 'Redirect URI(s), use commas to delimit values.'},
+      {'fieldName' => 'requireConsent', 'fieldLabel' => 'Requires Consent', 'type' => 'checkbox', 'defaultValue' => false}
     ]
   end
+
+  def update_client_option_types
+    option_types = add_client_option_types #.select {|it| ['clientId', 'clientSecret', 'accessTokenValiditySeconds'].include?(it['fieldName']) }
+    option_types.each {|it| 
+      it.delete('required')
+      it.delete('defaultValue')
+      it.delete('skipSingleOption')
+    }
+    option_types
+  end
 end

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

@@ -2,6 +2,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Clouds
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::InfrastructureHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
@@ -25,6 +26,8 @@ class Morpheus::Cli::Clouds
     @api_client = establish_remote_appliance_connection(opts)
     @clouds_interface = @api_client.clouds
     @groups_interface = @api_client.groups
+    @accounts_interface = @api_client.accounts
+    @account_users_interface = @api_client.account_users
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 
@@ -49,6 +52,13 @@ class Morpheus::Cli::Clouds
       opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
         add_query_parameter(params, 'allLabels', parse_labels(val))
       end
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant clouds") do
+        options[:include_tenants] = true
+        params['includeTenants'] = true
+      end
+      opts.on('--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:tenant] = val
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List clouds."
     end
@@ -69,7 +79,18 @@ class Morpheus::Cli::Clouds
           params['groupId'] = group['id']
         end
       end
-
+      if options[:tenant]
+        if options[:tenant].to_s !~ /\A\d{1,}\Z/
+          account = find_account_by_name_or_id(options[:tenant])
+          if account.nil?
+            return 1, "Tenant not found by name: #{options[:tenant]}"
+          else
+            params['tenantId'] = account['id']
+          end
+        else
+          params['tenantId'] = options[:tenant]
+        end
+      end
       params.merge!(parse_list_options(options))
       @clouds_interface.setopts(options)
       if options[:dry_run]
@@ -94,6 +115,9 @@ class Morpheus::Cli::Clouds
           print cyan,"No clouds found.",reset,"\n"
         else          
           columns = cloud_list_column_definitions(options).upcase_keys!
+          if !options[:include_tenants] && !options[:tenant]
+            columns.delete("Tenant")
+          end
           print as_pretty_table(clouds, columns, options)
           print_results_pagination(json_response)
         end
@@ -141,6 +165,9 @@ class Morpheus::Cli::Clouds
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant clouds when finding cloud by name") do
+        options[:include_tenants] = true
+      end
       build_standard_list_options(opts, options)
       opts.footer = "Get details about a cloud.\n" +
                     "[name] is required. This is the name or id of a cloud."
@@ -158,7 +185,7 @@ class Morpheus::Cli::Clouds
   def _get(id, params, options={})
     cloud = nil
     if id.to_s !~ /\A\d{1,}\Z/
-      cloud = find_cloud_by_name_or_id(id)
+      cloud = find_cloud_by_name_or_id(id, options[:include_tenants])
       id = cloud['id']
     end
     @clouds_interface.setopts(options)
@@ -1481,6 +1508,7 @@ EOT
     {
       "ID" => 'id',
       "Name" => 'name',
+      "Tenant" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
       "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
       "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
       "Location" => 'location',