morpheus-cli 8.1.2 → 9.0.0

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}}, :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

@@ -68,7 +68,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},
     ]