morpheus-cli 8.0.7 → 8.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b8927c521af95d6c463be3cf8de08ad7f84017e18ab89a8143759d6e11e722
-  data.tar.gz: 0a1c6677040bcb8e50a5bde9603b5cda373d8ee16c41cf3a74ed96f1ff23a1be
+  metadata.gz: df49518b39388f8a75824156a31bff7fb8abcf4545a9f5af29bf6eab4eab6a79
+  data.tar.gz: c82269904d1de5f01a487ebad5bd6ac2dd110a0c2e2b183142dfb42828c5edec
 SHA512:
-  metadata.gz: 0dca9e1aedcf8daedd76aba8e43b93d56733c05d247aa8fc31b0324d2b22c122e6164519e870a590ff703ad5413b8b96cf822dd537533acd2f2dce53a6fc6697
-  data.tar.gz: a8cdd96b0895216198267f1b639b97654fa0e0c2c38db49f55eb6776153305d59148febbca8bac8fe81bf193d3b465a90fbcd38bf8b52d508e01bdc3dfc44670
+  metadata.gz: b64913eef407dd0180526e67095182b89517fa2863ee8bce319ba77fb1c1ca25d0898299ebebd6072dc9fcbd19a77f8d3f4fef3298563e24bd37121fb8ae6c75
+  data.tar.gz: 6569d731faabe620597d94d20f78ffde2b5599934cd2b5bdb7153e86ce6cbd8359b83e0ff97a61d1d8ff6b8c4c8c6fc809a82e72ef39da5514859800e8388e2a

data/Dockerfile

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

data/lib/morpheus/api/clouds_interface.rb

@@ -2,6 +2,10 @@ require 'morpheus/api/api_client'
 
 class Morpheus::CloudsInterface < Morpheus::APIClient
 
+  def base_path
+    "/api/zones"
+  end
+
   def cloud_types(params={})
     url = "#{@base_url}/api/zone-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
@@ -137,4 +141,35 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     end
     execute(method: :post, url: url, headers: headers, payload: payload)
   end
+
+  def list_affinity_groups(id, params={})
+    url = "#{base_path}/#{id}/affinity-groups"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def get_affinity_group(id, affinity_group_id, params={})
+    url = "#{base_path}/#{id}/affinity-groups/#{affinity_group_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def create_affinity_group(id, payload)
+    url = "#{base_path}/#{id}/affinity-groups"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update_affinity_group(id, affinity_group_id, payload)
+    url = "#{base_path}/#{id}/affinity-groups/#{affinity_group_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def destroy_affinity_group(id, affinity_group_id, params={})
+    url = "#{base_path}/#{id}/affinity-groups/#{affinity_group_id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
 end

data/lib/morpheus/api/clusters_interface.rb

@@ -353,4 +353,34 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
+  def list_affinity_groups(id, params={})
+    url = "#{base_path}/#{id}/affinity-groups"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def get_affinity_group(id, affinity_group_id, params={})
+    url = "#{base_path}/#{id}/affinity-groups/#{affinity_group_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def create_affinity_group(id, payload)
+    url = "#{base_path}/#{id}/affinity-groups"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update_affinity_group(id, affinity_group_id, payload)
+    url = "#{base_path}/#{id}/affinity-groups/#{affinity_group_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def destroy_affinity_group(id, affinity_group_id, params={})
+    url = "#{base_path}/#{id}/affinity-groups/#{affinity_group_id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+  
 end

data/lib/morpheus/api/servers_interface.rb

@@ -212,5 +212,12 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def snapshot(serverId, payload = {}, params = {})
+    url = "#{@base_url}/api/servers/#{serverId}/snapshot"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
 
 end

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

@@ -11,6 +11,7 @@ class Morpheus::Cli::Clouds
   alias_subcommand :'get-type', :type
   register_subcommands :wiki, :update_wiki
   register_subcommands({:'update-logo' => :update_logo,:'update-dark-logo' => :update_dark_logo})
+  register_subcommands :list_affinity_groups, :get_affinity_group, :update_affinity_group, :add_affinity_group, :remove_affinity_group
   #register_subcommands :firewall_disable, :firewall_enable
   alias_subcommand :details, :get
   set_default_subcommand :list
@@ -1149,6 +1150,331 @@ EOT
     end
   end
 
+  def list_affinity_groups(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cloud]")
+      build_standard_list_options(opts, options)
+      opts.footer = "List affinity groups for a cloud.\n" +
+          "[cloud] is required. This is the name or id of an existing cloud."
+    end
+
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    
+    cloud = find_cloud_by_name_or_id(args[0])
+    return 1 if cloud.nil?
+    params = {}
+    params.merge!(parse_list_options(options))
+    json_response = @clouds_interface.list_affinity_groups(cloud['id'], params)
+    render_response(json_response, options, 'affinityGroups') do
+      affinity_groups = json_response['affinityGroups']
+      print_h1 "Morpheus Cloud Affinity Groups: #{cloud['name']}", parse_list_subtitles(options)
+      if affinity_groups.empty?
+        print cyan,"No affinity groups found.",reset,"\n"
+      else          
+        columns = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => lambda {|it| format_affinity_type(it['affinityType']) },
+          "Resource Pool" => lambda {|it| it['pool'] ? (it['pool']['name'] || it['pool']['id']) : '' },
+          "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+          # "Servers" => lambda {|it| it['serverCount'] },
+          # "Source" => lambda {|it| it['source'] },
+        }.upcase_keys!
+        print as_pretty_table(affinity_groups, columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def get_affinity_group(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cloud] [affinity group]")
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about a cloud affinity group.\n" +
+          "[cloud] is required. This is the name or id of an existing cloud.\n" +
+          "[affinity group] is required. This is the name or id of an existing affinity group."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+
+    cloud = find_cloud_by_name_or_id(args[0])
+    return 1 if cloud.nil?
+    # this finds the affinity group in the cloud api response, then fetches it by ID
+    affinity_group = find_cloud_affinity_group_by_name_or_id(cloud['id'], args[1])
+    if affinity_group.nil?
+      print_red_alert "Affinity Group not found for '#{args[1]}'"
+      exit 1
+    end
+
+    params = {}
+    params.merge!(parse_query_options(options))
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.get_affinity_group(cloud['id'], affinity_group['id'], params)
+      return
+    end
+    json_response = @clouds_interface.get_affinity_group(cloud['id'], affinity_group['id'], params)
+    render_response(json_response, options, 'affinityGroup') do
+      affinity_group = json_response['affinityGroup']
+      print_h1 "Affinity Group Details", [], options
+      columns = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Type" => lambda {|it| format_affinity_type(it['affinityType']) },
+        "Resource Pool" => lambda {|it| it['pool'] ? (it['pool']['name'] || it['pool']['id']) : '' },
+        "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+        "Servers" => lambda {|it| it['servers'].size() },
+        "Source" => lambda {|it| it['source'] },
+        "Active" => lambda {|it| format_boolean(it['active']) },
+      }
+      print_description_list(columns, affinity_group)
+      if affinity_group['servers'].size > 0
+        print_h2 "Servers", options
+        print as_pretty_table(affinity_group['servers'], [:id, :name], options)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+      
+  end
+
+  def add_affinity_group(args)
+    options = {}
+    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
+      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" +
+        "[name] is required. This is the name of the new affinity group."
+    end
+
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1, max:2)
+    connect(options)
+
+    begin
+      cloud = find_cloud_by_name_or_id(args[0])
+      return 1 if cloud.nil?
+      if args[1]
+        options[:options]['name']  = args[1]
+      end
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload ||= {}
+          payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+      else
+        options[:params] ||= {}
+        options[:params].merge!({:cloudId => cloud['id'],:zoneId => cloud['id']})
+        option_types = add_cloud_affinity_group_option_types
+        affinity_group = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
+
+        # affinity_group_type = find_affinity_group_type_by_code(affinity_group['affinityGroupType'])
+        # affinity_group['affinityGroupType'] = {id:affinity_group_type['id']}
+
+        # # affinity_group type options
+        # unless affinity_group_type['optionTypes'].empty?
+        #   affinity_group.merge!(Morpheus::Cli::OptionTypes.prompt(affinity_group_type['optionTypes'], options[:options].deep_merge({:context_map => {'domain' => ''}, :checkbox_as_boolean => true}), @api_client, options[:params]))
+        # end
+
+        # perms
+        perms = prompt_permissions(options.merge({:for_affinity_group => true}), ['plans', 'groupDefaults'])
+
+        affinity_group['resourcePermissions'] = perms['resourcePermissions'] unless perms['resourcePermissions'].nil?
+        affinity_group['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].nil?
+        affinity_group['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
+
+        payload = {'affinityGroup' => affinity_group}
+      end
+
+      @clouds_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clouds_interface.dry.create_affinity_group(cloud['id'], payload)
+        return
+      end
+      json_response = @clouds_interface.create_affinity_group(cloud['id'], payload)
+      if options[:json]
+        puts as_json(json_response)
+      else
+        if json_response['success']
+          if json_response['msg'] == nil
+            print_green_success "Adding affinity group to cloud #{cloud['name']}"
+          else
+            print_green_success json_response['msg']
+          end
+          execution_id = json_response['executionId']
+          if !options[:no_refresh] && execution_id
+            wait_for_execution_request(json_response['executionId'], options.merge({waiting_status:['new', 'pending', 'executing']}))
+          end
+        else
+          print_red_alert "Failed to create cloud affinity group #{json_response['msg']}"
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_affinity_group(args)
+    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_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" +
+          "[affinity group] is required. This is the name or id of an existing affinity group."
+    end
+
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      cloud = find_cloud_by_name_or_id(args[0])
+      return 1 if cloud.nil?
+      affinity_group = find_cloud_affinity_group_by_name_or_id(cloud['id'], args[1])
+      if affinity_group.nil?
+        print_red_alert "Affinity Group not found by '#{args[1]}'"
+        exit 1
+      end
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of everything
+        if options[:options]
+          payload.deep_merge!({'affinityGroup' => options[:options].reject {|k,v| k.is_a?(Symbol) }})
+        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'])
+        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
+        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) }})
+        end
+
+        if payload['affinityGroup'].nil? || payload['affinityGroup'].empty?
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
+        end
+      end
+
+      @clouds_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clouds_interface.dry.update_affinity_group(cloud['id'], affinity_group['id'], payload)
+        return
+      end
+      json_response = @clouds_interface.update_affinity_group(cloud['id'], affinity_group['id'], payload)
+      if options[:json]
+        puts as_json(json_response)
+      elsif !options[:quiet]
+        affinity_group = json_response['affinityGroup']
+        print_green_success "Updated affinity group #{affinity_group['name']}"
+        #get_args = [cloud["id"], affinity_group["id"]] + (options[:remote] ? ["-r",options[:remote]] : [])
+        #get_namespace(get_args)
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_affinity_group(args)
+    default_refresh_interval = 5
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cloud] [affinity group]")
+      # opts.on( '-f', '--force', "Force Delete" ) do
+      #   params[:force] = 'on'
+      # end
+      # 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
+      build_standard_remove_options(opts, options)
+      opts.footer = "Delete an affinity group from a cloud.\n" +
+        "[cloud] is required. This is the name or id of an existing cloud.\n" +
+        "[affinity group] is required. This is the name or id of an existing affinity group."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    params.merge!(parse_query_options(options))
+
+    cloud = find_cloud_by_name_or_id(args[0])
+    return 1 if cloud.nil?
+
+    affinity_group_id = args[1]
+    if affinity_group_id.empty?
+      raise_command_error "missing required worker parameter"
+    end
+
+    affinity_group = find_cloud_affinity_group_by_name_or_id(cloud['id'], affinity_group_id)
+    if affinity_group.nil?
+      print_red_alert "Affinity Group not found for '#{affinity_group_id}'"
+      return 1
+    end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the cloud affinity group '#{affinity_group['name'] || affinity_group['id']}'?", options)
+      return 9, "aborted command"
+    end
+
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.destroy_affinity_group(cloud['id'], affinity_group['id'], params)
+      return
+    end
+    json_response = @clouds_interface.destroy_affinity_group(cloud['id'], affinity_group['id'], params)
+    if options[:json]
+      puts as_json(json_response)
+    else
+      if json_response['success']
+        print_green_success "Removed affinity group #{affinity_group['name']}"
+        execution_id = json_response['executionId']
+        if !options[:no_refresh] && execution_id
+          wait_for_execution_request(execution_id, options.merge({waiting_status:['new', 'pending', 'executing']}))
+        end
+      else
+        print_red_alert "Failed to remove cloud affinity group #{json_response['msg']}"
+      end
+    end
+    return 0, nil
+  end
+
   private
 
   def cloud_list_column_definitions(options)
@@ -1259,4 +1585,26 @@ EOT
     end
   end
 
+  def find_cloud_affinity_group_by_name_or_id(cloud_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      @clouds_interface.get_affinity_group(cloud_id, val)['affinityGroup'] rescue nil
+    else
+      @clouds_interface.list_affinity_groups(cloud_id, {name: val})['affinityGroups'][0]
+    end
+  end
+
+  def add_cloud_affinity_group_option_types
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'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.'},
+    ]
+  end
+
+  def format_affinity_type(affinity_type)
+    affinity_type == "KEEP_SEPARATE" ? "Keep Separate" : "Keep Together"
+  end
+    
 end

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

@@ -28,6 +28,7 @@ class Morpheus::Cli::Clusters
   register_subcommands :refresh
   register_subcommands :list_replicasets, :list_daemonsets, :list_endpoints, :list_ingresses, :list_policies, :list_volumes, :list_volume_claims, :list_config_maps, :list_secrets
   register_subcommands :get_pod, :get_deployment, :get_replicaset, :get_daemonset, :get_endpoint, :get_ingress, :get_policy, :get_volume_claim, :get_volume, :get_config_map, :get_secret, :get_stateful_set, :get_job, :get_service
+  register_subcommands :list_affinity_groups, :get_affinity_group, :update_affinity_group, :add_affinity_group, :remove_affinity_group
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -1379,7 +1380,12 @@ class Morpheus::Cli::Clusters
           (['provisionType.vmware.host', 'provisionType.scvmm.host'].include?(type['code']) && cloud['config']['hideHostSelection'] == 'on') || # should this be truthy?
           (type['fieldContext'] == 'instance.networkDomain' && type['fieldName'] == 'id')
         } rescue [])
-
+        # strip server context
+        option_type_list.each do |option_type|
+          if option_type['fieldContext'] == 'server' || option_type['fieldContext'] == 'domain'
+            option_type['fieldContext'] = nil
+          end
+        end
         # remove metadata option_type , prompt manually for that field 'tags' instead of 'metadata'
         #metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
         metadata_option_type = cluster_type['optionTypes'].find {|type| type['fieldName'] == 'metadata' }
@@ -3269,6 +3275,337 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def list_affinity_groups(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster]")
+      build_standard_list_options(opts, options)
+      opts.footer = "List affinity groups for a cluster.\n" +
+          "[cluster] is required. This is the name or id of an existing cluster."
+    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?
+
+    params = {}
+    params.merge!(parse_list_options(options))
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.list_affinity_groups(cluster['id'], params)
+      return
+    end
+    json_response = @clusters_interface.list_affinity_groups(cluster['id'], params)
+    render_response(json_response, options, 'affinityGroups') do
+      affinity_groups = json_response['affinityGroups']
+      print_h1 "Morpheus Cluster Affinity Groups: #{cluster['name']}", parse_list_subtitles(options), options
+      if affinity_groups.empty?
+        print cyan,"No affinity groups found.",reset,"\n"
+      else          
+        columns = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => lambda {|it| format_affinity_type(it['affinityType']) },
+          "Resource Pool" => lambda {|it| it['pool'] ? (it['pool']['name'] || it['pool']['id']) : '' },
+          "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+          "Servers" => lambda {|it| it['servers'].size() },
+          # "Source" => lambda {|it| it['source'] },
+        }.upcase_keys!
+        print as_pretty_table(affinity_groups, columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def get_affinity_group(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster] [affinity group]")
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about a cluster affinity group.\n" +
+          "[cluster] is required. This is the name or id of an existing cluster.\n" +
+          "[affinity group] is required. This is the name or id of an existing affinity group."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    
+    cluster = find_cluster_by_name_or_id(args[0])
+    return 1 if cluster.nil?
+
+    # this finds the affinity group in the cluster api response, then fetches it by ID
+    affinity_group = find_cluster_affinity_group_by_name_or_id(cluster['id'], args[1])
+    if affinity_group.nil?
+      print_red_alert "Affinity Group not found for '#{args[1]}'"
+      exit 1
+    end
+    
+    params = {}
+    params.merge!(parse_query_options(options))
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.get_affinity_group(cluster['id'], affinity_group['id'], params)
+      return
+    end
+    json_response = @clusters_interface.get_affinity_group(cluster['id'], affinity_group['id'], params)
+    render_response(json_response, options, 'affinityGroup') do
+      affinity_group = json_response['affinityGroup']
+      print_h1 "Affinity Group Details", [], options
+      columns = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Type" => lambda {|it| format_affinity_type(it['affinityType']) },
+        "Resource Pool" => lambda {|it| it['pool'] ? (it['pool']['name'] || it['pool']['id']) : '' },
+        "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+        "Servers" => lambda {|it| it['servers'].size() },
+        "Source" => lambda {|it| it['source'] },
+        "Active" => lambda {|it| format_boolean(it['active']) },
+      }
+      print_description_list(columns, affinity_group)
+      if affinity_group['servers'].size > 0
+        print_h2 "Servers", options
+        print as_pretty_table(affinity_group['servers'], [:id, :name], options)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def add_affinity_group(args)
+    options = {}
+    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
+      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" +
+        "[name] is required. This is the name of the new affinity group."
+    end
+
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1, max:2)
+    connect(options)
+
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      return 1 if cluster.nil?
+      if args[1]
+        options[:options]['name']  = args[1]
+      end
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload ||= {}
+          payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+      else
+        options[:params] ||= {}
+        options[:params].merge!({:serverGroupId => cluster['id']})
+        option_types = add_affinity_group_option_types
+        affinity_group = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
+
+        # affinity_group_type = find_affinity_group_type_by_code(affinity_group['affinityGroupType'])
+        # affinity_group['affinityGroupType'] = {id:affinity_group_type['id']}
+
+        # # affinity_group type options
+        # unless affinity_group_type['optionTypes'].empty?
+        #   affinity_group.merge!(Morpheus::Cli::OptionTypes.prompt(affinity_group_type['optionTypes'], options[:options].deep_merge({:context_map => {'domain' => ''}, :checkbox_as_boolean => true}), @api_client, options[:params]))
+        # end
+
+        # perms
+        perms = prompt_permissions(options.merge({:for_affinity_group => true}), ['groupDefaults'])
+
+        affinity_group['resourcePermissions'] = perms['resourcePermissions'] unless perms['resourcePermissions'].nil?
+        affinity_group['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].nil?
+        affinity_group['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
+
+        payload = {'affinityGroup' => affinity_group}
+      end
+
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.create_affinity_group(cluster['id'], payload)
+        return
+      end
+      json_response = @clusters_interface.create_affinity_group(cluster['id'], payload)
+      if options[:json]
+        puts as_json(json_response)
+      else
+        if json_response['success']
+          if json_response['msg'] == nil
+            print_green_success "Adding affinity group to cluster #{cluster['name']}"
+          else
+            print_green_success json_response['msg']
+          end
+          execution_id = json_response['executionId']
+          if !options[:no_refresh] && execution_id
+            wait_for_execution_request(json_response['executionId'], options.merge({waiting_status:['new', 'pending', 'executing']}))
+          end
+        else
+          print_red_alert "Failed to create cluster affinity group #{json_response['msg']}"
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_affinity_group(args)
+    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_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" +
+          "[affinity group] is required. This is the name or id of an existing affinity group."
+    end
+
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      return 1 if cluster.nil?
+      affinity_group = find_cluster_affinity_group_by_name_or_id(cluster['id'], args[1])
+      if affinity_group.nil?
+        print_red_alert "Affinity Group not found by '#{args[1]}'"
+        exit 1
+      end
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of everything
+        if options[:options]
+          payload.deep_merge!({'affinityGroup' => options[:options].reject {|k,v| k.is_a?(Symbol) }})
+        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'])
+        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
+        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) }})
+        end
+
+        if payload['affinityGroup'].nil? || payload['affinityGroup'].empty?
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
+        end
+      end
+
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.update_affinity_group(cluster['id'], affinity_group['id'], payload)
+        return
+      end
+      json_response = @clusters_interface.update_affinity_group(cluster['id'], affinity_group['id'], payload)
+      if options[:json]
+        puts as_json(json_response)
+      elsif !options[:quiet]
+        affinity_group = json_response['affinityGroup']
+        print_green_success "Updated affinity group #{affinity_group['name']}"
+        #get_args = [cluster["id"], affinity_group["id"]] + (options[:remote] ? ["-r",options[:remote]] : [])
+        #get_namespace(get_args)
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_affinity_group(args)
+    default_refresh_interval = 5
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster] [affinity group]")
+      # opts.on( '-f', '--force', "Force Delete" ) do
+      #   params[:force] = 'on'
+      # end
+      # 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
+      build_standard_remove_options(opts, options)
+      opts.footer = "Delete an affinity group from a cluster.\n" +
+        "[cluster] is required. This is the name or id of an existing cluster.\n" +
+        "[affinity group] is required. This is the name or id of an existing affinity group."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    params.merge!(parse_query_options(options))
+
+    cluster = find_cluster_by_name_or_id(args[0])
+    return 1 if cluster.nil?
+
+    affinity_group_id = args[1]
+    if affinity_group_id.empty?
+      raise_command_error "missing required worker parameter"
+    end
+
+    affinity_group = find_cluster_affinity_group_by_name_or_id(cluster['id'], affinity_group_id)
+    if affinity_group.nil?
+      print_red_alert "Affinity Group not found for '#{affinity_group_id}'"
+      return 1
+    end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the cluster affinity group '#{affinity_group['name'] || affinity_group['id']}'?", options)
+      return 9, "aborted command"
+    end
+
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.destroy_affinity_group(cluster['id'], affinity_group['id'], params)
+      return
+    end
+    json_response = @clusters_interface.destroy_affinity_group(cluster['id'], affinity_group['id'], params)
+    if options[:json]
+      puts as_json(json_response)
+    else
+      if json_response['success']
+        print_green_success "Removed affinity group #{affinity_group['name']}"
+        execution_id = json_response['executionId']
+        if !options[:no_refresh] && execution_id
+          wait_for_execution_request(execution_id, options.merge({waiting_status:['new', 'pending', 'executing']}))
+        end
+      else
+        print_red_alert "Failed to remove cluster affinity_group #{json_response['msg']}"
+      end
+    end
+    return 0, nil
+  end
+
   def api_config(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -4866,4 +5203,27 @@ class Morpheus::Cli::Clusters
     connect(options)
     _list_container_groups(args, options, resource_type)
   end
+  
+  def find_cluster_affinity_group_by_name_or_id(cluster_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      @clusters_interface.get_affinity_group(cluster_id, val)['affinityGroup'] rescue nil
+    else
+      @clusters_interface.list_affinity_groups(cluster_id, {name: val})['affinityGroups'][0]
+    end
+  end
+
+   def add_affinity_group_option_types
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'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.'},
+    ]
+  end
+
+  def format_affinity_type(affinity_type)
+    affinity_type == "KEEP_SEPARATE" ? "Keep Separate" : "Keep Together"
+  end
+
 end

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

@@ -3,6 +3,7 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
+  include Morpheus::Cli::ProcessesHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::LogsHelper
   set_command_name :hosts
@@ -13,7 +14,8 @@ class Morpheus::Cli::Hosts
                        {:exec => :execution_request},
                        :wiki, :update_wiki,
                        :maintenance, :leave_maintenance, :placement,
-                       :list_devices, :assign_device, :detach_device, :attach_device
+                       :list_devices, :assign_device, :detach_device, :attach_device,
+                       :snapshot
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -538,8 +540,9 @@ class Morpheus::Cli::Hosts
         "Nodes" => lambda {|it| it['containers'] ? it['containers'].size : 0 },
         # "Status" => lambda {|it| format_server_status(it) },
         # "Power" => lambda {|it| format_server_power_state(it) },
-        "Status" => lambda {|it| format_server_status_friendly(it) }, # combo
-        "Managed" => lambda {|it| it['computeServerType'] ? it['computeServerType']['managed'] : ''}
+        "Managed" => lambda {|it| it['computeServerType'] ? it['computeServerType']['managed'] : ''},
+        "Instance" => lambda {|it| it['instance'] ? it['instance']['name'] : ''},
+        "Status" => lambda {|it| format_server_status_friendly(it) } # combo
       }
       server_columns.delete("Hostname") if server['hostname'].to_s.empty? || server['hostname'] == server['name']
       server_columns.delete("IP") if server['externalIp'].to_s.empty?
@@ -548,6 +551,7 @@ class Morpheus::Cli::Hosts
       server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
       server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
       server_columns.delete("Labels") if server['labels'].nil? || server['labels'].empty?
+      server_columns.delete("Instance") if server['instance'].nil?
 
       print_description_list(server_columns, server)
 
@@ -2043,13 +2047,18 @@ EOT
   def snapshots(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[host]")
+      opts.banner = subcommand_usage("[host] [snapshot]")
       # no pagination yet
       # build_standard_list_options(opts, options)
-      build_standard_get_options(opts, options)
+      build_standard_list_options(opts, options, [:details])
+            opts.footer = <<-EOT
+List snapshots for a host.
+[host] is required. This is the name or id of a host.
+[snapshot] is optional. This is the name or id of a snapshot.
+EOT
     end
     optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, count:1)
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     begin
       server = find_host_by_name_or_id(args[0])
@@ -2061,25 +2070,52 @@ EOT
         return
       end
       json_response = @servers_interface.snapshots(server['id'], params)
-      snapshots = json_response['snapshots']      
+      snapshots = json_response['snapshots']
+      # [snapshots] is done with post api filtering by id or name or externalId
+      if args[1]
+        if args[1] =~ /\A\d{1,}\Z/
+          snapshots = snapshots.select {|it| it['id'].to_s == args[1] }
+        else
+          # match beginning of name of externalId
+          snapshots = snapshots.select {|it| it['name'].to_s.index(args[1]) == 0 || it['externalId'].to_s.index(args[1])  == 0 }
+        end
+        json_response['snapshots'] = snapshots # update response for -j filtering too
+      end
       render_response(json_response, options, 'snapshots') do
         print_h1 "Snapshots: #{server['name']}", [], options
         if snapshots.empty?
-          print cyan,"No snapshots found",reset,"\n"
+          if args[1]
+            print cyan,"No snapshots found for '#{args[1]}'",reset,"\n"
+          elsif
+            print cyan,"No snapshots found",reset,"\n"
+          end
+          print reset, "\n"
         else
-          snapshot_column_definitions = {
-            "ID" => lambda {|it| it['id'] },
-            "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['description'] },
-            # "Type" => lambda {|it| it['snapshotType'] },
-            "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
-            "Status" => lambda {|it| format_snapshot_status(it) }
-          }
-          print cyan
-          print as_pretty_table(snapshots, snapshot_column_definitions.upcase_keys!, options)
-          print_results_pagination({size: snapshots.size, total: snapshots.size})
+          if options[:details]
+            # this actually makes a request for each one here so don't go crazy... 
+            if snapshots.size > 3
+              print cyan, "Showing first 3 snapshots. Use the ID to get more details.", reset, "\n"
+              snapshots = snapshots.first(3)
+            end
+            snapshots.each do |snapshot|
+              Morpheus::Cli::Snapshots.new.handle(["get", snapshot['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+            end
+          else
+            # Snapshots List
+            snapshot_column_definitions = {
+              "ID" => lambda {|it| it['id'] },
+              "Name" => lambda {|it| it['name'] },
+              "Description" => lambda {|it| it['description'] },
+              # "Type" => lambda {|it| it['snapshotType'] },
+              "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
+              "Status" => lambda {|it| format_snapshot_status(it) }
+            }
+            print cyan
+            print as_pretty_table(snapshots, snapshot_column_definitions.upcase_keys!, options)
+            print_results_pagination({size: snapshots.size, total: snapshots.size})
+            print reset, "\n"
+          end
         end
-        print reset, "\n"
       end
       return 0
     rescue RestClient::Exception => e
@@ -2442,6 +2478,94 @@ EOT
     return 0, nil
   end
 
+  def snapshot(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      opts.on( '--name VALUE', String, "Snapshot Name. Default is \"{name}.{timestamp}\"" ) do |val|
+        options[:options]['name'] = val
+      end
+      opts.on( '--description VALUE', String, "Snapshot Description." ) do |val|
+        options[:options]['description'] = val
+      end
+      opts.on('--memory-snapshot [on|off]', String, "Memory Snapshot? Whether to include the memory state in the snapshot.") do |val|
+        options[:options]['memorySnapshot'] = val.to_s == '' || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--for-export [on|off]', String, "For Export? Indicates the snapshot is intended for export to storage.") do |val|
+        options[:options]['forExport'] = val.to_s == '' || val.to_s == 'on' || val.to_s == 'true'
+      end
+      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
+      build_standard_add_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Create a snapshot for a host.
+[host] is required. This is the name or id of a host
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    server = find_host_by_name_or_id(args[0])
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'snapshot' => parse_passed_options(options)})
+    else
+      payload.deep_merge!({'snapshot' => parse_passed_options(options)})
+      # prompt for name and description
+      name = prompt_value({'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Snapshot Name', 'description' => "Snapshot Name. Default is \"{name}.{timestamp}\""}, options)
+      payload['snapshot']['name'] = name if !name.to_s.empty?
+      description = prompt_value({'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'description' => "Snapshot Description."}, options)
+      payload['snapshot']['description'] = description if !description.to_s.empty?
+      # need to GET provision type for some settings...
+      provision_type = nil
+      begin
+        provision_type_id = server['computeServerType']['provisionTypeId'] rescue nil
+        if provision_type_id
+          provision_type = @provision_types_interface.get(provision_type_id)['provisionType']
+        end
+      rescue => ex
+        Morpheus::Logging::DarkPrinter.puts "Failed to load provision type!" if Morpheus::Logging.debug?
+      end
+      if provision_type && provision_type['hasMemorySnapshots']
+        # prompt for memorySnapshot
+        memory_snapshot = prompt_value({'fieldName' => 'memorySnapshot', 'type' => 'checkbox', 'fieldLabel' => 'Memory Snapshot?', 'description' => "Snapshot Description."}, options)
+        payload['snapshot']['memorySnapshot'] = memory_snapshot if !memory_snapshot.to_s.empty?
+      end
+      # convert "on" and "off" to true/false
+      payload.booleanize!
+    end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to snapshot the host '#{server['name']}'?", options)
+      exit 1
+    end
+    @servers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @servers_interface.dry.snapshot(server['id'], payload)
+      return
+    end
+    json_response = @servers_interface.snapshot(server['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Snapshot initiated."
+      process_id = json_response['processIds'][0] rescue nil
+      if process_id
+        unless options[:no_refresh]
+          process = wait_for_process_execution(process_id, options)
+          snapshot_id = process['resultId']
+          if snapshot_id
+            Morpheus::Cli::Snapshots.new.handle(["get", snapshot_id] + (options[:remote] ? ["-r",options[:remote]] : []))
+          end
+        end
+      else
+        # puts "No process returned"
+      end
+    end
+    return 0, nil
+  end
+
     ## Server Devices
 
     def list_devices(args)

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

@@ -2915,12 +2915,18 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
-      opts.on( '--name VALUE', String, "Snapshot Name. Default is server name + timestamp" ) do |val|
+      opts.on( '--name VALUE', String, "Snapshot Name. Default is \"{name}.{timestamp}\"" ) do |val|
         options[:options]['name'] = val
       end
       opts.on( '--description VALUE', String, "Snapshot Description." ) do |val|
         options[:options]['description'] = val
       end
+      opts.on('--memory-snapshot [on|off]', String, "Memory Snapshot? Whether to include the memory state in the snapshot.") do |val|
+        options[:options]['memorySnapshot'] = val.to_s == '' || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--for-export [on|off]', String, "For Export? Indicates the snapshot is intended for export to storage.") do |val|
+        options[:options]['forExport'] = val.to_s == '' || val.to_s == 'on' || val.to_s == 'true'
+      end
       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
@@ -2937,15 +2943,36 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to snapshot the instance '#{instance['name']}'?", options)
-      exit 1
-    end
+    
     payload = {}
     if options[:payload]
       payload = options[:payload]
       payload.deep_merge!({'snapshot' => parse_passed_options(options)})
     else
       payload.deep_merge!({'snapshot' => parse_passed_options(options)})
+      snapshot = payload['snapshot']
+      # prompt for name and description
+      name = prompt_value({'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Snapshot Name', 'description' => "Snapshot Name. Default is \"{name}.{timestamp}\""}, options)
+      snapshot['name'] = name if !name.to_s.empty?
+      description = prompt_value({'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'description' => "Snapshot Description."}, options)
+      snapshot['description'] = description if !description.to_s.empty?
+      # need to GET provision type for some settings...
+      provision_type = nil
+      begin
+        provision_type = @provision_types_interface.get(instance['layout']['provisionTypeId'])['provisionType']
+      rescue => ex
+        Morpheus::Logging::DarkPrinter.puts "Failed to load provision type!" if Morpheus::Logging.debug?
+      end
+      if provision_type && provision_type['hasMemorySnapshots']
+        # prompt for memorySnapshot
+        memory_snapshot = prompt_value({'fieldName' => 'memorySnapshot', 'type' => 'checkbox', 'fieldLabel' => 'Memory Snapshot?', 'description' => "Snapshot Description."}, options)
+        snapshot['memorySnapshot'] = memory_snapshot if !memory_snapshot.to_s.empty?
+      end
+      # convert "on" and "off" to true/false
+      payload.booleanize!
+    end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to snapshot the instance '#{instance['name']}'?", options)
+      exit 1
     end
     @instances_interface.setopts(options)
     if options[:dry_run]
@@ -3470,17 +3497,18 @@ EOT
   def snapshots(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[instance]")
+      opts.banner = subcommand_usage("[instance] [snapshot]")
       # no pagination yet
       # build_standard_list_options(opts, options)
-      build_standard_get_options(opts, options)
+      build_standard_list_options(opts, options, [:details])
             opts.footer = <<-EOT
 List snapshots for an instance.
 [instance] is required. This is the name or id of an instance
+[snapshot] is optional. this is the name or id a snapshot to filter by.
 EOT
     end
     optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, count:1)
+    verify_args!(args:args, optparse:optparse, min:1, max: 2)
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
@@ -3491,25 +3519,52 @@ EOT
         return
       end
       json_response = @instances_interface.snapshots(instance['id'], params)
-      snapshots = json_response['snapshots']      
+      snapshots = json_response['snapshots']
+      # [snapshots] is done with post api filtering by id or name or externalId
+      if args[1]
+        if args[1] =~ /\A\d{1,}\Z/
+          snapshots = snapshots.select {|it| it['id'].to_s == args[1] }
+        else
+          # snapshots = snapshots.select {|it| it['name'] == args[1] || it['externalId'] == args[1] }
+          # match beginning of name of externalId
+          snapshots = snapshots.select {|it| it['name'].to_s.index(args[1]) == 0 || it['externalId'].to_s.index(args[1])  == 0 }
+        end
+        json_response['snapshots'] = snapshots # update response for -j filtering too
+      end
       render_response(json_response, options, 'snapshots') do
         print_h1 "Snapshots: #{instance['name']} (#{instance['instanceType']['name']})", [], options
         if snapshots.empty?
-          print cyan,"No snapshots found",reset,"\n"
+          if args[1]
+            print cyan,"No snapshots found for '#{args[1]}'",reset,"\n"
+          elsif
+            print cyan,"No snapshots found",reset,"\n"
+          end
+          print reset, "\n"
         else
-          snapshot_column_definitions = {
-            "ID" => lambda {|it| it['id'] },
-            "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['description'] },
-            # "Type" => lambda {|it| it['snapshotType'] },
-            "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
-            "Status" => lambda {|it| format_snapshot_status(it) }
-          }
-          print cyan
-          print as_pretty_table(snapshots, snapshot_column_definitions.upcase_keys!, options)
-          print_results_pagination({size: snapshots.size, total: snapshots.size})
+          if options[:details]
+            if snapshots.size > 3
+              print cyan, "Showing first 3 snapshots. Use the ID to get more details.", reset, "\n"
+              snapshots = snapshots.first(3) # this actually makes a request for each one here so don't go crazy...
+            end
+            snapshots.each do |snapshot|
+              Morpheus::Cli::Snapshots.new.handle(["get", snapshot['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+            end
+          else
+            # Snapshots List
+            snapshot_column_definitions = {
+              "ID" => lambda {|it| it['id'] },
+              "Name" => lambda {|it| it['name'] },
+              "Description" => lambda {|it| it['description'] },
+              # "Type" => lambda {|it| it['snapshotType'] },
+              "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
+              "Status" => lambda {|it| format_snapshot_status(it) }
+            }
+            print cyan
+            print as_pretty_table(snapshots, snapshot_column_definitions.upcase_keys!, options)
+            print_results_pagination({size: snapshots.size, total: snapshots.size})
+            print reset, "\n"
+          end
         end
-        print reset, "\n"
       end
       return 0
     rescue RestClient::Exception => e

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

@@ -77,11 +77,15 @@ class Morpheus::Cli::Snapshots
         "Snapshot Type" => 'snapshotType',
         "Cloud" => lambda {|it| format_name_and_id(it['zone']) },
         "Datastore" => lambda {|it| format_name_and_id(it['datastore']) },
+        "Memory Snapshot" => lambda {|it| format_boolean(it['memorySnapshot']) },
+        "For Export" => lambda {|it| format_boolean(it['forExport']) },
         "Parent Snapshot" => lambda {|it| format_name_and_id(it['parentSnapshot']) },
         "Active" => lambda {|it| format_boolean(it['currentlyActive']) },
         "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Status" => lambda {|it| format_snapshot_status(it) }
       }
+      description_cols.delete("Memory Snapshot") if !snapshot['memorySnapshot']
+      description_cols.delete("For Export") if !snapshot['forExport']
       print_description_list(description_cols, snapshot)
 
       print reset, "\n"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.7"
+    VERSION = "8.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.7
+  version: 8.0.8
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-13 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix