morpheus-cli 7.0.6 → 8.0.0

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

@@ -13,18 +13,20 @@ class Morpheus::Cli::Clusters
   register_subcommands :upgrade_cluster
   register_subcommands :list_volumes, :remove_volume
   register_subcommands :list_namespaces, :get_namespace, :add_namespace, :update_namespace, :remove_namespace
-  register_subcommands :list_containers, :remove_container, :restart_container
+  register_subcommands :list_containers, :remove_container, :restart_container, :get_container
   register_subcommands :list_deployments, :remove_deployment, :restart_deployment
   register_subcommands :list_stateful_sets, :remove_stateful_set, :restart_stateful_set
   register_subcommands :list_pods, :remove_pod, :restart_pod
   register_subcommands :list_jobs, :remove_job
   register_subcommands :list_services, :remove_service
-  register_subcommands :list_datastores, :get_datastore, :update_datastore
+  register_subcommands :list_datastores, :get_datastore, :update_datastore, :add_datastore, :remove_datastore
   register_subcommands :update_permissions
   register_subcommands :api_config, :view_api_token, :view_kube_config
   register_subcommands :wiki, :update_wiki
   register_subcommands :apply_template
   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
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -32,6 +34,7 @@ class Morpheus::Cli::Clusters
     @groups_interface = @api_client.groups
     @cluster_layouts_interface = @api_client.library_cluster_layouts
     @security_groups_interface = @api_client.security_groups
+    @datastores_interface = @api_client.datastores
     #@security_group_rules_interface = @api_client.security_group_rules
     @cloud_resource_pools_interface = @api_client.cloud_resource_pools
     @resource_pool_groups_interface = @api_client.resource_pool_groups
@@ -220,6 +223,7 @@ class Morpheus::Cli::Clusters
           "Cloud" => lambda { |it| it['zone']['name'] },
           "Location" => lambda { |it| it['location'] },
           "Layout" => lambda { |it| it['layout'] ? it['layout']['name'] : ''},
+          "Integrations" => lambda {|it| format_name_and_id(it['integrations']) },
           "API Url" => 'serviceUrl',
           "Visibility" => lambda { |it| it['visibility'].to_s.capitalize },
           #"Groups" => lambda {|it| it['groups'].collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
@@ -228,6 +232,8 @@ class Morpheus::Cli::Clusters
           "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
           "Created By" => lambda {|it| it['createdBy'] ? it['createdBy']['username'] : '' },
           "Enabled" => lambda { |it| format_boolean(it['enabled']) },
+          "Managed" => lambda { |it| format_boolean(it['managed']) },
+          "Auto Power On VMs" => lambda { |it| format_boolean(it['autoRecoverPowerState']) },
           "Status" => lambda { |it| format_cluster_status(it) }
       }
       print_description_list(description_cols, cluster)
@@ -526,12 +532,7 @@ class Morpheus::Cli::Clusters
         resourceName = options[:resourceName]
 
         if !resourceName
-          if options[:no_prompt]
-            print_red_alert "No resource name provided"
-            exit 1
-          else
-            resourceName = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourceName', 'type' => 'text', 'fieldLabel' => 'Resource Name', 'required' => true, 'description' => 'Resource Name.'}],options[:options],@api_client,{})['resourceName']
-          end
+          resourceName = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourceName', 'type' => 'text', 'fieldLabel' => 'Resource Name', 'required' => false, 'description' => 'Resource Name.'}],options[:options],@api_client,{})['resourceName']
         end
 
         server_payload['name'] = resourceName
@@ -594,9 +595,17 @@ class Morpheus::Cli::Clusters
         # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
         provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
-
         api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
 
+        # Service Plan
+        service_plan = prompt_service_plan(api_params, options)
+        if service_plan
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code']}
+          api_params['planId'] = service_plan['id']
+          plan_opts = prompt_service_plan_options(service_plan, provision_type, options)
+          server_payload['servicePlanOptions'] = plan_opts if plan_opts && !plan_opts.empty?
+        end
+
         # Controller type
         server_types = @server_types_interface.list({computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes'].reject {|it| it['provisionType']['code'] == 'manual'}
         controller_provision_type = nil
@@ -613,7 +622,7 @@ class Morpheus::Cli::Clusters
             end
           end
 
-          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
+          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, service_plan, controller_provision_type, options)
             server_payload['config']['resourcePoolId'] = resource_pool['id']
             api_params['config'] ||= {}
             api_params['config']['resourcePool'] = resource_pool['id']
@@ -622,16 +631,6 @@ class Morpheus::Cli::Clusters
           end
         end
 
-        # Service Plan
-        service_plan = prompt_service_plan(api_params, options)
-
-        if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code']}
-          api_params['planId'] = service_plan['id']
-          plan_opts = prompt_service_plan_options(service_plan, provision_type, options)
-          server_payload['servicePlanOptions'] = plan_opts if plan_opts && !plan_opts.empty?
-        end
-
         # Multi-disk / prompt for volumes
         if provision_type['hasVolumes']
           volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options, @api_client, api_params)
@@ -653,6 +652,8 @@ class Morpheus::Cli::Clusters
         metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
         option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
 
+        server_count = layout['serverCount']
+
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
           server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt([option_type], options[:options], @api_client, api_params))
@@ -684,6 +685,10 @@ class Morpheus::Cli::Clusters
         # Layout template options
         cluster_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(load_layout_options(cluster_payload), options[:options], @api_client, api_params, options[:no_prompt], true))
 
+        # Set node count for ssh hosts
+        ssh_host_option = option_type_list.select{|it| it['fieldName'] == 'sshHosts'}.first
+        ssh_host_option['minCount'] = server_count unless ssh_host_option.nil?
+
         # Server options
         server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
@@ -729,7 +734,7 @@ class Morpheus::Cli::Clusters
 
         # Host / Domain
         server_payload['networkDomain'] = options[:domain] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkDomain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'required' => false, 'optionSource' => 'networkDomains'}], options[:options], @api_client, api_params)['networkDomain']
-        server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
+        server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => false, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Kube Default Repo
         if cluster_payload['type'] == 'kubernetes-cluster'
@@ -797,12 +802,18 @@ class Morpheus::Cli::Clusters
       opts.on('--managed [on|off]', String, "Can be used to enable / disable managed cluster. Default is on") do |val|
         options[:managed] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
+      opts.on('--autoRecoverPowerState [on|off]', String, "Automatically Power On VMs") do |val|
+        options[:autoRecoverPowerState] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
       opts.on( nil, '--refresh', "Refresh cluster" ) do
         options[:refresh] = true
       end
       opts.on("--tenant ACCOUNT", String, "Account ID or Name" ) do |val|
         options[:tenant] = val
       end
+      opts.on('--integrations [LIST]', Array, "Updates Cluster Integration(s), comma separated list of integration IDs") do |list|
+        options[:integrations] = list ? list.collect {|it| it.to_s.strip.to_i } : []
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a cluster.\n" +
                     "[cluster] is required. This is the name or id of an existing cluster."
@@ -832,15 +843,18 @@ class Morpheus::Cli::Clusters
       else
         cluster = find_cluster_by_name_or_id(args[0])
         cluster_payload = {}
+        cluster_payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
         cluster_payload['name'] = options[:name] if !options[:name].empty?
         cluster_payload['description'] = options[:description] if !options[:description].empty?
         cluster_payload['labels'] = options[:labels] if !options[:labels].nil?
         cluster_payload['enabled'] = options[:active] if !options[:active].nil?
         cluster_payload['managed'] = options[:managed] if !options[:managed].nil?
+        cluster_payload['autoRecoverPowerState'] = options[:autoRecoverPowerState] if !options[:autoRecoverPowerState].nil?
         cluster_payload['serviceUrl'] = options[:apiUrl] if !options[:apiUrl].nil?
         cluster_payload['serviceToken'] = options[:apiToken] if !options[:apiToken].nil?
         cluster_payload['refresh'] = options[:refresh] if options[:refresh] == true
         cluster_payload['tenant'] = options[:tenant] if !options[:tenant].nil?
+        cluster_payload['integrations'] = options[:integrations] if !options[:integrations].nil?
         payload = {"cluster" => cluster_payload}
       end
 
@@ -848,10 +862,9 @@ class Morpheus::Cli::Clusters
         print_red_alert "No clusters available for update"
         exit 1
       end
-
-      if cluster_payload.empty?
-        print_green_success "Nothing to update"
-        exit 1
+      
+      if payload['cluster'].empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
 
       @clusters_interface.setopts(options)
@@ -2206,6 +2219,7 @@ class Morpheus::Cli::Clusters
             :id, :status, :name, :cpu, :memory, :storage
         ]
         print as_pretty_table(rows, columns, options)
+        print_results_pagination(json_response)
       end
       print reset,"\n"
       return 0
@@ -2215,6 +2229,43 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def _get_container_group(args, options, resource_type)
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      id = args[1]
+      return 1 if cluster.nil?
+
+      params = {}
+      params.merge!(parse_list_options(options))
+      params['resourceLevel'] = options[:resourceLevel] if !options[:resourceLevel].nil?
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.get_container_group(cluster['id'], resource_type, id, params)
+        return
+      end
+      container_group = @clusters_interface.get_container_group(cluster['id'], resource_type, id, params)['resource']
+
+      render_result = render_with_format(container_group, options, 'containers')
+      return 0 if render_result
+      resource_is = options['title'] ? options['title'].capitalize : resource_type.capitalize
+      title = "Morpheus Cluster #{cluster['name']}: #{resource_is}"
+      print_h1 title
+      print cyan
+      description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Status" => 'status',
+          "metadata" => lambda { |it| as_json(it['metadata']) }
+      }
+      print_description_list(description_cols, container_group)
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def _remove_container_group(args, options, resource_type)
     begin
       cluster = find_cluster_by_name_or_id(args[0])
@@ -2322,6 +2373,26 @@ class Morpheus::Cli::Clusters
     _list_container_groups(args, options,resource_type)
   end
 
+  def get_deployment(args)
+    resource_type = 'deployment'
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster]")
+      opts.on("--resource-level LEVEL", String, "Resource Level") do |val|
+        options[:resourceLevel] = val.to_s
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "get #{resource_type} for a cluster.\n" +
+          "[cluster] and [#{resource_type}] is required. This is the name or id of an existing cluster, and the id of the #{resource_type}"
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    _get_container_group(args, options, resource_type)
+  end
+
   def remove_deployment(args)
     resource_type = 'deployment'
     options = {}
@@ -2440,6 +2511,26 @@ class Morpheus::Cli::Clusters
     _list_container_groups(args, options, resource_type)
   end
 
+  def get_pod(args)
+    resource_type = 'pod'
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster]")
+      opts.on("--resource-level LEVEL", String, "Resource Level") do |val|
+        options[:resourceLevel] = val.to_s
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "get #{resource_type} for a cluster.\n" +
+          "[cluster] and [#{resource_type}] is required. This is the name or id of an existing cluster, and the id of the #{resource_type}"
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    _get_container_group(args, options, resource_type)
+  end
+
   def remove_pod(args)
     resource_type = 'pod'
     options = {}
@@ -2909,6 +3000,130 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def add_datastore(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster] [options]")
+      build_option_type_options(opts, options, add_datastore_option_types)
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Add datastore 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 datastore."
+    end
+
+    optparse.parse!(args)
+    if args.count != 1 and args.count != 2
+      raise_command_error "wrong number of arguments, expected 1-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?
+      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']})
+
+        datastore = Morpheus::Cli::OptionTypes.prompt(add_datastore_option_types, options[:options], @api_client, options[:params])
+
+        datastore_type = find_datastore_type_by_code(datastore['datastoreType'])
+        datastore['datastoreType'] = {id:datastore_type['id']}
+
+        # datastore type options
+        unless datastore_type['optionTypes'].empty?
+          datastore.merge!(Morpheus::Cli::OptionTypes.prompt(datastore_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_datastore => true}), ['plans', 'groupDefaults'])
+
+        datastore['resourcePermissions'] = perms['resourcePermissions'] unless perms['resourcePermissions'].nil?
+        datastore['tenants'] = perms['tenantPermissions'] unless perms['tenantPermissions'].nil?
+        datastore['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
+
+        payload = {datastore:datastore}
+      end
+
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.create_datastore(cluster['id'], payload)
+        return
+      end
+      json_response = @clusters_interface.create_datastore(cluster['id'], payload)
+      if options[:json]
+        puts as_json(json_response)
+      elsif json_response['success']
+        if json_response['msg'] == nil
+          print_green_success "Added datastore to cluster #{cluster['name']}"
+        else
+          print_green_success json_response['msg']
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_datastore(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster] [datastore]")
+      opts.on( '-f', '--force', "Force Delete" ) do
+        params[:force] = 'on'
+      end
+      build_standard_remove_options(opts, options)
+      opts.footer = "Delete a datastore from a cluster.\n" +
+        "[cluster] is required. This is the name or id of an existing cluster.\n" +
+        "[datastore] is required. This is the name or id of an existing datastore."
+    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?
+
+    datastore_id = args[1]
+    if datastore_id.empty?
+      raise_command_error "missing required worker parameter"
+    end
+
+    datastore = find_datastore_by_name_or_id(cluster['id'], datastore_id)
+    if datastore.nil?
+      print_red_alert "Datastore not found for '#{datastore_id}'"
+      return 1
+    end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the cluster datastore '#{datastore['name'] || datastore['id']}'?", options)
+      return 9, "aborted command"
+    end
+
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.destroy_datastore(cluster['id'], datastore['id'], params)
+      return
+    end
+    json_response = @clusters_interface.destroy_datastore(cluster['id'], datastore['id'], params)
+    render_response(json_response, options) do
+      msg = "Datastore #{datastore['name']} is being removed from cluster #{cluster['name']}..."
+      if json_response['msg']
+        msg = json_response['msg']
+      end
+      print_green_success msg
+    end
+    return 0, nil
+  end
+
   def update_datastore(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -3971,6 +4186,25 @@ class Morpheus::Cli::Clusters
     json_results['datastores'].empty? ? nil : json_results['datastores'][0]
   end
 
+  def find_datastore_type_by_code_or_id(val)
+    (val.to_s =~ /\A\d{1,}\Z/) ? find_datastore_type_by_id(val) : find_datastore_type_by_code(val)
+  end
+
+  def find_datastore_type_by_id(id)
+    get_datastore_types.find { |it| it['id'] == id }
+  end
+
+  def find_datastore_type_by_code(code)
+    get_datastore_types.find { |it| it['code'].downcase == code.downcase }
+  end
+
+  def get_datastore_types(refresh=false)
+    if !@datastore_types || refresh
+      @datastore_types = @datastores_interface.types()['datastoreTypes']
+    end
+    @datastore_types
+  end
+
   def find_job_by_name_or_id(cluster_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       params = {jobId: val.to_i}
@@ -4276,6 +4510,14 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def add_datastore_option_types
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'datastoreType', 'fieldLabel' => 'Type', 'type' => 'select', 'optionSource' => 'datastoreTypes', 'description' => 'Choose a datastore type.', 'required' => true, 'displayOrder' => 2},
+      {'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'required' => true, 'displayOrder' => 3, 'defaultValue' => true},
+    ]
+  end
+
   def prompt_resource_pool(group, cloud, service_plan, provision_type, options)
     resource_pool = nil
 
@@ -4452,4 +4694,135 @@ class Morpheus::Cli::Clusters
       exit 1
     end
   end
+
+  def list_replicasets(args)
+    _list_resources(args, 'replicaset')
+  end
+
+  def get_replicaset(args)
+    _get_resource(args, 'replicaset')
+  end
+
+  def list_daemonsets(args)
+    _list_resources(args, 'daemonset')
+  end
+
+  def get_daemonset(args)
+    _get_resource(args, 'daemonset')
+  end
+
+
+  def list_endpoints(args)
+    _list_resources(args, 'endpoint')
+  end
+
+  def get_endpoint(args)
+    _get_resource(args, 'endpoint')
+  end
+
+  def list_ingresses(args)
+    _list_resources(args, 'ingresse')
+  end
+
+  def get_ingress(args)
+    _get_resource(args, 'ingresse', {'title' => 'ingress'})
+  end
+
+  def list_policies(args)
+    _list_resources(args, 'policie')
+  end
+
+  def get_policy(args)
+    _get_resource(args, 'policie', {'title' => 'policy'})
+  end
+
+  def list_volume_claims(args)
+    _list_resources(args, 'volumeclaim')
+  end
+
+  def get_volume_claim(args)
+    _get_resource(args, 'volumeclaim')
+  end
+
+  def list_volumes(args)
+    _list_resources(args, 'volume')
+  end
+
+  def get_volume(args)
+    _get_resource(args, 'volume')
+  end
+
+
+  def list_config_maps(args)
+    _list_resources(args, 'configmap')
+  end
+
+  def get_config_map(args)
+    _get_resource(args, 'configmap')
+  end
+
+  def list_secrets(args)
+    _list_resources(args, 'secret')
+  end
+
+  def get_secret(args)
+    _get_resource(args, 'secret')
+  end
+
+  def get_container(args)
+    _get_resource(args, 'container')
+  end
+
+  def get_stateful_set(args)
+    _get_resource(args, 'statefulset')
+
+  end
+
+  def get_job(args)
+    _get_resource(args, 'job')
+  end
+
+  def get_service(args)
+    _get_resource(args, 'service')
+  end
+
+  private
+
+  def _get_resource(args, resource_type, options = {})
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster] [id]")
+      opts.on("--resource-level LEVEL", String, "Resource Level") do |val|
+        options[:resourceLevel] = val.to_s
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "get #{resource_type} for a cluster.\n" +
+                    "[cluster] and [#{resource_type}] is required. This is the name or id of an existing cluster, and the id of the #{resource_type}"
+    end
+    optparse.parse!(args)
+    
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+
+    connect(options)
+    _get_container_group(args, options, resource_type)
+  end
+
+  def _list_resources(args, resource_type, options = {})
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster]")
+      opts.on("--resource-level LEVEL", String, "Resource Level") do |val|
+        options[:resourceLevel] = val.to_s
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List #{resource_type}s for a cluster.\n" +
+          "[cluster] is required. This is the name or id of an existing cluster."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    _list_container_groups(args, options, resource_type)
+  end
 end

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

@@ -1009,6 +1009,9 @@ class Morpheus::Cli::Hosts
       opts.on('--ssh-password VALUE', String, "SSH Password") do |val|
         params['sshPassword'] = val == "null" ? nil : val
       end
+      opts.on('--ssh-key-pair ID', String, "SSH Key Pair ID") do |val|
+        params['sshKeyPair'] = val == "null" ? nil : {"id" => val.to_i}
+      end
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
       end

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

@@ -2746,6 +2746,9 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
+      opts.on('--include-network-interfaces','--include-network-interfaces', "Populate payload networkInterfaces with current interfaces") do
+        options[:include_nics] = true
+      end
       build_standard_update_options(opts, options)
     end
     optparse.parse!(args)
@@ -2775,11 +2778,17 @@ class Morpheus::Cli::Instances
       plan_id = instance['plan']['id']
       resource_pool_id = instance['config']['resourcePoolId'] if instance['config']
       current_plan_name = instance['plan']['name']
-      current_interfaces = get_instance_interfaces(instance)
-      if current_interfaces != false 
-        payload['networkInterfaces'] = current_interfaces
-      end
       
+      # JD: networkInterfaces should not be needed but pre 7.0.8/8.0.0 the API does expect it to be passed
+      # However if the instance has more than one server this creates duplicate nics and breaks things
+      # so only continue to do it if the instance has just one server and remote version is pre 7.0.8
+      # should also only do this if remote version < 7.0.8
+      if options[:include_nics] || (!remote_version_gte("7.0.8") && instance['servers'] && instance['servers'].size == 1)
+          current_interfaces = get_instance_interfaces(instance)
+          if current_interfaces != false 
+            payload['networkInterfaces'] = current_interfaces
+          end
+      end
 
       # need to GET provision type for some settings...
       provision_type = @provision_types_interface.get(instance['layout']['provisionTypeId'])['provisionType']
@@ -5576,6 +5585,8 @@ private
         details['interfaces'].each do |inter|
           interfaces.push(inter)
         end
+        # only include the first one or it will create duplicates
+        break
       end
       return interfaces
     rescue
@@ -5583,4 +5594,22 @@ private
     end
   end
 
+  def remote_version_gte(required_version)
+    version = @remote_appliance[:build_version]
+    return false if version.nil?
+    version_numbers = version.split(".")
+    required_version_numbers = required_version.split(".")
+    result = true
+    required_version_numbers.each_with_index do |v, i|
+      if version_numbers[i].to_i > v.to_i
+        break
+      elsif version_numbers[i].to_i < v.to_i
+        result = false
+        break
+      else
+        # keep going
+      end
+    end
+    return result
+  end
 end