morpheus-cli 5.4.2 → 5.4.3

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

@@ -17,7 +17,8 @@ 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,
@@ -52,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)
@@ -2718,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
@@ -3361,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 = {}
@@ -4133,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
@@ -4144,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]
@@ -4156,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]

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/network_static_routes_command.rb

@@ -149,6 +149,11 @@ class Morpheus::Cli::NetworkStaticRoutesCommand
       return 1
     end
 
+    if !network_type['hasStaticRoutes']
+      print_red_alert "Static routes not supported for #{network_type['name']}"
+      return 1
+    end
+
     payload = nil
     if options[:payload]
       payload = options[:payload]

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

@@ -189,7 +189,7 @@ class Morpheus::Cli::NetworksCommand
       print cyan
       description_cols = {
         "ID" => 'id',
-        "Name" => 'name',
+        "Name" => lambda {|it| it['displayName'] ? it['displayName'] : it['name'] },
         "Description" => 'description',
         "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : 'Shared' },
@@ -242,7 +242,7 @@ class Morpheus::Cli::NetworksCommand
         subnet_rows = subnets.collect { |subnet|
           {
             id: subnet['id'],
-            name: "  #{subnet['name']}",
+            name: "  #{subnet['displayName'] || subnet['name']}",
             # type: subnet['type'] ? subnet['type']['name'] : '',
             type: "Subnet",
             cloud: network['zone'] ? network['zone']['name'] : '',

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

@@ -106,14 +106,12 @@ EOT
         if json_response['applianceUrl']
           appliance[:appliance_url] = json_response['applianceUrl']
         end
-        # set status to ready if we have a version but no status yet for some reason
-        if appliance[:build_version] && appliance[:status].nil?
-          appliance[:status] = 'ready'
-        end
-        # update setupNeeded? 
+        # setupNeeded? 
         if json_response['setupNeeded'] == true
           # appliance[:setup_needed] = true
           appliance[:status] = 'fresh'
+        else
+          appliance[:status] = 'ready'
         end
         # if took_sec
         #   appliance[:last_check] ||= {}

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

@@ -511,7 +511,7 @@ class Morpheus::Cli::PoliciesCommand
           policy_type_option_types = policy_type['optionTypes']
           # puts "POLICY OPTION TYPES:\n #{policy_type_option_types.inspect}"
           if policy_type_option_types
-            config_prompt = Morpheus::Cli::OptionTypes.prompt(policy_type_option_types, options, @api_client)
+            config_prompt = Morpheus::Cli::OptionTypes.prompt(policy_type_option_types, options, @api_client, {}, false, true, true)
             # everything should be under fieldContext:'config'
             # payload['policy'].deep_merge!(config_prompt)
             if config_prompt['config']

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

@@ -69,6 +69,7 @@ class Morpheus::Cli::ProvisioningSettingsCommand
         "Hide Datastore Stats On Selection" => lambda {|it| format_boolean(it['hideDatastoreStats'])},
         "Cross-Tenant Naming Policies" => lambda {|it| format_boolean(it['crossTenantNamingPolicies'])},
         "Reuse Naming Sequence Numbers" => lambda {|it| format_boolean(it['reuseSequence'])},
+        "Show Console Keyboard Layout Settings" => lambda {|it| format_boolean(it['showConsoleKeyboardSettings'])},
         "Deployment Archive Store" => lambda {|it| it['deployStorageProvider'] ? it['deployStorageProvider']['name'] : nil},
         # Cloud-Init Settings
         "Cloud-Init Username" => lambda {|it| it['cloudInitUsername']},

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

@@ -102,7 +102,7 @@ EOT
           "URL" => lambda {|it| it[:url] || it[:host] },
           "Status" => lambda {|it| format_appliance_status(it, cyan) },
           "Version" => lambda {|it| it[:build_version] ? "#{it[:build_version]}" : '' },
-          "Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
+          #"Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
           "Secure" => lambda {|it| format_boolean(it[:insecure] != true && (it[:url] || it[:host]).to_s.include?("https")) },
           "Active" => lambda {|it| it[:active] ? "Yes " + format_is_current() : "No" },
           #"Authenticated" => lambda {|it| format_boolean it[:authenticated] },
@@ -336,7 +336,7 @@ EOT
       print cyan,"Added remote #{new_appliance_name}, status is #{format_appliance_status(appliance)}",reset,"\n"
     end
 
-    appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
+    #appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
     # if !options[:quiet]
     #   print cyan
     #   puts "Status: #{format_appliance_status(appliance)}"
@@ -390,7 +390,8 @@ EOT
         end
 
       end
-
+      # refresh to get buildVersion now that we are logged in
+      appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
     else
       #puts "Status is #{format_appliance_status(appliance)}"
     end
@@ -1278,7 +1279,7 @@ EOT
       "URL" => lambda {|it| it[:url] || it[:host] },
       #"Status" => lambda {|it| format_appliance_status(it, cyan) },
       "Version" => lambda {|it| it[:build_version] ? "#{it[:build_version]}" : '' },
-      "Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
+      #"Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
       "Secure" => lambda {|it| format_appliance_secure(it) },
       "Active" => lambda {|it| it[:active] ? "Yes " + format_is_current() : "No" },
       # "Active" => lambda {|it| format_boolean(it[:active]) },
@@ -1696,7 +1697,10 @@ EOT
         # wtf, no url...
         return appliance, json_response
       else
-        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: !appliance[:insecure], timeout: timeout})
+        # access token is needed for buildVersion
+        wallet = Morpheus::Cli::Credentials.new(app_name, appliance_url).load_saved_credentials()
+        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: !appliance[:insecure], timeout: timeout, 
+          access_token: (wallet && wallet['access_token']) ? wallet['access_token'] : nil})
         start_time = Time.now
         begin
           json_response = setup_interface.check(params)
@@ -1734,17 +1738,19 @@ EOT
         appliance[:last_check][:took] = (took_sec.to_f*1000).round
       end
       if json_response
-        if json_response.key?('applianceUrl')
-          appliance[:appliance_url] = json_response['applianceUrl']
-        end
-        if json_response.key?('buildVersion')
-          appliance[:build_version] = json_response['buildVersion']
+        # if json_response.key?('applianceUrl')
+        #   appliance[:appliance_url] = json_response['applianceUrl']
+        # end
+        if json_response['success'] == true
           appliance[:status] = 'ready'
           appliance[:last_check][:success] = true
           # consider bumping this after every successful api command
           appliance[:last_success_at] = Time.now.to_i
           appliance.delete(:error)
         end
+        if !json_response['buildVersion'].to_s.empty?
+          appliance[:build_version] = json_response['buildVersion']
+        end
         if json_response.key?('setupNeeded')
           if json_response['setupNeeded'] == true
             appliance[:setup_needed] = true

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

@@ -855,7 +855,7 @@ class Morpheus::Cli::SecurityGroups
 
         end
 
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sourceType', 'fieldLabel' => 'Source Type', 'type' => 'select', 'optionSource' => 'securityGroupSourceType', 'required' => true, 'defaultValue' => 'cidr'}], options[:options], @api_client)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sourceType', 'fieldLabel' => 'Source Type', 'type' => 'select', 'optionSource' => 'securityGroupSourceType', 'required' => true, 'defaultValue' => 'cidr'}], options[:options], @api_client, {'rule.securityGroupId': security_group['id'], 'securityGroupRule.direction': payload['rule']['direction']})
         payload['rule']['sourceType'] = v_prompt['sourceType'] unless v_prompt['sourceType'].nil?
 
         if payload['rule']['sourceType'] == 'cidr'
@@ -869,7 +869,7 @@ class Morpheus::Cli::SecurityGroups
           payload['rule']['sourceTier'] = {"id" => v_prompt['sourceTier']} unless v_prompt['sourceTier'].nil?
         end
 
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'destinationType', 'fieldLabel' => 'Destination Type', 'type' => 'select', 'optionSource' => 'securityGroupDestinationType', 'required' => true, 'defaultValue' => 'instance'}], options[:options], @api_client)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'destinationType', 'fieldLabel' => 'Destination Type', 'type' => 'select', 'optionSource' => 'securityGroupDestinationType', 'required' => true, 'defaultValue' => 'instance'}], options[:options], @api_client, {'rule.securityGroupId': security_group['id'], 'securityGroupRule.direction': payload['rule']['direction']})
         payload['rule']['destinationType'] = v_prompt['destinationType'] unless v_prompt['destinationType'].nil?
 
         if payload['rule']['destinationType'] == 'cidr'

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

@@ -575,7 +575,7 @@ class Morpheus::Cli::ServicePlanCommand
         options[:provisionType] = options[:provisionType] || (args.count > 1 ? args[1] : nil)
 
         if !options[:provisionType].nil?
-          provision_types = @service_plans_interface.provision_types()['provisionTypes']
+          provision_types = @service_plans_interface.provision_types({max: 10000})['provisionTypes']
           provision_type = provision_types.find {|it| it['name'] == options[:provisionType] || it['code'] == options[:provisionType] || it['id'] == options[:provisionType].to_i}
 
           if provision_type.nil?

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

@@ -95,7 +95,7 @@ EOT
       # my_terminal.execute("setup needed?")
       # theres a bug here with --remote-url :status == "unknown"
       # but hey, we got json back, so set status to "ready"
-      if appliance_status_json && appliance_status_json['setupNeeded'] == false
+      if appliance_status_json
         @remote_appliance[:status] == 'ready'
       end
       remote_status_string = format_appliance_status(@remote_appliance, cyan)

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

@@ -0,0 +1,139 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::Snapshots
+  include Morpheus::Cli::CliCommand
+
+  set_command_name :snapshots
+  set_command_description "View or remove snapshot"
+  register_subcommands :get, :remove
+
+  alias_subcommand :details, :get
+  set_default_subcommand :get
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @snapshots_interface = @api_client.snapshots
+  end
+  
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.footer = "Get Snapshot details." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot."
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts_error "[id] argument is required"
+      puts_error optparse
+      return 1
+    end
+
+    connect(options)
+    id_list = parse_id_list(args)
+
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(arg, options)
+    begin
+
+      @snapshots_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @snapshots_interface.dry.get(arg.to_i)
+        return
+      end
+
+      json_response = @snapshots_interface.get(arg.to_i)
+      if options[:json]
+        puts as_json(json_response, options, "snapshot")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "snapshot")
+        return 0
+      end
+
+      if options[:csv]
+        puts records_as_csv([json_response['snapshot']], options)
+        return 0
+      end
+      snapshot = json_response['snapshot']
+
+      print_h1 "Snapshot Details"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "External Id" => 'externalId',
+        "Status" => 'status',
+        "State" => 'state',
+        "Snapshot Type" => 'snapshotType',
+        "Snapshot Created" => 'snapshotCreated',
+        "Cloud" => 'zone.name',
+        "Datastore" => 'datastore',
+        "Parent Snapshot" => 'parentSnapshot',
+        "Active" => 'currentlyActive',
+        "Date Created" => 'dateCreated'
+      }
+      print_description_list(description_cols, snapshot)
+
+      print reset, "\n"
+
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    instance = nil
+    snapshot_id = 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/Delete a snapshot." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot to delete."
+    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
+    snapshot_id = args[0].to_i
+    connect(options)
+    begin
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove a snapshot?", options)
+        exit 1
+      end
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @snapshots_interface.dry.remove(snapshot_id, payload)
+        return
+      end
+      
+      json_response = @snapshots_interface.remove(snapshot_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
+end

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

@@ -179,7 +179,7 @@ class Morpheus::Cli::Tasks
           task_option_config = {}
           task_option_columns = []
           task_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
-            if optionType['fieldLabel'].to_s.downcase == 'script'
+            if optionType['code'] == 'script'
               script_content = task['taskOptions'][optionType['fieldName']]
             elsif optionType['fieldName'] == 'httpHeaders' || optionType['fieldName'] == 'webHeaders'
               http_headers = task['taskOptions']['httpHeaders'] || task['taskOptions']['webHeaders']
@@ -553,11 +553,11 @@ class Morpheus::Cli::Tasks
             payload['task']['retryCount'] = v_prompt['retryCount'].to_i unless v_prompt['retryCount'].nil?
           end
           # Retry Delay
-          if options[:options]['retryDelay']
-            payload['task']['retryDelay'] = options[:options]['retryDelay'].to_i
+          if options[:options]['retryDelaySeconds']
+            payload['task']['retryDelaySeconds'] = options[:options]['retryDelaySeconds'].to_i
           else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retryDelay', 'fieldLabel' => 'Retry Delay', 'type' => 'number', 'defaultValue' => 10}], options[:options], @api_client)
-            payload['task']['retryDelay'] = v_prompt['retryDelay'].to_i unless v_prompt['retryDelay'].nil?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retryDelaySeconds', 'fieldLabel' => 'Retry Delay', 'type' => 'number', 'defaultValue' => 10}], options[:options], @api_client)
+            payload['task']['retryDelaySeconds'] = v_prompt['retryDelaySeconds'].to_i unless v_prompt['retryDelaySeconds'].nil?
           end
         end