morpheus-cli 8.1.2 → 9.0.1

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

@@ -13,6 +13,7 @@ class Morpheus::Cli::Clusters
   register_subcommands :list_workers, :add_worker, :remove_worker, :update_worker_count
   register_subcommands :list_masters
   register_subcommands :upgrade_cluster
+  register_subcommands :update_version
   register_subcommands :list_volumes, :remove_volume
   register_subcommands :list_namespaces, :get_namespace, :add_namespace, :update_namespace, :remove_namespace
   register_subcommands :list_containers, :remove_container, :restart_container, :get_container
@@ -697,6 +698,13 @@ class Morpheus::Cli::Clusters
         ssh_host_option = option_type_list.select{|it| it['fieldName'] == 'sshHosts'}.first
         ssh_host_option['minCount'] = server_count unless ssh_host_option.nil?
 
+        # Fix for bug in 9.0.0 - 9.0.2 with optionType data where defaultValue is set to "unmanaged" for witness.id, which is not a valid value. Remove it so the user can select a valid value.
+        option_type_list.each do |option_type|
+          if option_type['fieldName'] == 'witness.id' && option_type['defaultValue'] == 'unmanaged'
+            option_type.delete('defaultValue')
+          end
+        end
+
         # Server options
         server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
@@ -3064,6 +3072,7 @@ class Morpheus::Cli::Clusters
           "Active" => lambda { |it| format_boolean(it['active']) },
           "Visibility" => lambda { |it| it['visibility'].nil? ? '' : it['visibility'].to_s.capitalize },
           "Tenants" => lambda { |it| it['tenants'].nil? ? '' : it['tenants'].collect {|it| it['name']}.join(', ') },
+          "Supports VM Secure Metadata" => lambda { |it| format_boolean(it['supportsVmSecureMetadata']) },
           "Cluster" => lambda { |it| cluster['name'] }
       }
       print_description_list(description_cols, datastore)
@@ -3233,6 +3242,12 @@ class Morpheus::Cli::Clusters
       opts.on('--active [on|off]', String, "Enable datastore") do |val|
         options[:active] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--supports-vm-secure-metadata [on|off]', String, "Enable VM Secure Metadata support") do |val|
+        options[:supportsVmSecureMetadata] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--heartbeat-target [on|off]', String, "Set as the heartbeat target. Default is on") do |val|
+        options[:heartbeatTarget] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
       add_perms_options(opts, options, ['plans', 'groupDefaults'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a cluster datastore.\n" +
@@ -3250,6 +3265,7 @@ class Morpheus::Cli::Clusters
       cluster = find_cluster_by_name_or_id(args[0])
       return 1 if cluster.nil?
       datastore = find_datastore_by_name_or_id(cluster['id'], args[1])
+      datastore_type = find_datastore_type_by_code(datastore['datastoreType']['code']) rescue nil
       if datastore.nil?
         print_red_alert "Datastore not found by '#{args[1]}'"
         exit 1
@@ -3264,6 +3280,15 @@ class Morpheus::Cli::Clusters
       else
         payload = {'datastore' => {}}
         payload['datastore']['active'] = options[:active].nil? ? (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'description' => 'Datastore Active', 'defaultValue' => true}], options[:options], @api_client))['active'] == 'on' : options[:active]
+        payload['datastore']['supportsVmSecureMetadata'] = options[:supportsVmSecureMetadata] unless options[:supportsVmSecureMetadata].nil?
+        
+        if !options[:heartbeatTarget].nil?
+          payload['datastore']['heartbeatTarget'] = options[:heartbeatTarget]
+        elsif datastore_type && datastore_type['heartbeatTargetCapable'] == true
+          val = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'heartbeatTarget', 'fieldLabel' => 'Heartbeat Target', 'type' => 'checkbox', 'description' => 'Heartbeat Target', 'defaultValue' => datastore['heartbeatTarget']}], options[:options], @api_client)['heartbeatTarget']
+          payload['datastore']['heartbeatTarget'] = val == 'on' || val == true unless val.nil? || val == ''
+        end
+        
 
         perms = prompt_permissions(options.merge({:available_plans => namespace_service_plans}), datastore['owner']['id'] == current_user['accountId'] ? ['plans', 'groupDefaults'] : ['plans', 'groupDefaults', 'visibility', 'tenants'])
         perms_payload = {}
@@ -4421,6 +4446,58 @@ class Morpheus::Cli::Clusters
     Morpheus::Cli::ClusterTypes.new.get(args)
   end
 
+  def update_version(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = "Updates HVM cluster layout to a new version.\n" +
+                    "[cluster] is required. This is the name or id of an existing cluster.\n"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+
+    cluster = find_cluster_by_name_or_id(args[0])
+    return 1 if cluster.nil?
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+      
+      available_updates = @clusters_interface.available_updates(cluster['id'])['updateDefinitions']
+      if available_updates.empty?
+        print yellow,"No updates available for cluster #{cluster['name']}",reset,"\n"
+        return 1, "No updates available for cluster #{cluster['name']}"
+      end
+      version_options = available_updates.collect { |it| {'name' => it['name'], 'value' => it['id']} }
+      update_definition_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'updateDefinitionId', 'type' => 'select', 'fieldLabel' => 'Update', 'selectOptions' => version_options, 'required' => true, 'description' => 'Select version update to execute' }],options[:options],api_client,{})['updateDefinitionId']
+      payload.deep_merge!({'updateDefinitionId' => update_definition_id})
+    end
+    target_version = available_updates.find { |it| it['id'] == payload['updateDefinitionId'] }['updateVersion'] rescue nil
+    if target_version.nil?
+      print_red_alert "Unable to determine target version for update definition #{payload['updateDefinitionId']}"
+      return 1, "Unable to determine target version for update definition #{payload['updateDefinitionId']}"
+    end 
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to update cluster #{cluster['name']} to version #{target_version}?")
+      return 9, "aborted command"
+    end
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.execute_update(cluster['id'], payload)
+      return
+    end
+    json_response = @clusters_interface.execute_update(cluster['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Cluster #{cluster['name']} is being updated to version #{target_version}..."
+    end
+    return 0, nil
+  end
+
   private
 
   def print_clusters_table(clusters, opts={})

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

@@ -83,13 +83,13 @@ class Morpheus::Cli::ExecutionRequestCommand
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
           options[:refresh_interval] = default_refresh_interval
         end
-        if !(execution_request['status'] == 'pending' || execution_request['status'] == 'new')
+        if is_finished(execution_request)
           # it is finished
         else
           print cyan
           refresh_display_seconds = options[:refresh_interval] % 1.0 == 0 ? options[:refresh_interval].to_i : options[:refresh_interval]
           print "Execution request has not yet finished. Refreshing every #{refresh_display_seconds} seconds"
-          while execution_request['status'] == 'pending' || execution_request['status'] == 'new' do
+          while !is_finished(execution_request) do
             sleep(options[:refresh_interval])
             print cyan,".",reset
             json_response = @execution_request_interface.get(execution_request_id, params)
@@ -326,4 +326,8 @@ class Morpheus::Cli::ExecutionRequestCommand
     out
   end
 
+  def is_finished(execution_request)
+    ['executing', 'pending', 'new'].include?(execution_request['status']) ? false : true
+  end
+
 end

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

@@ -2,6 +2,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Groups
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::InfrastructureHelper
   include Morpheus::Cli::OptionSourceHelper
 
@@ -19,6 +20,8 @@ class Morpheus::Cli::Groups
     @groups_interface = @api_client.groups
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
+    @accounts_interface = @api_client.accounts
+    @account_users_interface = @api_client.account_users
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 
@@ -37,12 +40,31 @@ class Morpheus::Cli::Groups
       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 groups") 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 groups."
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:0)
     connect(options)
+    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))
     @groups_interface.setopts(options)
     if options[:dry_run]
@@ -71,6 +93,9 @@ class Morpheus::Cli::Groups
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant groups when finding group by name") do
+        options[:include_tenants] = true
+      end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
 Get details about a group.
@@ -86,25 +111,20 @@ EOT
     end
   end
 
-  def _get(arg, options={})
-    begin
-      if options[:dry_run]
-        @groups_interface.setopts(options)
-        if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @groups_interface.dry.get(arg.to_i)
-        else
-          print_dry_run @groups_interface.dry.list({name:arg})
-        end
-        return 0
-      end
-      group = find_group_by_name_or_id(arg)
-      @groups_interface.setopts(options)
-      #json_response = @groups_interface.get(group['id'])
-      json_response = {'group' => group}
-      
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
-
+  def _get(id, options={})
+    params = {}
+    group = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      group = find_group_by_name_or_id(id, options[:include_tenants])
+      id = group['id']
+    end
+    @groups_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @groups_interface.dry.get(id.to_i, params)
+      return
+    end
+    json_response = @groups_interface.get(id.to_i, params)
+    render_response(json_response, options, 'group') do
       group = json_response['group']
       group_stats = group['stats']
       # serverCounts moved to zone.stats.serverCounts
@@ -124,6 +144,7 @@ EOT
         "Location" => 'location',
         "Labels" => lambda {|it| format_list(it['labels'], '') rescue '' },
         "Clouds" => lambda {|it| it['zones'].collect {|z| z['name'] }.join(', ') },
+        "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         #"Instances" => lambda {|it| it['stats']['instanceCounts']['all'] rescue '' },
         # "Hosts" => lambda {|it| it['stats']['serverCounts']['host'] rescue it['serverCount'] },
         # "VMs" => lambda {|it| it['stats']['serverCounts']['vm'] rescue '' },
@@ -665,13 +686,14 @@ EOT
 
   protected
 
-  def print_groups_table(groups, opts={})
-    table_color = opts[:color] || cyan
+  def print_groups_table(groups, options={})
+    table_color = options[:color] || cyan
     active_group = @active_group_id ? groups.find {|group| group['id'] == @active_group_id } : nil
     rows = groups.collect do |group|
       {
         id: active_group ? (((@active_group_id && (@active_group_id == group['id'])) ? "=> " : "   ") + group['id'].to_s) : group['id'],
         name: group['name'],
+        tenant: group['account'] ? group['account']['name'] : '',
         labels: group['labels'],
         location: group['location'],
         cloud_count: group['zones'] ? group['zones'].size : 0,
@@ -685,6 +707,7 @@ EOT
       #{:active => {:display_name => ""}},
       {:id => {:display_name => (active_group ? "   ID" : "ID")}},
       {:name => {:width => 64}},
+      options[:include_tenants] || options[:tenant] ? {:tenant => {:width => 32}} : nil,
       {:location => {:width => 32}},
       {:labels => {:display_method => lambda {|it| format_list(it[:labels], '', 3) rescue '' }}},
       {:cloud_count => {:display_name => "CLOUDS"}},
@@ -692,8 +715,8 @@ EOT
       {:host_count => {:display_name => "HOSTS"}},
       {:vm_count => {:display_name => "VMS"}},
       {:baremetal_count => {:display_name => "BARE METAL"}},
-    ]
-    print as_pretty_table(rows, columns, opts)
+  ].compact
+    print as_pretty_table(rows, columns, options)
   end
 
   def add_group_option_types()

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

@@ -113,8 +113,12 @@ class Morpheus::Cli::Hosts
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
         options[:created_by] = val
       end
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant servers. The default is true for this endpoint.") do
+        options[:include_tenants] = true
+        params['includeTenants'] = true
+      end
       opts.on( '--tenant TENANT', "Tenant Name or ID" ) do |val|
-        options[:account] = val
+        options[:tenant] = val
       end
       opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
         add_query_parameter(params, 'labels', parse_labels(val))
@@ -154,8 +158,8 @@ class Morpheus::Cli::Hosts
     
     params.merge!(parse_list_options(options))
     account = nil
-    if options[:account]
-      account = find_account_by_name_or_id(options[:account])
+    if options[:tenant]
+      account = find_account_by_name_or_id(options[:tenant])
       if account.nil?
         return 1
       else
@@ -315,9 +319,9 @@ class Morpheus::Cli::Hosts
           "External Name" => :external_name,
           "Hostname" => :hostname,
           "Type" => :type,
+          "Cloud" => :cloud,
           "Owner" => :owner,
           "Tenant" => :tenant,
-          "Cloud" => :cloud,
           "Plan" => :plan,
           "IP" => :ip,
           "Private IP" => :internal_ip,
@@ -335,8 +339,6 @@ class Morpheus::Cli::Hosts
           columns.delete("Hostname")
           columns.delete("Plan")
           columns.delete("Private IP")
-          columns.delete("Owner")
-          columns.delete("Tenant")
           columns.delete("Power")
           columns.delete("Created")
           columns.delete("Updated")
@@ -369,7 +371,7 @@ class Morpheus::Cli::Hosts
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       opts.on( '--tenant TENANT', "Tenant Name or ID" ) do |val|
-        options[:account] = val
+        options[:tenant] = val
       end
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
@@ -434,8 +436,8 @@ class Morpheus::Cli::Hosts
     begin
       params.merge!(parse_list_options(options))
       account = nil
-      if options[:account]
-        account = find_account_by_name_or_id(options[:account])
+      if options[:tenant]
+        account = find_account_by_name_or_id(options[:tenant])
         if account.nil?
           return 1
         else
@@ -512,6 +514,9 @@ class Morpheus::Cli::Hosts
       opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
         options[:refresh_until_status] = val.to_s.downcase
       end
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant servers when finding server by name") do
+        options[:include_tenants] = true
+      end
       build_standard_get_options(opts, options)
     end
     optparse.parse!(args)
@@ -540,7 +545,7 @@ class Morpheus::Cli::Hosts
     if arg.to_s =~ /\A\d{1,}\Z/
       json_response = @servers_interface.get(arg.to_i)
     else
-      server = find_host_by_name_or_id(arg)
+      server = find_host_by_name_or_id(arg, options[:include_tenants])
       json_response = @servers_interface.get(server['id'])
       # json_response = {"server" => server} need stats
     end
@@ -2745,8 +2750,10 @@ EOT
     end
   end
 
-  def find_host_by_name(name)
-    results = @servers_interface.list({name: name})
+  def find_host_by_name(name, include_tenants=false)
+    params = {name: name.to_s}
+    params['includeTenants'] = true if include_tenants
+    results = @servers_interface.list(params)
     if results['servers'].empty?
       print_red_alert "Server not found by name #{name}"
       exit 1
@@ -2759,11 +2766,11 @@ EOT
     return results['servers'][0]
   end
 
-  def find_host_by_name_or_id(val)
+  def find_host_by_name_or_id(val, include_tenants=false)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_host_by_id(val)
     else
-      return find_host_by_name(val)
+      return find_host_by_name(val, include_tenants)
     end
   end
 

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

@@ -150,6 +150,13 @@ class Morpheus::Cli::Instances
         options[:details] = true
         params['details'] = true # get more data from server this way
       end
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant instances") 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 instances."
     end
@@ -204,6 +211,19 @@ class Morpheus::Cli::Instances
       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
+
     @instances_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @instances_interface.dry.list(params)
@@ -241,6 +261,7 @@ class Morpheus::Cli::Instances
       if options[:owner]
         subtitles << "Created By: #{options[:owner]}"
       end
+
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles, options
       if instances.empty?
@@ -279,7 +300,7 @@ class Morpheus::Cli::Instances
             connection: format_instance_connection_string(instance),
             environment: instance['instanceContext'],
             user: (instance['owner'] ? (instance['owner']['username'] || instance['owner']['id']) : (instance['createdBy'].is_a?(Hash) ? instance['createdBy']['username'] : instance['createdBy'])),
-            tenant: (instance['owner'] ? (instance['owner']['username'] || instance['owner']['id']) : (instance['createdBy'].is_a?(Hash) ? instance['createdBy']['username'] : instance['createdBy'])),
+            tenant: (instance['tenant'] ? instance['tenant']['name'] : ''),
             nodes: instance['containers'].count,
             status: format_instance_status(instance, cyan),
             type: instance['instanceType']['name'],
@@ -294,18 +315,20 @@ class Morpheus::Cli::Instances
           }
           row
         }
-        columns = [:id, {:name => {:max_width => 50}}, :labels, :group, :cloud, 
+        columns = [:id, {:name => {:max_width => 50}}, :labels, :tenant, :group, :cloud, 
             :type, :version, :environment, :plan,
             {:created => {:display_name => "CREATED"}}, 
-            # {:tenant => {:display_name => "TENANT"}}, 
             {:user => {:display_name => "OWNER", :max_width => 20}}, 
-            :nodes, {:connection => {:max_width => 30}}, :status, :cpu, :memory, :storage]
+            :nodes, {:connection => {:max_width => 30}}, :status, :cpu, :memory, :storage].compact
         # custom pretty table columns ... this is handled in as_pretty_table now(), 
         # todo: remove all these.. and try to always pass rows as the json data itself..
         if options[:details] != true
           columns.delete(:labels)
           columns.delete(:plan)
         end
+        if !options[:include_tenants] && !options[:tenant]
+          columns.delete(:tenant)
+        end
         print cyan
         print as_pretty_table(rows, columns, options)
         print reset
@@ -1337,6 +1360,9 @@ class Morpheus::Cli::Instances
       opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
         options[:refresh_until_status] = val.to_s.downcase
       end
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant instances when finding instance by name") do
+        options[:include_tenants] = true
+      end
       # opts.on( nil, '--threshold', "Alias for --scaling" ) do
       #   options[:include_scaling] = true
       # end
@@ -1369,7 +1395,7 @@ class Morpheus::Cli::Instances
     end
     instance = nil
     if id.to_s !~ /\A\d{1,}\Z/
-      instance = find_instance_by_name_or_id(id)
+      instance = find_instance_by_name_or_id(id, options[:include_tenants])
       return 1, "Instance not found by name #{id}" if instance.nil?
       id = instance['id']
     end
@@ -1463,7 +1489,7 @@ class Morpheus::Cli::Instances
             it['createdBy'] ? (it['createdBy']['username'] || it['createdBy']['id']) : '' 
           end
         },
-        #"Tenant" => lambda {|it| it['tenant'] ? it['tenant']['name'] : '' },
+        "Tenant" => lambda {|it| it['tenant'] ? it['tenant']['name'] : '' },
         "Apps" => lambda {|it| anded_list(it['apps'] ? it['apps'].collect {|app| app['name'] } : [])},
         "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         # "Last Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },

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

@@ -4,13 +4,14 @@ class Morpheus::Cli::StorageVolumes
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::RestCommand
   include Morpheus::Cli::StorageVolumesHelper
+  include Morpheus::Cli::AccountsHelper
 
   set_command_name :'storage-volumes'
   set_command_description "View and manage storage volumes."
-  register_subcommands :list, :get, :add, :remove, :resize
+  register_subcommands :list, :get, :add, :remove, :resize, :update_tenant
 
   # RestCommand settings
-  register_interfaces :storage_volumes, :storage_volume_types
+  register_interfaces :storage_volumes, :storage_volume_types, :accounts
   set_rest_has_type true
 
   protected
@@ -28,12 +29,28 @@ class Morpheus::Cli::StorageVolumes
     opts.on('--category VALUE', String, "Filter by category") do |val|
       params['category'] = val
     end
+    opts.on('--include-tenants', '--include-tenants', "Include sub-tenant storage volumes (master tenant only)") do
+      options[:include_tenants] = true
+      params['includeTenants'] = true
+    end
+    opts.on('--tenant TENANT', String, "Filter by Tenant Name or ID (master tenant only)") do |val|
+      options[:tenant] = val
+    end
     # build_standard_list_options(opts, options)
     super
   end
 
   def parse_list_options!(args, options, params)
     parse_parameter_as_resource_id!(:storage_server, options, params)
+    if options[:tenant]
+      if options[:tenant].to_s =~ /\A\d+\Z/
+        params['tenantId'] = options[:tenant]
+      else
+        account = find_account_by_name_or_id(options[:tenant])
+        return 1 if account.nil?
+        params['tenantId'] = account['id']
+      end
+    end
     super
   end
 
@@ -68,7 +85,7 @@ class Morpheus::Cli::StorageVolumes
   def add_storage_volume_option_types()
     [
       {'fieldContext' => 'storageServer', 'fieldName' => 'id', 'fieldLabel' => 'Storage Server', 'type' => 'select', 'optionSource' => 'storageServers', 'optionParams' => {'createType' => 'block'}, 'required' => true},
-      {'fieldContext' => 'storageGroup', 'fieldName' => 'id', 'fieldLabel' => 'Storage Group', 'type' => 'select', 'optionSource' => 'storageGroups', 'required' => true},
+      {'fieldContext' => 'storageGroup', 'fieldName' => 'id', 'fieldLabel' => 'Storage Group', 'type' => 'select', 'optionSource' => 'storageGroups', 'required' => false},
       {'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Storage Volume Type', 'type' => 'select', 'optionSource' => 'storageVolumeTypes', 'required' => true},
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
     ]
@@ -122,6 +139,64 @@ class Morpheus::Cli::StorageVolumes
     end
   end
 
+  def update_tenant(args)
+    options = {}
+    params = {}
+    tenant_id = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[volume] --tenant TENANT")
+      opts.on('--tenant TENANT', String, "Target Tenant (Account) Name or ID to transfer ownership to.") do |val|
+        tenant_id = val
+      end
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Transfer ownership of a storage volume to another tenant.
+[volume] is required. This is the name or id of a storage volume.
+--tenant is required unless provided via --payload. This is the name or id of the target tenant.
+Only an unattached volume may be transferred. All authorization and business-rule
+validation is performed by the server; its message is shown verbatim on failure.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    # CLI-side validation: require a target tenant unless a full payload is supplied.
+    # All other authorization and business rules are validated server-side.
+    if !options[:payload] && tenant_id.nil?
+      raise_command_error "--tenant is required to transfer ownership.\n#{optparse}"
+    end
+    connect(options)
+    volume = find_volume_by_name_or_id(args[0])
+    return 1 if volume.nil?
+    id = volume['id']
+    passed_options = parse_passed_options(options)
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({storage_volume_object_key => passed_options}) unless passed_options.empty?
+    else
+      account = find_account_by_name_or_id(tenant_id)
+      return 1 if account.nil?
+      payload[storage_volume_object_key] = {'tenant' => {'id' => account['id']}}
+      payload.deep_merge!({storage_volume_object_key => passed_options}) unless passed_options.empty?
+    end
+    @storage_volumes_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @storage_volumes_interface.dry.update_tenant(id, payload)
+      return 0, nil
+    end
+    json_response = @storage_volumes_interface.update_tenant(id, payload)
+    render_response(json_response, options, storage_volume_object_key) do
+      record = json_response[storage_volume_object_key]
+      owner_name = (record && record['owner'] ? record['owner']['name'] : (record && record['account'] ? record['account']['name'] : tenant_id))
+      print_green_success "Transferred storage volume #{record ? record['name'] : id} to tenant #{owner_name}"
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(storage_volume_column_definitions(options), record, options)
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
   def find_volume_by_id(id)
     begin
       json_response = @storage_volumes_interface.get(id.to_i)