morpheus-cli 8.0.11.1 → 8.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e612ece8267586e1ede25aaa18364ba1a6debc9d98a92201dff496038363a27
-  data.tar.gz: e4f789f8b3b17a37d460de0833f65a3fa2f7599879a6162c617683eee9894163
+  metadata.gz: 30f5740960bec8ff3b96aa8e7da68862d310d4375fc7c48c11fd31841ac5310c
+  data.tar.gz: ae66b58b6702afeed4e30edc44b019a1e73e2ea11179f0ab6507edf250275977
 SHA512:
-  metadata.gz: 75e8de5e4f8d83b2a37aed735e036b156d36eddf7eeba60b3bea20bc4b2e3e371222854dba2b0fd27a2aacef625ddddf7d6dfb8e486a700fc8e67cc1434c95fd
-  data.tar.gz: 35c2a244ae0acb3d6187277b9650277dfe5c85349f7788ff8dc37c7bf341dfd4773e540c1ca68fabc5e726fa8aefec9eac42c7df6b7e11222561e84444784c84
+  metadata.gz: 795b92277a1dbc2ad7ec6a933469fcf0ab77f8c7e8d261b5502e218f3a72cfda0856bff14d94b043b4f3371ec2cbd89d8522df6c57b87477d75949e70b975436
+  data.tar.gz: cfdc201519632bf6f6b51155611b35ffe4c299733bda2c16c19109bae37174112439aa728ecebcff42c1646496060698952af332a444d7a32ab46b5e260789f7

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -1022,6 +1022,10 @@ class Morpheus::APIClient
     Morpheus::LibraryOperatingSystemsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def migrations
+    Morpheus::MigrationsInterface.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

data/lib/morpheus/api/migrations_interface.rb

@@ -0,0 +1,49 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::MigrationsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/migrations"
+  end
+
+  def source_clouds(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/source-clouds", params: params, headers: headers)
+  end
+
+  def target_clouds(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/target-clouds", params: params, headers: headers)
+  end
+
+  def source_servers(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/source-servers", params: params, headers: headers)
+  end
+
+  def source_networks(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/source-networks", params: params, headers: headers)
+  end
+
+  def target_networks(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/target-networks", params: params, headers: headers)
+  end
+
+  def source_storage(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/source-storage", params: params, headers: headers)
+  end
+
+  def target_storage(params={}, headers={})
+    execute(method: :get, url: "#{base_path}/target-storage", params: params, headers: headers)
+  end
+
+  # def target_pools(params={}, headers={})
+  #   execute(method: :get, url: "#{base_path}/target-pools", params: params, headers: headers)
+  # end
+
+  # def target_groups(params={}, headers={})
+  #   execute(method: :get, url: "#{base_path}/target-groups", params: params, headers: headers)
+  # end
+
+  def run(id, payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(id.to_s)}/run", params: params, payload: payload, headers: headers)
+  end
+
+end

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

@@ -353,10 +353,9 @@ EOT
         out << "#{benchmark_name.ljust(30, ' ')}"
         # exit: 0
         exit_code = benchmark_record.exit_code
-        bad_benchmark = benchmark_record.exit_code && benchmark_record.exit_code != 0
-        if bad_benchmark
-          out << "\texit: #{bad_benchmark.exit_code.to_s.ljust(2, ' ')}"
-          out << "\terror: #{bad_benchmark.error.to_s.ljust(12, ' ')}"
+        if benchmark_record.exit_code && benchmark_record.exit_code != 0
+          out << "\texit: #{benchmark_record.exit_code.to_s.ljust(2, ' ')}"
+          out << "\terror: #{benchmark_record.error.to_s.ljust(12, ' ')}"
         else
           out << "\texit: 0 "
         end

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

@@ -4,6 +4,7 @@ class Morpheus::Cli::Clouds
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::InfrastructureHelper
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::WhoamiHelper
 
   register_subcommands :list, :count, :get, :add, :update, :remove, :refresh, :security_groups, :apply_security_groups
   register_subcommands :types, :type
@@ -1250,12 +1251,7 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage( "[cloud] [name] [options]")
       build_option_type_options(opts, options, add_cloud_affinity_group_option_types)
-      # opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
-      #   options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
-      # end
-      # opts.on(nil, '--no-refresh', "Do not refresh" ) do
-      #   options[:no_refresh] = true
-      # end
+      add_perms_options(opts, options, ['plans'])
       build_standard_add_options(opts, options)
       opts.footer = "Add affinity group to a cloud.\n" +
         "[cloud] is required. This is the name or id of an existing cloud.\n" +
@@ -1294,10 +1290,10 @@ EOT
         # end
 
         # perms
-        perms = prompt_permissions(options.merge({:for_affinity_group => true}), ['plans', 'groupDefaults'])
+        perms = prompt_permissions(options, is_master_account ? ['plans'] : ['plans', 'visibility', 'tenants'])
 
-        affinity_group['resourcePermissions'] = perms['resourcePermissions'] unless perms['resourcePermissions'].nil?
-        affinity_group['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].nil?
+        affinity_group['resourcePermissions'] = perms['resourcePermissions'] unless perms['resourcePermissions'].empty?
+        affinity_group['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].empty? || perms['tenantPermissions']['accounts'].empty?
         affinity_group['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
 
         payload = {'affinityGroup' => affinity_group}
@@ -1337,10 +1333,8 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage( "[cloud] [affinity group] [options]")
-      opts.on('--active [on|off]', String, "Enable affinity group") do |val|
-        options[:active] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-      end
-      add_perms_options(opts, options, ['groupDefaults'])
+      build_option_type_options(opts, options, update_cloud_affinity_group_option_types)
+      add_perms_options(opts, options, ['plans'])
       build_standard_update_options(opts, options)
       opts.footer = "Update a cloud affinity group.\n" +
           "[cloud] is required. This is the name or id of an existing cloud.\n" +
@@ -1370,19 +1364,25 @@ EOT
         end
       else
         payload = {'affinityGroup' => {}}
-        payload['affinityGroup']['active'] = options[:active].nil? ? (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'description' => 'Active', 'defaultValue' => true}], options[:options], @api_client))['active'] == 'on' : options[:active]
-
-        perms = prompt_permissions(options.merge({:available_plans => namespace_service_plans}), affinity_group['owner']['id'] == current_user['accountId'] ? ['plans', 'groupDefaults'] : ['plans', 'groupDefaults', 'visibility', 'tenants'])
+        options[:params] ||= {}
+        options[:params].merge!({:cloudId => cloud['id'],:zoneId => cloud['id']})
+        option_types = update_cloud_affinity_group_option_types
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!.booleanize!
+        payload.deep_merge!({'affinityGroup' => v_prompt})
+        
+        perms = prompt_permissions(options.merge({:no_prompt => true}), is_master_account ? ['plans'] : ['plans', 'visibility', 'tenants'])
+        
         perms_payload = {}
-        perms_payload['resourcePermissions'] = perms['resourcePermissions'] if !perms['resourcePermissions'].nil?
-        perms_payload['tenantPermissions'] = perms['tenantPermissions'] if !perms['tenantPermissions'].nil?
-
-        payload['affinityGroup']['permissions'] = perms_payload
+        perms_payload['resourcePermissions'] = perms['resourcePermissions'] if !perms['resourcePermissions'].nil? && !perms['resourcePermissions'].empty?
+        perms_payload['tenantPermissions'] = perms['tenantPermissions'] if !perms['tenantPermissions'].nil? && !perms['tenantPermissions']['accounts'].empty?
+        
+        payload['affinityGroup']['permissions'] = perms_payload if !perms_payload.empty?
         payload['affinityGroup']['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
 
         # support -O OPTION switch on top of everything
         if options[:options]
-          payload.deep_merge!({'affinityGroup' => options[:options].reject {|k,v| k.is_a?(Symbol) }})
+          payload.deep_merge!({'affinityGroup' => options[:options].reject {|k,v| k.is_a?(Symbol) || payload['affinityGroup'].key?(k) }})
         end
 
         if payload['affinityGroup'].nil? || payload['affinityGroup'].empty?
@@ -1599,7 +1599,14 @@ EOT
       {'fieldName' => 'affinityType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Keep Separate', 'value' => 'KEEP_SEPARATE'}, {'name' => 'Keep Together', 'value' => 'KEEP_TOGETHER'}], 'description' => 'Choose affinity type.', 'required' => true, 'defaultValue' => 'KEEP_SEPARATE'},
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'defaultValue' => true},
       {'fieldName' => 'pool.id', 'fieldLabel' => 'Cluster', 'type' => 'select', 'optionSourceType' => 'vmware', 'optionSource' => 'vmwareZonePoolClusters', 'description' => 'Select cluster for the affinity group.', 'required' => true},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiSelect', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+    ]
+  end
+
+  def update_cloud_affinity_group_option_types
+    [
+      {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 

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

@@ -0,0 +1,179 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ClusterTypes
+  include Morpheus::Cli::CliCommand
+
+  set_command_description "View cluster types."
+  set_command_name :'cluster-types'
+  register_subcommands :list, :get
+  
+
+  # This is a hidden command, documenting clusters list-types and clusters get-type
+  set_command_hidden
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @clusters_interface = @api_client.clusters
+  end
+  
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: #{prog_name} clusters list-types [search]"
+      #opts.banner = subcommand_usage("[search]")
+      # opts.on('--optionTypes [true|false]', String, "Include optionTypes in the response. Default is false.") do |val|
+      #   params['optionTypes'] = (val.to_s == '' || val.to_s == 'on' || val.to_s == 'true')
+      # end
+      build_standard_list_options(opts, options)
+      opts.footer = "List cluster types."
+    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))
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.cluster_types(params)
+      return
+    end
+    json_response = @clusters_interface.cluster_types(params)
+    render_response(json_response, options, "clusterTypes") do
+      cluster_types = json_response["clusterTypes"]
+      print_h1 "Morpheus Cluster Types", parse_list_subtitles(options), options
+      if cluster_types.empty?
+        print cyan,"No cluster types found.",reset,"\n"
+      else
+        list_columns = {
+          "ID" => 'id',
+          "NAME" => 'name',
+          "CODE" => 'code',
+          "DESCRIPTION" => lambda {|it| truncate_string(it['description'], options[:wrap] ? nil : 100) },
+        }
+        print as_pretty_table(cluster_types, list_columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def get(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: #{prog_name} clusters get-type [type] "
+      # opts.banner = subcommand_usage("[type]")
+      # opts.on('--optionTypes [true|false]', String, "Include optionTypes in the response. Default is true.") do |val|
+      #   params['optionTypes'] = (val.to_s == '' || val.to_s == 'on' || val.to_s == 'true')
+      # end
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a specific cluster type.
+[type] is required. This is the name or id of a cluster type.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    id = args.join(" ")
+    connect(options)
+    params.merge!(parse_query_options(options))
+    cluster_type = nil
+    
+    # /api/cluster-types/$id does not exist, this loads them all.
+    # todo: fix api to support /api/cluster-types/$id
+    cluster_type = find_cluster_type_by_name_or_id(id)
+    if cluster_type.nil?
+      raise_command_error("cluster type not found for name or id '#{id}'") if cluster_type.nil?
+    end
+    id = cluster_type['id']
+    # /api/cluster-types does not return optionTypes by default, use ?optionTypes=true
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      # print_dry_run @clusters_interface.dry.get_type(id, params)
+      print_dry_run @clusters_interface.dry.cluster_types(params)
+      return
+    end
+    # json_response = @clusters_interface.get(id, params)
+    # cluster_type = json_response[cluster_type_object_key]
+    json_response = cluster_type
+    render_response(json_response, options) do
+      print_h1 "Cluster Type Details", [], options
+      print cyan
+      show_columns = list_columns = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Code" => 'code',
+          "Description" => 'description',
+        }
+      print_description_list(show_columns, cluster_type)
+
+      if cluster_type['optionTypes'] && cluster_type['optionTypes'].size > 0
+        print_h2 "Configuration Options"
+        opt_columns = [
+          # {"ID" => lambda {|it| it['id'] } },
+          {"FIELD NAME" => lambda {|it| (it['fieldContext'] && it['fieldContext'] != 'domain') ? [it['fieldContext'], it['fieldName']].join('.') : it['fieldName']  } },
+          {"FIELD LABEL" => lambda {|it| it['fieldLabel'] } },
+          {"TYPE" => lambda {|it| it['type'] } },
+          {"DEFAULT" => lambda {|it| it['defaultValue'] } },
+          {"REQUIRED" => lambda {|it| format_boolean it['required'] } },
+          # {"DESCRIPTION" => lambda {|it| it['description'] }, # do it!
+        ]
+        print as_pretty_table(cluster_type['optionTypes'], opt_columns)
+      else
+        # print cyan,"No option types found for this cluster type.","\n",reset
+      end
+
+      controller_types = cluster_type['controllerTypes'] || []
+      if controller_types && controller_types.size > 0
+        print_h2 "Controller Types"
+        print as_pretty_table(controller_types, [:name, :code], options)
+      else
+        # print cyan,"No worker types found for this cluster type.","\n",reset
+      end
+
+      worker_types = cluster_type['workerTypes'] || []
+      if worker_types && worker_types.size > 0
+        print_h2 "Worker Types"
+        print as_pretty_table(worker_types, [:name, :code], options)
+      else
+        # print cyan,"No worker types found for this cluster type.","\n",reset
+      end
+
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  protected
+
+  def find_cluster_type_by_name_or_id(val)
+    (val.to_s =~ /\A\d{1,}\Z/) ? find_cluster_type_by_id(val) : find_cluster_type_by_name(val)
+  end
+
+  def find_cluster_type_by_id(id)
+    get_cluster_types.find { |it| it['id'] == id.to_i }
+  end
+
+  def find_cluster_type_by_name(name)
+    get_cluster_types.find { |it| it['name'].downcase == name.downcase || it['code'].downcase == name.downcase }
+  end
+
+  def cluster_types_for_dropdown
+    get_cluster_types.collect {|it| {'id' => it['id'], 'name' => it['name'], 'code' => it['code'], 'value' => it['code']} }
+  end
+
+  def get_cluster_types(refresh=false)
+    if !@cluster_types || refresh
+      @cluster_types = @clusters_interface.cluster_types()['clusterTypes']
+    end
+    @cluster_types
+  end
+end

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

@@ -9,6 +9,7 @@ class Morpheus::Cli::Clusters
   include Morpheus::Cli::ExecutionRequestHelper
 
   register_subcommands :list, :count, :get, :view, :add, :update, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}
+  register_subcommands :list_types, :get_type
   register_subcommands :list_workers, :add_worker, :remove_worker, :update_worker_count
   register_subcommands :list_masters
   register_subcommands :upgrade_cluster
@@ -3409,12 +3410,7 @@ class Morpheus::Cli::Clusters
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage( "[cluster] [name] [options]")
       build_option_type_options(opts, options, add_affinity_group_option_types)
-      # opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
-      #   options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
-      # end
-      # opts.on(nil, '--no-refresh', "Do not refresh" ) do
-      #   options[:no_refresh] = true
-      # end
+      add_perms_options(opts, options, ['plans'])
       build_standard_add_options(opts, options)
       opts.footer = "Add affinity group to a cluster.\n" +
         "[cluster] is required. This is the name or id of an existing cluster.\n" +
@@ -3453,10 +3449,10 @@ class Morpheus::Cli::Clusters
         # end
 
         # perms
-        perms = prompt_permissions(options.merge({:for_affinity_group => true}), ['groupDefaults'])
+        perms = prompt_permissions(options, is_master_account ? ['plans'] : ['plans', 'visibility', 'tenants'])
 
         affinity_group['resourcePermissions'] = perms['resourcePermissions'] unless perms['resourcePermissions'].nil?
-        affinity_group['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].nil?
+        affinity_group['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].nil? || perms['tenantPermissions']['accounts'].empty?
         affinity_group['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
 
         payload = {'affinityGroup' => affinity_group}
@@ -3496,10 +3492,8 @@ class Morpheus::Cli::Clusters
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage( "[cluster] [affinity group] [options]")
-      opts.on('--active [on|off]', String, "Enable affinity group") do |val|
-        options[:active] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-      end
-      # add_perms_options(opts, options, ['groupDefaults'])
+      build_option_type_options(opts, options, update_affinity_group_option_types)
+      add_perms_options(opts, options, ['plans'])
       build_standard_update_options(opts, options)
       opts.footer = "Update a cluster affinity group.\n" +
           "[cluster] is required. This is the name or id of an existing cluster.\n" +
@@ -3529,19 +3523,25 @@ class Morpheus::Cli::Clusters
         end
       else
         payload = {'affinityGroup' => {}}
-        payload['affinityGroup']['active'] = options[:active].nil? ? (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'description' => 'Active', 'defaultValue' => true}], options[:options], @api_client))['active'] == 'on' : options[:active]
-
-        perms = prompt_permissions(options.merge({:available_plans => namespace_service_plans}), affinity_group['owner']['id'] == current_user['accountId'] ? ['plans', 'groupDefaults'] : ['plans', 'groupDefaults', 'visibility', 'tenants'])
+        options[:params] ||= {}
+        options[:params].merge!({:serverGroupId => cluster['id']})
+        option_types = update_affinity_group_option_types
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!.booleanize!
+        payload.deep_merge!({'affinityGroup' => v_prompt})
+        
+        perms = prompt_permissions(options.merge({:no_prompt => true}), is_master_account ? ['plans'] : ['plans', 'visibility', 'tenants'])
+        
         perms_payload = {}
-        perms_payload['resourcePermissions'] = perms['resourcePermissions'] if !perms['resourcePermissions'].nil?
-        perms_payload['tenantPermissions'] = perms['tenantPermissions'] if !perms['tenantPermissions'].nil?
-
-        payload['affinityGroup']['permissions'] = perms_payload
+        perms_payload['resourcePermissions'] = perms['resourcePermissions'] if !perms['resourcePermissions'].nil? && !perms['resourcePermissions'].empty?
+        perms_payload['tenantPermissions'] = perms['tenantPermissions'] if !perms['tenantPermissions'].nil? && !perms['tenantPermissions']['accounts'].empty?
+        
+        payload['affinityGroup']['permissions'] = perms_payload if !perms_payload.empty?
         payload['affinityGroup']['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
 
         # support -O OPTION switch on top of everything
         if options[:options]
-          payload.deep_merge!({'affinityGroup' => options[:options].reject {|k,v| k.is_a?(Symbol) }})
+          payload.deep_merge!({'affinityGroup' => options[:options].reject {|k,v| k.is_a?(Symbol) || payload['affinityGroup'].key?(k) }})
         end
 
         if payload['affinityGroup'].nil? || payload['affinityGroup'].empty?
@@ -4413,6 +4413,14 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def list_types(args)
+    Morpheus::Cli::ClusterTypes.new.list(args)
+  end
+
+  def get_type(args)
+    Morpheus::Cli::ClusterTypes.new.get(args)
+  end
+
   private
 
   def print_clusters_table(clusters, opts={})
@@ -4621,7 +4629,7 @@ class Morpheus::Cli::Clusters
   end
 
   def find_cluster_type_by_id(id)
-    get_cluster_types.find { |it| it['id'] == id }
+    get_cluster_types.find { |it| it['id'] == id.to_i }
   end
 
   def find_cluster_type_by_name(name)
@@ -5260,7 +5268,14 @@ class Morpheus::Cli::Clusters
       {'fieldName' => 'affinityType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Keep Separate', 'value' => 'KEEP_SEPARATE'}, {'name' => 'Keep Together', 'value' => 'KEEP_TOGETHER'}], 'description' => 'Choose affinity type.', 'required' => true, 'defaultValue' => 'KEEP_SEPARATE'},
       {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'defaultValue' => true},
       # {'fieldName' => 'pool.id', 'fieldLabel' => 'Cluster', 'type' => 'select', 'optionSourceType' => 'vmware', 'optionSource' => 'vmwareZonePoolClusters', 'description' => 'Select cluster for the affinity group.', 'required' => true},
-      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiSelect', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
+    ]
+  end
+
+  def update_affinity_group_option_types
+    [
+      {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox'},
+      {'fieldName' => 'servers', 'fieldLabel' => 'Server', 'type' => 'multiTypeahead', 'optionSource' => 'searchServers', 'description' => 'Select servers to be in the affinity group.'},
     ]
   end
 

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

@@ -75,6 +75,9 @@ class Morpheus::Cli::Hosts
         # params[:clusterId] = val
         options[:cluster] = val
       end
+      opts.on( '--parent HOST', "Parent Host / Hypervisor Name or ID" ) do |val|
+        options[:parent_server_id] = val
+      end
       opts.on( '--plan NAME', String, "Filter by Plan name(s)" ) do |val|
         # commas used in names a lot so use --plan one --plan two
         params['plan'] ||= []
@@ -188,6 +191,13 @@ class Morpheus::Cli::Hosts
         params['clusterId'] = cluster['id']
       end
     end
+    parent_hosts = nil
+    if options[:parent_server_id]
+      parent_hosts = parse_id_list(options[:parent_server_id]).collect do |parent_server_id|
+        find_host_by_name_or_id(parent_server_id)
+      end
+      params['parentServerId'] = parent_hosts.collect {|it| it['id'] }
+    end
     params['labels'] = options[:labels] if options[:labels]
     if options[:tags] && !options[:tags].empty?
       options[:tags].each do |k,v|
@@ -233,6 +243,9 @@ class Morpheus::Cli::Hosts
       elsif params['clusterId']
         subtitles << "Cluster: #{params['clusterId']}".strip
       end
+      if parent_hosts
+        subtitles << "Parent Host: #{parent_hosts.collect {|it| it['name'] }.join(", ")}".strip
+      end
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles, options
       if servers.empty?
@@ -379,6 +392,13 @@ class Morpheus::Cli::Hosts
       opts.on( '-i', '--ip IPADDRESS', "Filter by IP Address" ) do |val|
         params[:ip] = val
       end
+      opts.on( '--cluster CLUSTER', '--cluster CLUSTER', "Filter by Cluster Name or ID" ) do |val|
+        # params[:clusterId] = val
+        options[:cluster] = val
+      end
+      opts.on( '--parent HOST', "Parent Host / Hypervisor Name or ID" ) do |val|
+        options[:parent_server_id] = val
+      end
       opts.on('--vm', "Show only virtual machines" ) do
         params[:vm] = true
       end
@@ -403,9 +423,6 @@ class Morpheus::Cli::Hosts
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
         options[:created_by] = val
       end
-      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
-        options[:details] = true
-      end
       opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
         options[:phrase] = phrase
       end
@@ -443,6 +460,23 @@ class Morpheus::Cli::Hosts
         params['createdBy'] = created_by_ids
         # params['ownerId'] = created_by_ids # 4.2.1+
       end
+      cluster = nil
+      if options[:cluster]
+        if options[:cluster].to_s =~ /\A\d{1,}\Z/
+          params['clusterId'] = options[:cluster]
+        else
+          cluster = find_cluster_by_name_or_id(options[:cluster])
+          return 1 if cluster.nil?
+          params['clusterId'] = cluster['id']
+        end
+      end
+      parent_hosts = nil
+      if options[:parent_server_id]
+        parent_hosts = parse_id_list(options[:parent_server_id]).collect do |parent_server_id|
+          find_host_by_name_or_id(parent_server_id)
+        end
+        params['parentServerId'] = parent_hosts.collect {|it| it['id'] }
+      end
       @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.list(params)

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

@@ -83,6 +83,9 @@ class Morpheus::Cli::Instances
       opts.on( '-H', '--host HOST', "Host Name or ID" ) do |val|
         options[:host] = val
       end
+      opts.on( '--parent HOST', "Parent Host / Hypervisor Name or ID" ) do |val|
+        options[:parent_server_id] = val
+      end
       opts.on( '--owner USER', "Owner Username or ID" ) do |val|
         options[:owner] = val
       end
@@ -175,6 +178,14 @@ class Morpheus::Cli::Instances
       params['serverId'] = host['id']
     end
 
+    parent_hosts = nil
+    if options[:parent_server_id]
+      parent_hosts = parse_id_list(options[:parent_server_id]).collect do |parent_server_id|
+        find_host_by_name_or_id(parent_server_id)
+      end
+      params['parentServerId'] = parent_hosts.collect {|it| it['id'] }
+    end
+
     account = nil
     #todo: user = find_available_user_option(owner_id)
 
@@ -224,6 +235,9 @@ class Morpheus::Cli::Instances
       if host
         subtitles << "Host: #{host['name']}".strip
       end
+      if parent_hosts
+        subtitles << "Parent Host: #{parent_hosts.collect {|it| it['name'] }.join(", ")}".strip
+      end
       if options[:owner]
         subtitles << "Created By: #{options[:owner]}"
       end
@@ -315,6 +329,9 @@ class Morpheus::Cli::Instances
       opts.on( '-H', '--host HOST', "Host Name or ID" ) do |val|
         options[:host] = val
       end
+      opts.on( '--parent HOST', "Parent Host (Hypervisor) Name or ID" ) do |val|
+        options[:parent_server_id] = val
+      end
       opts.on( '--owner USER', "Owner Username or ID" ) do |val|
         options[:owner] = val
       end
@@ -350,6 +367,14 @@ class Morpheus::Cli::Instances
         params['serverId'] = host['id']
       end
 
+      parent_hosts = nil
+      if options[:parent_server_id]
+        parent_hosts = parse_id_list(options[:parent_server_id]).collect do |parent_server_id|
+          find_host_by_name_or_id(parent_server_id)
+        end
+        params['parentServerId'] = parent_hosts.collect {|it| it['id'] }
+      end
+
       account = nil
       if options[:owner]
         created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:owner])