morpheus-cli 9.0.0 → 9.0.2

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

@@ -15,7 +15,7 @@ class Morpheus::Cli::Hosts
                        :wiki, :update_wiki,
                        :maintenance, :leave_maintenance, :placement,
                        :list_devices, :assign_device, :detach_device, :attach_device,
-                       :snapshot
+                       :snapshot, :create_linked_clone
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -796,6 +796,10 @@ class Morpheus::Cli::Hosts
       opts.on("--security-groups LIST", Integer, "Security Groups, comma separated list of security group IDs") do |val|
         options[:security_groups] = val.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
       end
+      opts.on("--storage-controller ARRAY", String, "Storage Controllers, JSON array of controller configs. Each entry accepts id, busNumber, typeId, typeName, removable, editable.") do |val|
+        options[:options] ||= {}
+        options[:options]['storageController'] = JSON.parse(val)
+      end
       opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
         options[:metadata] = val
       end
@@ -956,6 +960,10 @@ class Morpheus::Cli::Hosts
             payload['volumes'] = volumes
           end
 
+          if options[:options] && options[:options]['storageController']
+            payload['storageController'] = options[:options]['storageController']
+          end
+
           # plan customizations
           plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {})
           if plan_opts && !plan_opts.empty?
@@ -1347,6 +1355,10 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on("--storage-controller ARRAY", String, "Storage Controllers, JSON array of controller configs. Each entry accepts id, busNumber, typeId, typeName, removable, editable.") do |val|
+        options[:options] ||= {}
+        options[:options]['storageController'] = JSON.parse(val)
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
@@ -1435,6 +1447,9 @@ class Morpheus::Cli::Hosts
       # only amazon supports this option
       # for now, always do this
       payload[:deleteOriginalVolumes] = true
+      if options[:options] && options[:options]['storageController']
+        payload[:storageController] = options[:options]['storageController']
+      end
       @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.resize(server['id'], payload)
@@ -2716,6 +2731,62 @@ EOT
     return 0, nil
   end
 
+  def create_linked_clone(args)
+    options = {}
+    server = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      opts.on("--snapshot ID", String, "Snapshot ID") do |val|
+        snapshot_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Create a linked clone using the selected snapshot of a Host." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot which the clone will refer to."
+    end
+
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      server = find_host_by_name_or_id(args[0])
+      options[:options]['serverId'] = server['id']
+      begin
+        snapshot_options = @servers_interface.snapshots(server['id'], {})['snapshots'].collect {|it| {'name' => "#{it['name']} (#{it['id']})", 'value' => it['id']} }        
+        snapshot_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'snapshotId', 'type' => 'select', 'fieldLabel' => 'Snapshot', 'selectOptions' => snapshot_options, 'required' => true, 'description' => 'Select Snapshot.'}], {}, @api_client, options[:options])
+
+        if !snapshot_prompt['snapshotId'].to_s.empty?
+          snapshot_id = snapshot_prompt['snapshotId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load host snapshots"
+      end
+
+      @servers_interface.setopts(options)
+
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.create_linked_clone(server['id'], snapshot_id, payload)
+        return
+      end
+
+      json_response = @servers_interface.create_linked_clone(server['id'], snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Linked Clone creation initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
     ## Server Devices
 
     def list_devices(args)

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

@@ -315,7 +315,7 @@ class Morpheus::Cli::Instances
           }
           row
         }
-        columns = [:id, {:name => {:max_width => 50}}, :tenant, :group, :cloud, 
+        columns = [:id, {:name => {:max_width => 50}}, :labels, :tenant, :group, :cloud, 
             :type, :version, :environment, :plan,
             {:created => {:display_name => "CREATED"}}, 
             {:user => {:display_name => "OWNER", :max_width => 20}}, 
@@ -465,6 +465,10 @@ class Morpheus::Cli::Instances
       opts.on("--layout-size NUMBER", Integer, "Apply a multiply factor of containers/vms within the instance") do |val|
         options[:layout_size] = val.to_i
       end
+      opts.on("--storage-controller ARRAY", String, "Storage Controllers, JSON array of controller configs. Each entry accepts id, busNumber, typeId, typeName, removable, editable. Example: '[{\"busNumber\":\"1\",\"typeName\":\"SCSI\"}]'") do |val|
+        options[:options] ||= {}
+        options[:options]['storageController'] = JSON.parse(val)
+      end
       opts.on( '-l', '--layout LAYOUT', "Layout ID" ) do |val|
         options[:layout] = val
       end
@@ -595,6 +599,9 @@ class Morpheus::Cli::Instances
     end
     
     payload['instance'] ||= {}
+    if options[:options] && options[:options]['storageController']
+      payload['storageController'] = options[:options]['storageController']
+    end
     if options[:instance_name]
       payload['instance']['name'] = options[:instance_name]
     end
@@ -2910,6 +2917,10 @@ class Morpheus::Cli::Instances
       opts.on('--include-network-interfaces','--include-network-interfaces', "Populate payload networkInterfaces with current interfaces") do
         options[:include_nics] = true
       end
+      opts.on("--storage-controller ARRAY", String, "Storage Controllers, JSON array of controller configs. Each entry accepts id, busNumber, typeId, typeName, removable, editable.") do |val|
+        options[:options] ||= {}
+        options[:options]['storageController'] = JSON.parse(val)
+      end
       build_standard_update_options(opts, options)
     end
     optparse.parse!(args)
@@ -3958,7 +3969,7 @@ List snapshots for an instance.
 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
      opts.banner = subcommand_usage("[instance]")
-      opts.on("--snapshot ID", String, "Optional snapshot") do |val|
+      opts.on("--snapshot ID", String, "Snapshot ID") do |val|
         snapshot_id = val
       end
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])

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

@@ -5,6 +5,7 @@ class Morpheus::Cli::NetworksCommand
   include Morpheus::Cli::WhoamiHelper
   include Morpheus::Cli::InfrastructureHelper
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::AccountsHelper
 
   set_command_name :networks
 
@@ -28,6 +29,8 @@ class Morpheus::Cli::NetworksCommand
     @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
   end
 
   def handle(args)
@@ -57,6 +60,13 @@ class Morpheus::Cli::NetworksCommand
       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 networks") 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_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
       opts.footer = "List networks."
     end
@@ -73,6 +83,18 @@ class Morpheus::Cli::NetworksCommand
         return 1 if cloud.nil?
         params['zoneId'] = cloud['id']
       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
       @networks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @networks_interface.dry.list(params)
@@ -109,6 +131,7 @@ class Morpheus::Cli::NetworksCommand
             type: network['type'] ? network['type']['name'] : '',
             group: network['group'] ? network['group']['name'] : 'Shared',
             cloud: network['zone'] ? network['zone']['name'] : '',
+            tenant: network['owner'] ? network['owner']['name'] : '',
             cidr: network['cidr'],
             pool: network['pool'] ? network['pool']['name'] : '',
             dhcp: network['dhcpServer'] ? 'Yes' : 'No',
@@ -128,6 +151,7 @@ class Morpheus::Cli::NetworksCommand
                 type: "Subnet",
                 group: network['group'] ? network['group']['name'] : 'Shared',
                 cloud: network['zone'] ? network['zone']['name'] : '',
+                tenant: network['owner'] ? network['owner']['name'] : '',
                 cidr: subnet['cidr'],
                 pool: subnet['pool'] ? subnet['pool']['name'] : '',
                 dhcp: subnet['dhcpServer'] ? 'Yes' : 'No',
@@ -139,9 +163,13 @@ class Morpheus::Cli::NetworksCommand
             end
           end
         end
-        columns = [:id, :name, :labels, :type, :group, :cloud, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
+        columns = [:id, :name, :labels, :type, :group, :cloud, :tenant, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
+        else
+          if !options[:include_tenants] && !options[:tenant]
+            columns.delete(:tenant)
+          end
         end
         print cyan
         print as_pretty_table(rows, columns, options)
@@ -160,6 +188,9 @@ class Morpheus::Cli::NetworksCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[network]")
+      opts.on('--include-tenants','--include-tenants', "Include sub tenant networks when finding network by name") do
+        options[:include_tenants] = true
+      end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get details about a network." + "\n" +
                     "[network] is required. This is the name or id of a network."
@@ -177,11 +208,11 @@ class Morpheus::Cli::NetworksCommand
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @networks_interface.dry.get(args[0].to_i)
         else
-          print_dry_run @networks_interface.dry.list({name:args[0]})
+          print_dry_run @networks_interface.dry.list({name:args[0]}, options[:include_tenants])
         end
         return
       end
-      network = find_network_by_name_or_id(args[0])
+      network = find_network_by_name_or_id(args[0], options[:include_tenants])
       return 1 if network.nil?
       json_response = {'network' => network}  # skip redundant request
       # json_response = @networks_interface.get(network['id'])
@@ -206,6 +237,7 @@ class Morpheus::Cli::NetworksCommand
         "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : 'Shared' },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
+        "Tenant" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
         "IPv4 Enabled" => 'ipv4Enabled',
         "IPv6 Enabled" => 'ipv6Enabled',
         "CIDR" => 'cidr',

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
 
@@ -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)