morpheus-cli 5.4.0 → 5.4.3.1

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

@@ -0,0 +1,188 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::Audit
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::LogsHelper
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::OptionSourceHelper
+
+  set_command_description "View audit log records."
+  set_command_name :'audit'
+  register_subcommands :list, :get
+  
+  # audit is not published yet
+  set_command_hidden
+
+  # RestCommand settings
+
+  # interfaces
+  register_interfaces :audit
+  set_rest_interface_name :audit
+
+  # resource name is "Audit Log"
+  set_rest_name :audit_log
+
+  # display argument as [id] instead of [audit log]
+  set_rest_has_name false
+  set_rest_arg "id"
+
+  # def connect(opts)
+  #   @api_client = establish_remote_appliance_connection(opts)
+  #   @audit_interface = @api_client.audit # @api_client.rest("audit")
+  # end
+  
+  # def handle(args)
+  #   handle_subcommand(args)
+  # end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[search]")
+      opts.on('--user USER', String, "Filter by User Username or ID") do |val|
+        params['user'] = params['user'] ? [params['user'], val].flatten : [val]
+      end
+      opts.on('--level VALUE', String, "Log Level. DEBUG|INFO|WARN|ERROR") do |val|
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
+      end
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start date timestamp in standard iso8601 format.") do |val|
+        params['startDate'] = val # parse_time(val).utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End date timestamp in standard iso8601 format.") do |val|
+        params['endDate'] = val # parse_time(val).utc.iso8601
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = "List audit logs records."
+    end
+    optparse.parse!(args)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    connect(options)
+    params.merge!(parse_list_options(options))
+    # parse --user id,name
+    if params['user']
+      user_ids = parse_user_id_list(params['user'])
+      return 1 if user_ids.nil?
+      params['user'] = user_ids
+    end
+    # api works with level=INFO|WARN
+    if params['level']
+      params['level'] = [params['level']].flatten.collect {|it| it.to_s.upcase }.join('|')
+    end
+    # could find_by_name_or_id for params['servers'] and params['containers']
+    @audit_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @audit_interface.dry.list(params)
+      return
+    end
+    json_response = @audit_interface.list(params)
+
+    render_response(json_response, options, rest_list_key) do
+      records = json_response[rest_list_key]
+      print_h1 "Morpheus Audit Log", parse_list_subtitles(options), options
+      if records.nil? || records.empty?
+        print cyan,"No #{rest_label_plural.downcase} found.",reset,"\n"
+      else
+        print as_pretty_table(records, rest_list_column_definitions(options).upcase_keys!, options)
+        print_results_pagination(json_response) if json_response['meta']
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  protected
+
+  # custom rendering to print Message below description list
+  def render_response_for_get(json_response, options)
+    render_response(json_response, options, rest_object_key) do
+      record = json_response[rest_object_key]
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(rest_column_definitions(options), record, options)
+      # show log message settings...
+      print_h2 "Message", options
+      print cyan
+      puts record['message']
+      print reset,"\n"
+    end
+  end
+
+  def audit_log_object_key
+    "auditLog"
+  end
+
+  def audit_log_list_key
+    "auditLogs"
+  end
+
+  def audit_log_list_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Level" => lambda {|it| format_log_level(it['level']) },
+      "Message" => {display_method:'message', max_width: (options[:wrap] ? nil : 75)}, 
+      "Event Type" => 'eventType',
+      "Object" => lambda {|it| "#{it['objectClass']} #{it['objectId']}".strip },
+      # "Object Type" => 'objectClass',
+      # "Object ID" => 'objectId',
+      "User" => lambda {|it| 
+        if it['actualUser'] && it['user'] && it['actualUser']['username'] != it['user']['username']
+          it['user']['username'] + '(' + it['actualUser']['username'].to_s + ')'
+        elsif it['user']
+          it['user']['username']
+        else
+          # system or deleted user maybe?
+        end
+      },
+      # "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+    }
+  end
+
+  def audit_log_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Level" => lambda {|it| format_log_level(it['level']) },
+      #"Message" => 'message', 
+      "Event Type" => 'eventType',
+      "Object Type" => 'objectClass',
+      "Object ID" => 'objectId',
+      "User" => lambda {|it| 
+        if it['actualUser'] && it['user'] && it['actualUser']['username'] != it['user']['username']
+          it['user']['username'] + '(' + it['actualUser']['username'].to_s + ')'
+        elsif it['user']
+          it['user']['username']
+        else
+          # system or deleted user maybe?
+        end
+      },
+      # "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+    }
+  end
+
+  def find_audit_log_by_name_or_id(val)
+    return find_audit_log_by_id(val)
+  end
+
+  def find_audit_log_by_id(id)
+    begin
+      json_response = @audit_interface.get(id)
+      return json_response[audit_log_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Audit Log not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_audit_log_by_name(name)
+    raise_command_error "finding audit log by name not supported"
+  end
+
+end

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

@@ -36,7 +36,7 @@ class Morpheus::Cli::BlueprintsCommand
     @options_interface = @api_client.options
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @clouds_interface = @api_client.clouds
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @library_layouts_interface = @api_client.library_layouts
   end
 

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

@@ -13,6 +13,7 @@ class Morpheus::Cli::CatalogItemTypesCommand
   set_command_description "Self Service: View and manage catalog item types"
 
   register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands({:'update-logo' => :update_logo})
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -222,6 +223,7 @@ EOT
   def add(args)
     options = {}
     params = {}
+    logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       # opts.on('-t', '--type [instance|blueprint|workflow]', "Item Type, default is instance.") do |val|
@@ -229,6 +231,19 @@ EOT
       #   options[:options]['type'] = val.to_s.downcase
       # end
       build_option_type_options(opts, options, add_catalog_item_type_option_types)
+      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
+        filename = val
+        logo_file = nil
+        if filename == 'null'
+          filename = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exists?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          logo_file = File.new(filename, 'rb')
+        end
+      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil
@@ -330,6 +345,16 @@ EOT
       return 0, nil
     end
     json_response = @catalog_item_types_interface.create(payload)
+    if json_response['success']
+      if logo_file
+        begin
+          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file)
+        rescue RestClient::Exception => e
+          print_red_alert "Failed to save logo!"
+          print_rest_exception(e, options)
+        end
+      end
+    end
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
       print_green_success "Added catalog item type #{catalog_item_type['name']}"
@@ -342,9 +367,23 @@ EOT
     options = {}
     params = {}
     payload = {}
+    logo_file = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type] [options]")
       build_option_type_options(opts, options, update_catalog_item_type_option_types)
+      opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
+        filename = val
+        logo_file = nil
+        if filename == 'null'
+          filename = 'null' # clear it
+        else
+          filename = File.expand_path(filename)
+          if !File.exists?(filename)
+            raise_command_error "File not found: #{filename}"
+          end
+          logo_file = File.new(filename, 'rb')
+        end
+      end
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
         file_content = nil
@@ -445,6 +484,16 @@ EOT
       return
     end
     json_response = @catalog_item_types_interface.update(catalog_item_type['id'], payload)
+    if json_response['success']
+      if logo_file
+        begin
+          @catalog_item_types_interface.update_logo(json_response['catalogItemType']['id'], logo_file)
+        rescue RestClient::Exception => e
+          print_red_alert "Failed to save logo!"
+          print_rest_exception(e, options)
+        end
+      end
+    end
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
       print_green_success "Updated catalog item type #{catalog_item_type['name']}"
@@ -453,6 +502,45 @@ EOT
     return 0, nil
   end
 
+  def update_logo(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[type] [file]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update the logo for a catalog item type." + "\n" +
+                    "[type] is required. This is the name or id of a catalog item type." + "\n" +
+                    "[file] is required. This is the path of the logo file"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    catalog_item_type = find_catalog_item_type_by_name_or_id(args[0])
+    return 1 if catalog_item_type.nil?
+    filename = args[1]
+    logo_file = nil
+    if filename == 'null'
+      filename = 'null' # clear it
+    else
+      filename = File.expand_path(filename)
+      if !File.exists?(filename)
+        raise_command_error "File not found: #{filename}"
+      end
+      logo_file = File.new(filename, 'rb')
+    end
+    @catalog_item_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @catalog_item_types_interface.dry.update_logo(catalog_item_type['id'], logo_file)
+      return
+    end
+    json_response = @catalog_item_types_interface.update_logo(catalog_item_type['id'], logo_file)
+    render_response(json_response, options, catalog_item_type_object_key) do
+      print_green_success "Updated catalog item type #{catalog_item_type['name']} logo"
+      return _get(catalog_item_type["id"], {}, options)
+    end
+  end
+
   def remove(args)
     options = {}
     params = {}

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

@@ -9,7 +9,7 @@ class Morpheus::Cli::ChangePasswordCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @whoami_interface = @api_client.whoami
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @accounts_interface = @api_client.accounts
     @roles_interface = @api_client.roles
   end
@@ -105,9 +105,9 @@ class Morpheus::Cli::ChangePasswordCommand
         'password' => new_password
       } 
     }
-    @users_interface.setopts(options)
+    @account_users_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
+      print_dry_run @account_users_interface.dry.update(account_id, user['id'], payload)
       return 0
     end
 
@@ -117,7 +117,7 @@ class Morpheus::Cli::ChangePasswordCommand
       end
     end
 
-    json_response = @users_interface.update(account_id, user['id'], payload)
+    json_response = @account_users_interface.update(account_id, user['id'], payload)
     if options[:json]
       puts as_json(json_response)
     elsif !options[:quiet]

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

@@ -458,6 +458,10 @@ class Morpheus::Cli::Clusters
 
         cluster_payload['type'] = cluster_type['code'] # {'id' => cluster_type['id']}
 
+        # Group / Site
+        group = load_group(cluster_type['code'], options)
+        cluster_payload['group'] = {'id' => group['id']}
+
         # Cluster Name
         if args.empty? && options[:no_prompt]
           print_red_alert "No cluster name provided"
@@ -514,10 +518,6 @@ class Morpheus::Cli::Clusters
 
         server_payload['tags'] = tags if tags
 
-        # Group / Site
-        group = load_group(options)
-        cluster_payload['group'] = {'id' => group['id']}
-
         # Cloud / Zone
         cloud_id = nil
         cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group['id'], options[:cloud]) : nil
@@ -526,7 +526,7 @@ class Morpheus::Cli::Clusters
           cloud = @clouds_interface.get(cloud['id'])['zone']
           cloud_id = cloud['id']
         else
-          available_clouds = get_available_clouds(group['id'])
+          available_clouds = get_available_clouds(group['id'], {groupType: cluster_payload['type']})
 
           if available_clouds.empty?
             print_red_alert "Group #{group['name']} has no available clouds"
@@ -547,30 +547,34 @@ class Morpheus::Cli::Clusters
           available_layouts = layouts_for_dropdown(cloud['id'], cluster_type['id'])
 
           if !available_layouts.empty?
-            if available_layouts.count > 1 && !options[:no_prompt]
-              layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
-            else
-              layout_id = available_layouts.first['id']
-            end
+            layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
             layout = find_layout_by_name_or_id(layout_id)
           end
         end
 
-        cluster_payload['layout'] = {id: layout['id']}
+        cluster_payload['layout'] = {'id' => layout['id']}
 
         # 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'], provisionTypeId: provision_type['id']}
+        api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
 
         # Controller type
-        server_types = @server_types_interface.list({max:1, computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes']
+        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
         resource_pool = nil
 
         if !server_types.empty?
           controller_type = server_types.first
-          controller_provision_type = controller_type['provisionType'] ? (@provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil) : nil
+
+          if controller_type['provisionType']
+            if provision_type && provision_type['id'] == controller_type['provisionType']['id']
+              controller_provision_type = provision_type
+            else
+              controller_provision_type = @provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil
+            end
+          end
 
           if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
             server_payload['config']['resourcePoolId'] = resource_pool['id']
@@ -585,21 +589,23 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan(api_params, options)
 
         if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, provision_type, options)}
           api_params['planId'] = service_plan['id']
         end
 
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
-
-        if !volumes.empty?
-          server_payload['volumes'] = volumes
+        if provision_type['hasVolumes']
+          volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
+          if !volumes.empty?
+            server_payload['volumes'] = volumes
+          end
         end
 
         # Options / Custom Config
         option_type_list =
-          ((controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) + layout['optionTypes'] +
-          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue [])).sort { |type| type['displayOrder'] }
+          ((controller_type.nil? ? [] : controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) +
+          layout['optionTypes'] +
+          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue []))
 
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
@@ -621,11 +627,17 @@ class Morpheus::Cli::Clusters
         # Visibility
         server_payload['visibility'] = options[:visibility] || (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'defaultValue' => 'private', 'required' => true, 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}]}], options[:options], @api_client, {})['visibility'])
 
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, api_params, options[:no_prompt], true))
+        # 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))
+
+        # 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))
 
         # Worker count
-        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
-        server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        if !['manual', 'external'].include?(provision_type['code'])
+          default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+          server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker-cluster', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        end
 
         # Create User
         if !options[:createUser].nil?
@@ -653,10 +665,12 @@ class Morpheus::Cli::Clusters
         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']
 
         # Workflow / Automation
-        task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
+        if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
+          task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
 
-        if !task_set_id.nil?
-          server_payload['taskSet'] = {'id' => task_set_id}
+          if !task_set_id.nil?
+            server_payload['taskSet'] = {'id' => task_set_id}
+          end
         end
 
         cluster_payload['server'] = server_payload
@@ -1168,7 +1182,7 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
 
         if service_plan
-          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, nil, options)}
         end
 
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)
@@ -3665,7 +3679,7 @@ class Morpheus::Cli::Clusters
     @clouds_interface.cloud_type(zone_type_id)['zoneType']['provisionTypes'].first rescue nil
   end
 
-  def load_group(options)
+  def load_group(group_type, options)
     # Group / Site
     group_id = nil
     group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
@@ -3676,15 +3690,13 @@ class Morpheus::Cli::Clusters
       if @active_group_id
         group_id = @active_group_id
       else
-        available_groups = get_available_groups
+        available_groups = get_available_groups({groupType: group_type})
 
         if available_groups.empty?
           print_red_alert "No available groups"
           exit 1
-        elsif available_groups.count > 1 && !options[:no_prompt]
+        else available_groups.count > 1 && !options[:no_prompt]
           group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => available_groups, 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})['group']
-        else
-          group_id = available_groups.first['id']
         end
       end
     end
@@ -3711,34 +3723,37 @@ class Morpheus::Cli::Clusters
     service_plan
   end
 
-  def prompt_service_plan_options(service_plan, options)
+  def prompt_service_plan_options(service_plan, provision_type, options)
     plan_options = {}
-
-    # custom max memory
-    if service_plan['customMaxMemory']
-      if !options[:maxMemory]
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
-        plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
-      else
-        plan_options['maxMemory'] = options[:maxMemory]
+    hide_custom_options = provision_type && provision_type['code'] == 'manual'
+
+    if !hide_custom_options
+      # custom max memory
+      if service_plan['customMaxMemory']
+        if !options[:maxMemory]
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
+          plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
+        else
+          plan_options['maxMemory'] = options[:maxMemory]
+        end
       end
-    end
 
-    # custom cores: max cpu, max cores, cores per socket
-    if service_plan['customCores']
-      if options[:cpuCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
-        plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
-      else
-        plan_options['cpuCount']
-      end
-      if options[:coreCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
-        plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
-      end
-      if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
-        plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+      # custom cores: max cpu, max cores, cores per socket
+      if service_plan['customCores']
+        if options[:cpuCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
+          plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
+        else
+          plan_options['cpuCount']
+        end
+        if options[:coreCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
+          plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
+        end
+        if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
+          plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+        end
       end
     end
     plan_options
@@ -3926,4 +3941,27 @@ class Morpheus::Cli::Clusters
     ]
   end
 
+  def load_layout_options(cluster)
+    (@api_client.options.options_for_source('computeTypeLayoutParameters', {layoutId: cluster['layout']['id']})['data'] || []).collect do |it|
+      it['fieldName'] = it['name']
+      it['fieldLabel'] = it['displayName']
+      it['fieldContext'] = 'config.templateParameter'
+      if it['type'] == 'ServicePlan'
+        it['optionSource'] = 'servicePlans'
+        it['type'] = 'select'
+        it['params'] = {:provisionType => '', :zoneId => '', :siteId => '', :resourcePoolId => ''}
+        it['params'][:provisionType] = 'azure' if it['azureServicePlanType']
+      elsif it['type'] == 'Subnet'
+        it['optionSource'] = 'networks'
+        it['type'] = 'select'
+        it['params'] = {:siteId => '', :instanceId => '', :serverId => '', :zonePoolId => '', :zoneRegionId => '', :zoneId => '', :provisionType => ''}
+        if cluster['type'] == 'aks-cluster'
+          it['params'][:provisionType] = 'azure'
+        end
+      else
+        it['type'] = 'text'
+      end
+      it
+    end
+  end
 end