morpheus-cli 5.4.0 → 5.4.3.1

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

@@ -22,7 +22,7 @@ class Morpheus::Cli::Hosts
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = @api_client.accounts
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
     @tasks_interface = @api_client.tasks
@@ -81,25 +81,25 @@ class Morpheus::Cli::Hosts
       opts.on( '--plan-code CODE', String, "Filter by Plan code(s)" ) do |val|
         params['planCode'] = parse_id_list(val)
       end
-      opts.on( '', '--vm', "Show only virtual machines" ) do |val|
+      opts.on('--vm', "Show only virtual machines" ) do
         params[:vm] = true
       end
-      opts.on( '', '--hypervisor', "Show only VM Hypervisors" ) do |val|
+      opts.on('--hypervisor', "Show only VM Hypervisors" ) do
         params[:vmHypervisor] = true
       end
-      opts.on( '', '--container', "Show only Container Hypervisors" ) do |val|
+      opts.on('--container', "Show only Container Hypervisors" ) do
         params[:containerHypervisor] = true
       end
-      opts.on( '', '--baremetal', "Show only Baremetal Servers" ) do |val|
+      opts.on('--baremetal', "Show only Baremetal Servers" ) do
         params[:bareMetalHost] = true
       end
-      opts.on( '', '--status STATUS', "Filter by Status" ) do |val|
+      opts.on('--status STATUS', String, "Filter by Status" ) do |val|
         params[:status] = val
       end
-      opts.on( '', '--agent', "Show only Servers with the agent installed" ) do |val|
+      opts.on('--agent', "Show only Servers with the agent installed" ) do
         params[:agentInstalled] = true
       end
-      opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
+      opts.on('--noagent', "Show only Servers with No agent" ) do
         params[:agentInstalled] = false
       end
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
@@ -374,25 +374,25 @@ class Morpheus::Cli::Hosts
       opts.on( '-i', '--ip IPADDRESS', "Filter by IP Address" ) do |val|
         params[:ip] = val
       end
-      opts.on( '', '--vm', "Show only virtual machines" ) do |val|
+      opts.on('--vm', "Show only virtual machines" ) do
         params[:vm] = true
       end
-      opts.on( '', '--hypervisor', "Show only VM Hypervisors" ) do |val|
+      opts.on('--hypervisor', "Show only VM Hypervisors" ) do
         params[:vmHypervisor] = true
       end
-      opts.on( '', '--container', "Show only Container Hypervisors" ) do |val|
+      opts.on('--container', "Show only Container Hypervisors" ) do
         params[:containerHypervisor] = true
       end
-      opts.on( '', '--baremetal', "Show only Baremetal Servers" ) do |val|
+      opts.on('--baremetal', "Show only Baremetal Servers" ) do
         params[:bareMetalHost] = true
       end
-      opts.on( '', '--status STATUS', "Filter by Status" ) do |val|
+      opts.on('--status STATUS', "Filter by Status" ) do |val|
         params[:status] = val
       end
-      opts.on( '', '--agent', "Show only Servers with the agent installed" ) do |val|
+      opts.on('--agent', "Show only Servers with the agent installed" ) do
         params[:agentInstalled] = true
       end
-      opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
+      opts.on('--noagent', "Show only Servers with No agent" ) do
         params[:agentInstalled] = false
       end
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
@@ -878,6 +878,12 @@ class Morpheus::Cli::Hosts
           payload['volumes'] = volumes
         end
 
+        # plan customizations
+        plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {})
+        if plan_opts && !plan_opts.empty?
+          payload['servicePlanOptions'] = plan_opts
+        end
+
         # prompt for network interfaces (if supported)
         if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
           begin
@@ -1252,6 +1258,12 @@ class Morpheus::Cli::Hosts
         payload[:volumes] = volumes
       end
 
+      # plan customizations
+      plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {}, server)
+      if plan_opts && !plan_opts.empty?
+        payload['servicePlanOptions'] = plan_opts
+      end
+
       # todo: reconfigure networks
       #       need to get provision_type_id for network info
       # prompt for network interfaces (if supported)

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

@@ -1065,20 +1065,16 @@ class Morpheus::Cli::ImageBuilderCommand
     preseed_script_id = nil
     if options['preseedScript']
       preseed_script = find_preseed_script(options['preseedScript'])
-      if !preseed_script
-        print_red_alert "Preseed Script not found: #{options['preseedScript']}"
-        return false
+      if preseed_script
+        preseed_script_id = preseed_script['id']
       end
-      preseed_script_id = preseed_script['id']
     else
       preseed_script_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'preseedScript', 'type' => 'select', 'fieldLabel' => 'Preseed Script', 'selectOptions' => get_available_preseed_scripts(), 'required' => false, 'description' => 'Select Preseed Script.', 'defaultValue' => default_values['preseedScript'], :fmt=>:natural}],options,api_client,{})
       # preseed_script_id = preseed_script_prompt['preseedScript']
       preseed_script = find_preseed_script(preseed_script_prompt['preseedScript'])
-      if !preseed_script
-        print_red_alert "Preseed Script not found: '#{preseed_script_prompt['preseedScript']}'"
-        return false
+      if preseed_script
+        preseed_script_id = preseed_script['id']
       end
-      preseed_script_id = preseed_script['id']
     end
     if preseed_script_id
       # payload['preseedScript'] = preseed_script_id

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

@@ -17,12 +17,14 @@ class Morpheus::Cli::Instances
                        :logs, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
                        :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
                        :lock, :unlock, :clone_image,
-                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :snapshot, :snapshots,
+                       :security_groups, :apply_security_groups, :run_workflow,
+                       :import_snapshot, :snapshot, :snapshots, :revert_to_snapshot, :remove_all_snapshots, :remove_all_container_snapshots, :create_linked_clone,
                        :console, :status_check, {:containers => :list_containers}, 
                        :scaling, {:'scaling-update' => :scaling_update},
                        :wiki, :update_wiki,
                        {:exec => :execution_request},
-                       :deploys
+                       :deploys,
+                       :refresh, :apply
   #register_subcommands :firewall_disable, :firewall_enable
   # register_subcommands {:'lb-update' => :load_balancer_update}
   alias_subcommand :details, :get
@@ -35,7 +37,7 @@ class Morpheus::Cli::Instances
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = @api_client.accounts
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @instances_interface = @api_client.instances
     @task_sets_interface = @api_client.task_sets
     @logs_interface = @api_client.logs
@@ -51,6 +53,7 @@ class Morpheus::Cli::Instances
     @execution_request_interface = @api_client.execution_request
     @deploy_interface = @api_client.deploy
     @deployments_interface = @api_client.deployments
+    @snapshots_interface = @api_client.snapshots
   end
   
   def handle(args)
@@ -77,6 +80,12 @@ class Morpheus::Cli::Instances
       opts.on( '--created-by USER', "Alias for --owner" ) do |val|
         options[:owner] = val
       end
+      opts.on('--agent', "Show only Instances with the agent installed" ) do
+        params[:agentInstalled] = true
+      end
+      opts.on('--noagent', "Show only Instances with No agent" ) do
+        params[:agentInstalled] = false
+      end
       opts.add_hidden_option('--created-by')
       opts.on('--status STATUS', "Filter by status i.e. provisioning,running,starting,stopping") do |val|
         params['status'] = (params['status'] || []) + val.to_s.split(',').collect {|s| s.strip }.select {|s| s != "" }
@@ -2711,6 +2720,12 @@ class Morpheus::Cli::Instances
         payload["volumes"] = volumes
       end
 
+      # plan customizations
+      plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {}, instance)
+      if plan_opts && !plan_opts.empty?
+        payload['servicePlanOptions'] = plan_opts
+      end
+
       # only amazon supports this option
       # for now, always do this
       payload["deleteOriginalVolumes"] = true
@@ -3354,6 +3369,223 @@ EOT
     end
   end
 
+  def revert_to_snapshot(args)
+    options = {}
+    instance = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      opts.on("--snapshot ID", String, "Optional snapshot") do |val|
+        snapshot_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+           build_standard_add_options(opts, options) #, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      opts.footer = "Revert an Instance to saved Snapshot previously made." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot to replace the current instance."
+    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)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to revert instance '#{instance['name']}'?", options)
+        exit 1
+      end
+      options[:options]['instanceId'] = instance['id']
+      begin
+        snapshot_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'snapshotId', 'type' => 'select', 'fieldLabel' => 'Snapshot', 'optionSource' => 'instanceSnapshots', 'required' => true, 'description' => 'Select Snapshot.'}], {}, @api_client, options[:options])
+      
+        if !snapshot_prompt['snapshotId'].to_s.empty?
+          snapshot_id = snapshot_prompt['snapshotId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load instance snapshots"
+      end
+      
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.revert_to_snapshot(instance['id'], snapshot_id, payload)
+        return
+      end
+      
+      json_response = @instances_interface.revert_to_snapshot(instance['id'], snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshot revert initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_all_container_snapshots(args)
+    options = {}
+    instance = nil
+    container_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      opts.on("--container ID", String, "Required container") do |val|
+        container_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Remove all snapshots attached to an instances container." + "\n" +
+                    "[containerId] is required. This is the id of the container which removes all attached snapshots."
+    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)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove all snapshots for a container?", options)
+        exit 1
+      end
+      options[:options]['instanceId'] = instance['id']
+      begin
+        container_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerId', 'type' => 'select', 'fieldLabel' => 'Container', 'optionSource' => 'instanceContainers', 'required' => true, 'description' => 'Select Container.'}], {}, @api_client, options[:options])
+        
+        if !container_prompt['containerId'].to_s.empty?
+          container_id = container_prompt['containerId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load instance containers"
+      end
+      
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.remove_all_container_snapshots(instance['id'], container_id, payload)
+        return
+      end
+      
+      json_response = @instances_interface.remove_all_container_snapshots(instance['id'], container_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshot delete initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_all_snapshots(args)
+    options = {}
+    instance = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Remove all snapshots attached to an instance." + "\n" +
+                    "Warning: This will remove all snapshots across all containers of an instance."
+    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)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove all snapshots for this instance?", options)
+        exit 1
+      end
+      options[:options]['instanceId'] = instance['id']
+
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.remove_all_instance_snapshots(instance['id'], payload)
+        return
+      end
+      
+      json_response = @instances_interface.remove_all_instance_snapshots(instance['id'], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshots attaced to instance #{instance['name']} queued for deletion."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def create_linked_clone(args)
+    options = {}
+    instance = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      opts.on("--snapshot ID", String, "Optional snapshot") do |val|
+        snapshot_id = val
+      end
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Create a linked clone using the selected snapshot of an Instance." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot which the clone will refer to."
+    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)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      options[:options]['instanceId'] = instance['id']
+      begin
+        snapshot_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'snapshotId', 'type' => 'select', 'fieldLabel' => 'Snapshot', 'optionSource' => 'instanceSnapshots', 'required' => true, 'description' => 'Select Snapshot.'}], {}, @api_client, options[:options])
+      
+        if !snapshot_prompt['snapshotId'].to_s.empty?
+          snapshot_id = snapshot_prompt['snapshotId']
+        end
+      rescue RestClient::Exception => e
+        puts "Failed to load instance snapshots"
+      end
+      
+      @instances_interface.setopts(options)
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.create_linked_clone(instance['id'], snapshot_id, payload)
+        return
+      end
+      
+      json_response = @instances_interface.create_linked_clone(instance['id'], snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Linked Clone creation initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
 
   def scaling(args)
     options = {}
@@ -4126,6 +4358,9 @@ EOT
       opts.on( '--name VALUE', String, "Image Name (Template Name). Default is server name + timestamp" ) do |val|
         options[:options]['templateName'] = val
       end
+      opts.on( '--folder VALUE', String, "Folder externalId or '/' to use the root folder" ) do |val|
+        options[:options]['zoneFolder'] = val
+      end
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Clone to image (template) for an instance
@@ -4137,6 +4372,18 @@ EOT
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
     return 1 if instance.nil?
+    # need to GET provision type for hasFolders
+    provision_type_code = instance['layout']['provisionTypeCode'] rescue nil
+    provision_type = nil
+    if provision_type_code
+      provision_type = provision_types_interface.list({code:provision_type_code})['provisionTypes'][0]
+      if provision_type.nil?
+        print_red_alert "Provision Type not found by code #{provision_type_code}"
+        exit 1
+      end
+    else
+      provision_type = get_provision_type_for_zone_type(cloud['zoneType']['id'])
+    end
     payload = {}
     if options[:payload]
       payload = options[:payload]
@@ -4149,6 +4396,15 @@ EOT
           payload['templateName'] = v_prompt['templateName']
         end
       end
+      #if instance['layout']['provisionTypeCode'] == 'vmware'
+      if provision_type && provision_type["hasFolders"]
+        if payload['zoneFolder'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
+          if v_prompt['zoneFolder'].to_s != ''
+            payload['zoneFolder'] = v_prompt['zoneFolder']
+          end
+        end
+      end
     end
     @instances_interface.setopts(options)
     if options[:dry_run]
@@ -4230,6 +4486,106 @@ EOT
     return 0, nil
   end
 
+  def refresh(args)
+    params, payload, options = {}, {}, {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [options]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Refresh an instance.
+[instance] is required. This is the name or id of an instance.
+This is only supported by certain types of instances such as terraform.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      return 1 if instance.nil?
+      # construct request
+      params.merge!(parse_query_options(options))
+      payload = {}
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!(parse_passed_options(options))
+      else
+        payload.deep_merge!(parse_passed_options(options))
+        # raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
+      end
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to refresh this instance: #{instance['name']}?")
+        return 9, "aborted command"
+      end
+      @instances_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.refresh(instance["id"], params, payload)
+        return
+      end
+      json_response = @instances_interface.refresh(instance["id"], params, payload)
+      render_response(json_response, options) do
+        print_green_success "Refreshing instance #{instance['name']}"
+        # return _get(instance['id'], options)
+      end
+      return 0, nil
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def apply(args)
+    params, payload, options = {}, {}, {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [options]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Apply an instance.
+[instance] is required. This is the name or id of an instance.
+This is only supported by certain types of instances such as terraform.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      return 1 if instance.nil?
+      # construct request
+      params.merge!(parse_query_options(options))
+      payload = {}
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!(parse_passed_options(options))
+      else
+        payload.deep_merge!(parse_passed_options(options))
+        # raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
+      end
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to apply this instance: #{instance['name']}?")
+        return 9, "aborted command"
+      end
+      @instances_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.apply(instance["id"], params, payload)
+        return
+      end
+      json_response = @instances_interface.apply(instance["id"], params, payload)
+      render_response(json_response, options) do
+        print_green_success "Applying instance #{instance['name']}"
+        # return _get(instance['id'], options)
+      end
+      return 0, nil
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  # todo: print state summary
+  def state_summary(args)
+  end
+
 private
 
   def find_zone_by_name_or_id(group_id, val)

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

@@ -1122,19 +1122,8 @@ EOT
 
   def add_integration_object_option_types
     [
-      {'code' => 'integrationObject.type', 'shorthand' => '-t', 'switch' => 'type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'optionSource' => 'integrationObjectTypes', 'required' => true, 'description' => "Integration Object Type eg. cloud, layout, blueprint, catalog", 'displayOrder' => 1},
+      {'code' => 'integrationObject.type', 'shorthand' => '-t', 'switch' => 'type', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'optionSource' => 'integrationObjectTypes', 'required' => true, 'description' => "Integration Object Type eg. catalog", 'displayOrder' => 1},
       # {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => false, 'description' => 'Display Name of the integration object, default is the name of the referenced object', 'displayOrder' => 2},
-      {'dependsOnCode' => 'integrationObject.type:cloud', 'switch' => 'group', 'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'optionSource' => 'groups', 'required' => true, 'description' => 'Group', 'displayOrder' => 3},
-      {'dependsOnCode' => 'integrationObject.type:cloud', 'switch' => 'cloud', 'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'optionSource' => 'clouds', 'required' => true, 'description' => 'Cloud', 'displayOrder' => 4},
-      {'dependsOnCode' => 'integrationObject.type:layout', 'switch' => 'instance-type', 'fieldName' => 'instanceType', 'fieldLabel' => 'Instance Type', 'type' => 'select', 'optionSource' => 'instanceTypes', 'required' => true, 'description' => 'Instance Type', 'displayOrder' => 5},
-      {'dependsOnCode' => 'integrationObject.type:layout', 'switch' => 'technology', 'fieldName' => 'zoneType', 'fieldLabel' => 'Cloud Type', 'type' => 'select', 'optionSource' => 'zoneTypes', 'required' => true, 'description' => 'Cloud Type (Technology)', 'displayOrder' => 5},
-      {'dependsOnCode' => 'integrationObject.type:layout', 'switch' => 'layout', 'fieldName' => 'layout', 'fieldLabel' => 'Layout', 'type' => 'select', 'optionSource' => 'layouts', 'required' => true, 'description' => 'Layout', 'displayOrder' => 6},
-      {'dependsOnCode' => 'integrationObject.type:blueprint', 'fieldName' => 'name', 'fieldLabel' => 'Catalog Item Name', 'type' => 'text', 'required' => true, 'description' => 'Display Name of the integration object', 'displayOrder' => 7},
-      {'dependsOnCode' => 'integrationObject.type:blueprint', 'switch' => 'blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'required' => true, 'description' => 'Blueprint', 'displayOrder' => 8, 'noParams' => true},
-      {'dependsOnCode' => 'integrationObject.type:blueprint', 'switch' => 'group', 'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'optionSource' => 'groups', 'required' => true, 'description' => 'Group', 'displayOrder' => 9},
-      {'dependsOnCode' => 'integrationObject.type:blueprint', 'switch' => 'default-cloud', 'fieldName' => 'defaultCloud', 'fieldLabel' => 'Default Cloud', 'type' => 'select', 'optionSource' => 'clouds', 'required' => false, 'description' => 'Default Cloud', 'displayOrder' => 10},
-      {'dependsOnCode' => 'integrationObject.type:blueprint', 'switch' => 'environment', 'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'optionSource' => 'environments', 'required' => false, 'description' => 'Environment', 'displayOrder' => 11},
-      {'dependsOnCode' => 'integrationObject.type:blueprint', 'switch' => 'config', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'required' => true, 'description' => 'Config JSON', 'displayOrder' => 12},
       {'dependsOnCode' => 'integrationObject.type:catalog', 'switch' => 'catalog', 'fieldName' => 'catalog', 'fieldLabel' => 'Catalog Item', 'type' => 'select', 'optionSource' => 'catalogItemTypes', 'required' => true, 'description' => 'Catalog Item', 'displayOrder' => 13},
     ]
   end

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

@@ -39,6 +39,9 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.on('--technology VALUE', String, "Filter by technology") do |val|
         params['provisionTypeCode'] = val
       end
+      opts.on('--featured [true|false]',String, "Filter by featured.") do |val|
+        params['featured'] = (val.to_s.downcase != 'false' && val.to_s.downcase != 'off')
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List instance types."
     end

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

@@ -0,0 +1,70 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::LoadBalancerMonitors
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::SecondaryRestCommand
+  include Morpheus::Cli::LoadBalancersHelper
+
+  set_command_description "View and manage load balancer monitors."
+  set_command_name :'load-balancer-monitors'
+  register_subcommands :list, :get, :add, :update, :remove
+  register_interfaces :load_balancer_monitors,
+                      :load_balancers, :load_balancer_types
+
+  set_rest_parent_name :load_balancers
+
+  # set_rest_interface_name :load_balancer_monitors
+  # set_parent_rest_interface_name :load_balancers
+  
+  # todo: a configurable way to load the optionTypes
+  # option_types = loadBalancer['monitorOptionTypes']
+  # set_rest_has_type true
+  # set_rest_type :load_balancer_virtual_server_types
+
+  protected
+
+  def load_balancer_monitor_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Monitor Type" => lambda {|it| it['monitorTypeDisplay'] || it['monitorType'] },
+    }
+  end
+
+  def load_balancer_monitor_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Load Balancer" => lambda {|it| it['loadBalancer'] ? it['loadBalancer']['name'] : '' },
+      "Description" => 'description',
+      "Monitor Type" => lambda {|it| it['monitorTypeDisplay'] || it['monitorType'] },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  def load_balancer_monitor_object_key
+    'loadBalancerMonitor'
+  end
+
+  def load_balancer_monitor_list_key
+    'loadBalancerMonitors'
+  end
+
+  def load_balancer_monitor_label
+    'Load Balancer Monitor'
+  end
+
+  def load_balancer_monitor_label_plural
+    'Load Balancer Monitors'
+  end
+
+  def load_option_types_for_load_balancer_monitor(type_record, parent_record)
+    load_balancer = parent_record
+    load_balancer_type_id = load_balancer['type']['id']
+    load_balancer_type = find_by_id(:load_balancer_type, load_balancer_type_id)
+    load_balancer_type['monitorOptionTypes']
+  end
+
+end