morpheus-cli 5.3.2.3 → 5.3.3

data/lib/morpheus/cli/clusters.rb

@@ -564,13 +564,10 @@ class Morpheus::Cli::Clusters
 
         cluster_payload['layout'] = {id: layout['id']}
 
-        # Plan
+        # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
-        service_plan = prompt_service_plan(cloud['id'], provision_type, options)
 
-        if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
-        end
+        api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], 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']
@@ -581,22 +578,47 @@ class Morpheus::Cli::Clusters
           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_provision_type && resource_pool = prompt_resource_pool(group, cloud, service_plan, controller_provision_type, options)
-              server_payload['config']['resourcePool'] = resource_pool['externalId']
+          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
+            server_payload['config']['resourcePoolId'] = resource_pool['id']
+            api_params['config'] ||= {}
+            api_params['config']['resourcePool'] = resource_pool['id']
+            api_params['resourcePoolId'] = resource_pool['id']
+            api_params['zonePoolId'] = resource_pool['id']
           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'], 'options' => prompt_service_plan_options(service_plan, 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, {zoneId: cloud['id'], siteId: group['id']})
+        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
 
         if !volumes.empty?
           server_payload['volumes'] = volumes
         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'] }
+
+        # 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))
+          api_params.deep_merge!(server_payload)
+          api_params.deep_merge!(server_payload['config'])
+          option_type_list = option_type_list.reject {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
+        end
+
         # Networks
         # NOTE: You must choose subnets in the same availability zone
         if controller_provision_type && controller_provision_type['hasNetworks'] && cloud['zoneType']['code'] != 'esxi'
-          server_payload['networkInterfaces'] = options[:networkInterfaces] || prompt_network_interfaces(cloud['id'], provision_type['id'], (resource_pool['id'] rescue nil), options)
+          server_payload['networkInterfaces'] = options[:networkInterfaces] || prompt_network_interfaces(cloud['id'], provision_type['id'], (resource_pool['id'] rescue nil), options.merge({:api_params => api_params}))
         end
 
         # Security Groups
@@ -605,15 +627,11 @@ 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'])
 
-        # 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'] }
-
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id']}))
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @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['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count}], options[:options], @api_client, {}, options[:no_prompt])["nodeCount"]
+        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']
 
         # Create User
         if !options[:createUser].nil?
@@ -629,7 +647,7 @@ class Morpheus::Cli::Clusters
         if userGroup
           server_payload['userGroup'] = userGroup
         elsif !options[:no_prompt]
-          userGroupId = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'userGroupId', 'fieldLabel' => 'User Group', 'type' => 'select', 'required' => false, 'optionSource' => 'userGroups'}], options[:options], @api_client, {})['userGroupId']
+          userGroupId = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'userGroupId', 'fieldLabel' => 'User Group', 'type' => 'select', 'required' => false, 'optionSource' => 'userGroups'}], options[:options], @api_client, api_params)['userGroupId']
 
           if userGroupId
             server_payload['userGroup'] = {'id' => userGroupId}
@@ -637,11 +655,11 @@ class Morpheus::Cli::Clusters
         end
 
         # 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, {})['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)['hostname']
+        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']
 
         # 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, {'phase' => 'postProvision'})['taskSet']
+        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}
@@ -1147,20 +1165,20 @@ class Morpheus::Cli::Clusters
           cloud_id = (default_cloud && cloud_id == default_cloud['name']) ? default_cloud['value'] : cloud_id
         end
 
+        # resources (zone pools)
+        cloud = @clouds_interface.get(cloud_id)['zone']
+        cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
+        group = @groups_interface.get(cluster['site']['id'])['group']
+
         server_payload['cloud'] = {'id' => cloud_id}
-        service_plan = prompt_service_plan(cloud_id, server_type['provisionType'], options)
+        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)}
         end
 
-        # resources (zone pools)
-        cloud = @clouds_interface.get(cloud_id)['zone']
-        cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
-        group = @groups_interface.get(cluster['site']['id'])['group']
-
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)
-          server_payload['config']['resourcePool'] = resource_pool['externalId']
+          server_payload['config']['resourcePoolId'] = resource_pool['id']
         end
 
         # Multi-disk / prompt for volumes
@@ -1181,7 +1199,7 @@ class Morpheus::Cli::Clusters
         server_payload['securityGroups'] = prompt_security_groups_by_cloud(cloud, provision_type, resource_pool, options)
 
         # Worker count
-        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 1})['nodeCount'] : 1
         server_payload['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count}], options[:options], @api_client, {}, options[:no_prompt])["nodeCount"]
 
         # Options / Custom Config
@@ -3635,8 +3653,8 @@ class Morpheus::Cli::Clusters
     @server_types_interface.get(val)['serverType']
   end
 
-  def service_plans_for_dropdown(zone_id, provision_type_id)
-    @servers_interface.service_plans({zoneId: zone_id, provisionTypeId: provision_type_id})['plans'] rescue []
+  def service_plans_for_dropdown(api_params)
+    @servers_interface.service_plans(api_params)['plans'] rescue []
   end
 
   def namespace_service_plans
@@ -3679,10 +3697,10 @@ class Morpheus::Cli::Clusters
     @groups_interface.get(group_id)['group']
   end
 
-  def prompt_service_plan(zone_id, provision_type, options)
-    available_service_plans = service_plans_for_dropdown(zone_id, provision_type['id'])
+  def prompt_service_plan(api_params, options)
+    available_service_plans = service_plans_for_dropdown(api_params)
     if available_service_plans.empty?
-      print_red_alert "Cloud #{zone_id} has no available plans"
+      print_red_alert "Cloud #{api_params['zoneId']} has no available plans"
       exit 1
     end
     if options[:servicePlan]
@@ -3853,7 +3871,7 @@ class Morpheus::Cli::Clusters
         resource_pool = options[:resourcePool] ? find_cloud_resource_pool_by_name_or_id(cloud['id'], options[:resourcePool]) : nil
 
         if !resource_pool
-          resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id'], planId: (service_plan['id'] rescue nil)})['data'].reject { |it| it['id'].nil? && it['name'].nil? }
+          resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
 
           if resource_pool_options.empty?
             print_red_alert "Cloud #{cloud['name']} has no available resource pools"

data/lib/morpheus/cli/instances.rb

@@ -15,9 +15,10 @@ class Morpheus::Cli::Instances
 
   set_command_name :instances
   set_command_description "View and manage instances."
-  register_subcommands :list, :count, :get, :view, :add, :update, :remove, :cancel_removal, :logs, 
+  register_subcommands :list, :count, :get, :view, :add, :update, :remove, 
+                       :cancel_removal, :cancel_expiration, :cancel_shutdown, :extend_expiration, :extend_shutdown,
                        :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, 
-                       :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
+                       :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,
@@ -444,7 +445,7 @@ class Morpheus::Cli::Instances
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
       end
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      build_standard_add_options(opts, options) #, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create a new instance." + "\n" +
                     "[name] is required. This is the new instance name." + "\n" +
                     "The available options vary by --type."
@@ -462,33 +463,30 @@ class Morpheus::Cli::Instances
       options[:instance_name] = args[0]
     end
 
-    begin
-      payload = nil
-      if options[:payload]
-        payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        # obviously should support every option that prompt supports on top of -- payload as well
-        # group, cloud and type for now
-        # todo: also support :layout, service_plan, :resource_pool, etc.
-        group = nil
-        if options[:group]
-          group = find_group_by_name_or_id_for_provisioning(options[:group])
-          if group.nil?
-            return 1, "group not found by #{options[:group]}"
-          end
-          #payload["siteId"] = group["id"]
-          payload.deep_merge!({"instance" => {"site" => {"id" => group["id"]} } })
+    if options[:payload]
+      payload = options[:payload]
+      # support -O OPTION switch on top of --payload
+      payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      # obviously should support every option that prompt supports on top of -- payload as well
+      # group, cloud and type for now
+      # todo: also support :layout, service_plan, :resource_pool, etc.
+      group = nil
+      if options[:group]
+        group = find_group_by_name_or_id_for_provisioning(options[:group])
+        if group.nil?
+          return 1, "group not found by #{options[:group]}"
         end
-        if options[:cloud]
-          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
-          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
-          if cloud.nil?
-            return 1, "cloud not found by #{options[:cloud]}"
-          end
-          payload["zoneId"] = cloud["id"]
-          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        payload.deep_merge!({"instance" => {"site" => {"id" => group["id"]} } })
+      end
+      if options[:cloud]
+        group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+        cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+        if cloud.nil?
+          return 1, "cloud not found by #{options[:cloud]}"
         end
+        payload["zoneId"] = cloud["id"]
+        payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+      end
         if options[:cloud]
           group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
           cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
@@ -498,96 +496,90 @@ class Morpheus::Cli::Instances
           payload["zoneId"] = cloud["id"]
           payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
         end
-        if options[:instance_type_code]
-          # should just use find_instance_type_by_name_or_id
-          # note that the api actually will match name name or code
-          instance_type = (options[:instance_type_code].to_s =~ /\A\d{1,}\Z/) ? find_instance_type_by_id(options[:instance_type_code]) : find_instance_type_by_code(options[:instance_type_code])
-          if instance_type.nil?
-            return 1, "instance type not found by #{options[:cloud]}"
-          end
-          payload.deep_merge!({"instance" => {"type" => instance_type["code"] } })
-          payload.deep_merge!({"instance" => {"instanceType" => {"code" => instance_type["code"]} } })
-        end
-
-      else
-        # use active group by default
-        options[:group] ||= @active_group_id
-        options[:select_datastore] = true
-        options[:name_required] = true
-        # prompt for all the instance configuration options
-        # this provisioning helper method handles all (most) of the parsing and prompting
-        # and it relies on the method to exit non-zero on error, like a bad CLOUD or TYPE value
-        payload = prompt_new_instance(options)
-        # clean payload of empty objects 
-        # note: this is temporary and should be fixed upstream in OptionTypes.prompt()
-        if payload['instance'].is_a?(Hash)
-          payload['instance'].keys.each do |k|
-            v = payload['instance'][k]
-            payload['instance'].delete(k) if v.is_a?(Hash) && v.empty?
-          end
-        end
-        if payload['config'].is_a?(Hash)
-          payload['config'].keys.each do |k|
-            v = payload['config'][k]
-            payload['config'].delete(k) if v.is_a?(Hash) && v.empty?
-          end
+      if options[:instance_type_code]
+        # should just use find_instance_type_by_name_or_id
+        # note that the api actually will match name name or code
+        instance_type = (options[:instance_type_code].to_s =~ /\A\d{1,}\Z/) ? find_instance_type_by_id(options[:instance_type_code]) : find_instance_type_by_code(options[:instance_type_code])
+        if instance_type.nil?
+          return 1, "instance type not found by #{options[:cloud]}"
         end
+        payload.deep_merge!({"instance" => {"type" => instance_type["code"] } })
+        payload.deep_merge!({"instance" => {"instanceType" => {"code" => instance_type["code"]} } })
       end
-      payload['instance'] ||= {}
-      if options[:instance_name]
-        payload['instance']['name'] = options[:instance_name]
-      end
-      if options[:description] && !payload['instance']['description']
-        payload['instance']['description'] = options[:description]
-      end
-      if options[:environment] && !payload['instance']['instanceContext']
-        payload['instance']['instanceContext'] = options[:environment]
-      end
-      payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
-      payload[:layoutSize] = options[:layout_size] if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
-      payload[:createBackup] = options[:create_backup] if !options[:create_backup].nil?
-      payload['instance']['expireDays'] = options[:expire_days] if options[:expire_days]
-      payload['instance']['shutdownDays'] = options[:shutdown_days] if options[:shutdown_days]
-      if options.key?(:create_user)
-        payload['config'] ||= {}
-        payload['config']['createUser'] = options[:create_user]
-      end
-      if options[:user_group_id]
-        payload['instance']['userGroup'] = {'id' => options[:user_group_id] }
-      end
-      if options[:workflow_id]
-        if options[:workflow_id].to_s =~ /\A\d{1,}\Z/
-          payload['taskSetId'] = options[:workflow_id].to_i
-        else
-          payload['taskSetName'] = options[:workflow_id]
+    else
+      # use active group by default
+      options[:group] ||= @active_group_id
+      options[:select_datastore] = true
+      options[:name_required] = true
+      # prompt for all the instance configuration options
+      # this provisioning helper method handles all (most) of the parsing and prompting
+      # and it relies on the method to exit non-zero on error, like a bad CLOUD or TYPE value
+      payload = prompt_new_instance(options)
+      # clean payload of empty objects
+      # note: this is temporary and should be fixed upstream in OptionTypes.prompt()
+      if payload['instance'].is_a?(Hash)
+        payload['instance'].keys.each do |k|
+          v = payload['instance'][k]
+          payload['instance'].delete(k) if v.is_a?(Hash) && v.empty?
         end
       end
-      if options[:enable_load_balancer]
-        lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
-        payload.deep_merge!(lb_payload)
-      end
-      @instances_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @instances_interface.dry.create(payload)
-        return 0
+      if payload['config'].is_a?(Hash)
+        payload['config'].keys.each do |k|
+          v = payload['config'][k]
+          payload['config'].delete(k) if v.is_a?(Hash) && v.empty?
+        end
       end
+    end
 
-      json_response = @instances_interface.create(payload)
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        instance_id = json_response["instance"]["id"]
-        instance_name = json_response["instance"]["name"]
-        print_green_success "Provisioning instance [#{instance_id}] #{instance_name}"
-        # print details
-        get_args = [instance_id] + (options[:remote] ? ["-r",options[:remote]] : []) + (options[:refresh_interval] ? ['--refresh', options[:refresh_interval].to_s] : [])
-        get(get_args)
+    payload['instance'] ||= {}
+    if options[:instance_name]
+      payload['instance']['name'] = options[:instance_name]
+    end
+    if options[:description] && !payload['instance']['description']
+      payload['instance']['description'] = options[:description]
+    end
+    if options[:environment] && !payload['instance']['instanceContext']
+      payload['instance']['instanceContext'] = options[:environment]
+    end
+    payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
+    payload[:layoutSize] = options[:layout_size] if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
+    payload[:createBackup] = options[:create_backup] if !options[:create_backup].nil?
+    payload['instance']['expireDays'] = options[:expire_days] if options[:expire_days]
+    payload['instance']['shutdownDays'] = options[:shutdown_days] if options[:shutdown_days]
+    if options.key?(:create_user)
+      payload['config'] ||= {}
+      payload['config']['createUser'] = options[:create_user]
+    end
+    if options[:user_group_id]
+      payload['instance']['userGroup'] = {'id' => options[:user_group_id] }
+    end
+    if options[:workflow_id]
+      if options[:workflow_id].to_s =~ /\A\d{1,}\Z/
+        payload['taskSetId'] = options[:workflow_id].to_i
+      else
+        payload['taskSetName'] = options[:workflow_id]
       end
+    end
+    if options[:enable_load_balancer]
+      lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
+      payload.deep_merge!(lb_payload)
+    end
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.create(payload)
       return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+
+    json_response = @instances_interface.create(payload)
+    render_response(json_response, options, "instance") do
+      instance_id = json_response["instance"]["id"]
+      instance_name = json_response["instance"]["name"]
+      print_green_success "Provisioning instance [#{instance_id}] #{instance_name}"
+      # print details
+      get_args = [instance_id] + (options[:remote] ? ["-r",options[:remote]] : []) + (options[:refresh_interval] ? ['--refresh', options[:refresh_interval].to_s] : [])
+      get(get_args)
+    end
+    return 0, nil
   end
 
   def update(args)
@@ -1931,7 +1923,7 @@ class Morpheus::Cli::Instances
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
+      opts.add_hidden_option('--muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Stop an instance.\n" +
                     "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
@@ -2059,7 +2051,7 @@ class Morpheus::Cli::Instances
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
+      opts.add_hidden_option('--muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Restart an instance.\n" +
                     "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
@@ -2127,7 +2119,7 @@ class Morpheus::Cli::Instances
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.add_hidden_option('muteMonitoring')
+      opts.add_hidden_option('--muteMonitoring')
       opts.on('--server [on|off]', String, "Suspend instance server. Default is off.") do |val|
         params['server'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
@@ -2233,7 +2225,7 @@ class Morpheus::Cli::Instances
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
+      opts.add_hidden_option('--muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Stop service on an instance.\n" +
                     "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
@@ -2361,7 +2353,7 @@ class Morpheus::Cli::Instances
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.add_hidden_option('muteMonitoring')
+      opts.add_hidden_option('--muteMonitoring')
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Restart service on an instance.\n" +
                     "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
@@ -2785,34 +2777,158 @@ EOT
 
   def cancel_removal(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Cancel removal of an instance.
+This is a way to undo delete of an instance still pending removal.
+[instance] is required. This is the name or id of an instance
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    payload = options[:payload] || {}
+    payload.deep_merge!(parse_passed_options(options))
+    instance = find_instance_by_name_or_id(args[0])
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.cancel_removal(instance['id'], params, payload)
+      return
+    end
+    json_response = @instances_interface.cancel_removal(instance['id'], params, payload)
+    render_response(json_response, options) do
+      print_green_success "Canceled removal for instance #{instance['name']} ..."
+      get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+    end
+    return 0, nil
+  end
+
+  def cancel_expiration(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      build_standard_update_options(opts, options, [:query]) # query params instead of p
+      opts.footer = <<-EOT
+Cancel expiration of an instance.
+[instance] is required. This is the name or id of an instance
+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])
-      @instances_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @instances_interface.dry.cancel_removal(instance['id'])
-        return
-      end
-      json_response = @instances_interface.cancel_removal(instance['id'])
-      if options[:json]
-        print as_json(json_response, options), "\n"
-        return
-      elsif !options[:quiet]
-        get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    params.merge!(parse_query_options(options))
+    payload = options[:payload] || {}
+    payload.deep_merge!(parse_passed_options(options))
+    instance = find_instance_by_name_or_id(args[0])
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.cancel_expiration(instance['id'], params, payload)
+      return
     end
+    json_response = @instances_interface.cancel_expiration(instance['id'], params, payload)
+    render_response(json_response, options) do
+      print_green_success "Canceled expiration for instance #{instance['name']} ..."
+      get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+    end
+    return 0, nil
+  end
+
+  def cancel_shutdown(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      build_standard_update_options(opts, options, [:query]) # query params instead of p
+      opts.footer = <<-EOT
+Cancel shutdown for an instance.
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    payload = options[:payload] || {}
+    payload.deep_merge!(parse_passed_options(options))
+    instance = find_instance_by_name_or_id(args[0])
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.cancel_shutdown(instance['id'], params, payload)
+      return
+    end
+    json_response = @instances_interface.cancel_shutdown(instance['id'], params, payload)
+    render_response(json_response, options) do
+      print_green_success "Canceled shutdown for instance #{instance['name']} ..."
+      get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+    end
+    return 0, nil
+  end
+
+  def extend_expiration(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      build_standard_update_options(opts, options, [:query]) # query params instead of p
+      opts.footer = <<-EOT
+Extend expiration for an instance.
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    payload = options[:payload] || {}
+    payload.deep_merge!(parse_passed_options(options))
+    instance = find_instance_by_name_or_id(args[0])
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.extend_expiration(instance['id'], params, payload)
+      return
+    end
+    json_response = @instances_interface.extend_expiration(instance['id'], params, payload)
+    render_response(json_response, options) do
+      print_green_success "Extended expiration for instance #{instance['name']} ..."
+      get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+    end
+    return 0, nil
+  end
+
+  def extend_shutdown(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      build_standard_update_options(opts, options, [:query]) # query params instead of p
+      opts.footer = <<-EOT
+Extend shutdown for an instance.
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    payload = options[:payload] || {}
+    payload.deep_merge!(parse_passed_options(options))
+    instance = find_instance_by_name_or_id(args[0])
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.extend_shutdown(instance['id'], params, payload)
+      return
+    end
+    json_response = @instances_interface.extend_shutdown(instance['id'], params, payload)
+    render_response(json_response, options) do
+      print_green_success "Extended shutdown for instance #{instance['name']} ..."
+      get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+    end
+    return 0, nil
   end
 
   def firewall_disable(args)
@@ -3617,7 +3733,7 @@ EOT
       opts.on('--process-id ID', String, "Display details about a specfic event." ) do |val|
         options[:process_id] = val
       end
-      opts.add_hidden_option('process-id')
+      opts.add_hidden_option('--process-id')
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Display history details for a specific process.\n" + 
                     "[instance] is required. This is the name or id of an instance.\n" +
@@ -3717,7 +3833,7 @@ EOT
       opts.on('--event-id ID', String, "Display details about a specfic event." ) do |val|
         options[:event_id] = val
       end
-      opts.add_hidden_option('event-id')
+      opts.add_hidden_option('--event-id')
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Display history details for a specific process event.\n" + 
                     "[instance] is required. This is the name or id of an instance.\n" +