morpheus-cli 5.3.2.2 → 5.4.0

data/lib/morpheus/cli/{instances.rb → commands/instances.rb}

@@ -1,7 +1,3 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Instances
@@ -15,9 +11,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 +441,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 +459,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 +492,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"]} } })
+      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
-
-      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
-        end
-      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]
+        payload.deep_merge!({"instance" => {"type" => instance_type["code"] } })
+        payload.deep_merge!({"instance" => {"instanceType" => {"code" => instance_type["code"]} } })
       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)
@@ -1373,7 +1361,6 @@ class Morpheus::Cli::Instances
         "Status" => lambda {|it| format_instance_status(it) }
       }
       description_cols.delete("Labels") if labels.nil? || labels.empty?
-      description_cols.delete("Tags") if tags.nil? || tags.empty?
       description_cols.delete("Apps") if instance['apps'].nil? || instance['apps'].empty?
       description_cols.delete("Power Schedule") if instance['powerSchedule'].nil?
       description_cols.delete("Expire Date") if instance['expireDate'].nil?
@@ -1702,19 +1689,77 @@ class Morpheus::Cli::Instances
     options = {:options => {}}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance] -g GROUP")
-      opts.on('--name VALUE', String, "Name") do |val|
-        options[:options]['name'] = val
-      end
       opts.on( '-g', '--group GROUP', "Group Name or ID for the new instance" ) do |val|
         options[:group] = val
       end
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID for the new instance" ) do |val|
         options[:cloud] = val
       end
+      opts.on('--name VALUE', String, "Name") do |val|
+        options[:options]['name'] = val
+      end
+      opts.on("--description [TEXT]", String, "Description") do |val|
+        options[:description] = val.to_s
+      end
+      opts.on("--environment ENV", String, "Environment code") do |val|
+        options[:environment] = val.to_s
+      end
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.add_hidden_option('--metadata')
+      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        options[:labels] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      end
+      # opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
+      #   options[:copies] = val.to_i
+      # end
+      # opts.on("--layout-size NUMBER", Integer, "Apply a multiply factor of containers/vms within the instance") do |val|
+      #   options[:layout_size] = val.to_i
+      # end
+      # opts.on( '-l', '--layout LAYOUT', "Layout ID" ) do |val|
+      #   options[:layout] = val
+      # end
+      opts.on( '-p', '--plan PLAN', "Service plan ID") do |val|
+        options[:service_plan] = val
+      end
+      opts.on( '--resource-pool ID', String, "Resource pool ID" ) do |val|
+        options[:resource_pool] = val
+      end
+      opts.on("--workflow ID", String, "Automation: Workflow ID") do |val|
+        options[:workflow_id] = val
+      end
+      opts.on("--ports ARRAY", String, "Exposed Ports, JSON formatted list of objects containing name and port") do |val|
+        # expects format like --ports '[{"name":"web","port":8080}]'
+        ports_array = JSON.parse(val)
+        options[:ports] = ports_array
+        options[:options]['ports'] = ports_array
+      end
+      # opts.on('-L', "--lb", "Enable Load Balancer") do
+      #   options[:enable_load_balancer] = true
+      # end
       opts.on("--create-user on|off", String, "User Config: Create Your User. Default is on") do |val|
         options[:create_user] = !['false','off','0'].include?(val.to_s)
       end
-      build_common_options(opts, options, [:options, :payload, :auto_confirm, :json, :dry_run, :remote])
+      opts.on("--user-group USERGROUP", String, "User Config: User Group") do |val|
+        options[:user_group_id] = val
+      end
+      opts.on("--shutdown-days DAYS", Integer, "Automation: Shutdown Days") do |val|
+        options[:shutdown_days] = val.to_i
+      end
+      opts.on("--expire-days DAYS", Integer, "Automation: Expiration Days") do |val|
+        options[:expire_days] = val.to_i
+      end
+      opts.on("--create-backup [on|off]", String, "Automation: Create Backups.") do |val|
+        options[:create_backup] = ['on','true','1',''].include?(val.to_s.downcase) ? 'on' : 'off'
+      end
+      opts.on("--security-groups LIST", String, "Security Groups, comma separated list of security group IDs") do |val|
+        options[:security_groups] = val.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
+      end
+      build_standard_post_options(opts, options, [:auto_confirm])
     end
     optparse.parse!(args)
     if args.count < 1 || args.count > 2
@@ -1732,12 +1777,20 @@ class Morpheus::Cli::Instances
 
       # defaults derived from clone
       options[:default_name] = instance['name'] + '-clone' if instance['name']
+      options[:default_description] = instance['description'] if !instance['description'].to_s.empty?
+      options[:default_environment] = instance['environment'] if instance['environment']
       options[:default_group] = instance['group']['id'] if instance['group']
       options[:default_cloud] = instance['cloud']['name'] if instance['cloud']
       options[:default_plan] = instance['plan']['name'] if instance['plan']
       options[:default_resource_pool] = instance['config']['resourcePoolId'] if instance['config']
       options[:default_config] = instance['config']
       options[:default_security_group] = instance['config']['securityGroups'][0]['id'] if instance['config'] && (instance['config']['securityGroups'] || []).count > 0
+      if instance['labels'] && !instance['labels'].empty?
+        options[:default_labels] = (instance['labels'] || []).join(',')
+      end
+      if instance['tags'] && !instance['tags'].empty?
+        options[:current_tags] = instance['tags']
+      end
 
       # immutable derived from clone
       options[:instance_type_code] = instance['instanceType']['code'] if instance['instanceType']
@@ -1775,13 +1828,52 @@ class Morpheus::Cli::Instances
         payload.deep_merge!(passed_options)
       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
+      if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
+        payload[:layoutSize] = options[:layout_size]
+      end
+      if !options[:create_backup].nil?
+        payload[:createBackup] = options[:create_backup]
+      end
+      if options[:expire_days]
+        payload['instance'] ||= {}
+        payload['instance']['expireDays'] = options[:expire_days]
+      end
+      if options[:shutdown_days]
+        payload['instance'] ||= {}
+        payload['shutdownDays'] = options[:shutdown_days]
+      end
       # JD: this actually fixed a customer problem
       # It appears to be important to pass this... not sure if config.createUser is necessary...
       if options[:create_user].nil?
         options[:create_user] = true
       end
-      if options[:create_user] != nil
-        payload.deep_merge!({'createUser' => options[:create_user], 'config' =>{'createUser' => options[:create_user]}})
+      if options.key?(:create_user)
+        payload['config'] ||= {}
+        payload['config']['createUser'] = options[:create_user]
+        payload['createUser'] = options[:create_user]
+      end
+      if options[:user_group_id]
+        payload['instance'] ||= {}
+        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
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to clone the instance #{instance['name']} as '#{payload['name']}'?", options)
         return 9, "aborted command"
@@ -1931,7 +2023,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 +2151,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 +2219,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 +2325,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 +2453,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 +2877,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 +3833,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 +3933,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" +