morpheus-cli 5.4.0 → 5.4.3.1

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

@@ -0,0 +1,30 @@
+require 'morpheus/cli/cli_command'
+
+# This is for opening a file
+class Morpheus::Cli::OpenCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :open
+  set_command_hidden
+
+  def handle(args)
+    append_newline = true
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [file ...]"
+      build_common_options(opts, options, [:dry_run])
+      opts.footer = "Open file(s)." + "\n" +
+                    "[file] is required. This is the name of a file. Supports many [file] arguments."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min: 1)
+    open_args = args.join(" ")
+    if options[:dry_run]
+      print "\n"
+      print "#{cyan}#{bold}#{dark}SYSTEM COMMAND#{reset}\n"
+      puts Morpheus::Util.open_url_command(open_args)
+      return 0, nil
+    end
+    return Morpheus::Util.open_url(open_args)
+  end
+
+end

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

@@ -0,0 +1,98 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::Options
+  include Morpheus::Cli::CliCommand
+
+  set_command_description "List options by source name or option type"
+  set_command_name :'options'
+  
+  # options is not published yet
+  set_command_hidden
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @options_interface = @api_client.options
+  end
+  
+  def handle(args)
+    list(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: morpheus #{command_name} [source] [option-type]"
+      # build_standard_list_options(opts, options)
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+View options by source name or list options for a specific library option type.
+[source] is required. This is the name of the options source to load eg. "currencies"
+[option-type] is required when [source] is 'list'. This is the name or id of an option type to view.
+
+Examples: 
+    options currencies
+    options dnsRecordType
+    options list "widgets"
+EOT
+    end
+    optparse.parse!(args)
+    source_name = args[0]
+    option_type_id = args.size > 1 ? args[1..-1].join(" ") : nil
+    if source_name == "list"
+      verify_args!(args:args, optparse:optparse, min: 2)
+    else
+      verify_args!(args:args, optparse:optparse, count: 1)
+    end
+    connect(options)
+    params.merge!(parse_list_options(options))
+    if source_name == "list"
+      if option_type_id.to_s =~ /\A\d{1,}\Z/
+        params["optionTypeId"] = option_type_id
+      else
+        option_type = find_by_name_or_id(:option_type, option_type_id)
+        if option_type.nil?
+          return 1, "Option Type not found by name '#{option_type_id}'"
+        end
+        params["optionTypeId"] = option_type["id"]
+      end
+    end
+    # could find_by_name_or_id for params['servers'] and params['containers']
+    @options_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @options_interface.dry.options_for_source(source_name, params)
+      return
+    end
+    json_response = nil
+    begin
+      json_response = @options_interface.options_for_source(source_name, params)
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        raise_command_error("Options source not found by name '#{source_name}'", args, optparse)
+      elsif e.response && e.response.code == 500
+        # API is actually returning 500, so just expect it
+        if e.response.body.to_s.include?("groovy.lang.MissingMethodException")
+          raise_command_error("Options source not found by name '#{source_name}'", args, optparse)
+        else
+          raise e
+        end
+      else
+        raise e
+      end
+    end
+    render_response(json_response, options, "data") do
+      records = json_response["data"]
+      # print_h1 "Morpheus Options: #{source}", parse_list_subtitles(options), options
+      print_h1 "Morpheus Options", ["Source: #{source_name}"] + parse_list_subtitles(options), options
+      if records.nil? || records.empty?
+        print cyan,"No options found.",reset,"\n"
+      else
+        print as_pretty_table(records, [:name, :value], options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+end

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

@@ -24,7 +24,7 @@ class Morpheus::Cli::PoliciesCommand
     @cloud_policies_interface = @api_client.cloud_policies
     @clouds_interface = @api_client.clouds
     @groups_interface = @api_client.groups
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @roles_interface = @api_client.roles
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
@@ -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/prices_command.rb

@@ -211,11 +211,11 @@ class Morpheus::Cli::PricesCommand
           raise_command_error "Invalid price unit '#{val}'. Available price units: #{price_units.join(', ')}"
         end
       end
-      opts.on("--platform [PLATFORM]", String, "Price platform [linux|windows]. Required for platform price type") do |val|
-        if ['linux', 'windows'].include?(val)
+      opts.on("--platform [PLATFORM]", String, "Price platform [centos|debian|fedora|canonical|opensuse|redhat|suse|xen|linux|windows]. Required for platform price type") do |val|
+        if ['centos','debian','fedora','canonical','opensuse','redhat','suse','xen','linux', 'windows'].include?(val)
           params['platform'] = val
         else
-          raise_command_error "Invalid platform '#{val}'. Available platforms: linux, windows"
+          raise_command_error "Invalid platform '#{val}'. Available platforms/vendors: centos, debian, fedora, canonical, opensuse, redhat, suse, xen, linux, windows"
         end
       end
       opts.on("--software [TEXT]", String, "Price software. Required for software price type") do |val|
@@ -375,11 +375,11 @@ class Morpheus::Cli::PricesCommand
           raise_command_error "Invalid price unit '#{val}'. Available price units: #{price_units.join(', ')}"
         end
       end
-      opts.on("--platform [PLATFORM]", String, "Price platform [linux|windows]. Required for platform price type") do |val|
-        if ['linux', 'windows'].include?(val)
+      opts.on("--platform [PLATFORM]", String, "Price platform [centos|debian|fedora|canonical|opensuse|redhat|suse|xen|linux|windows]. Required for platform price type") do |val|
+        if ['centos','debian','fedora','canonical','opensuse','redhat','suse','xen','linux', 'windows'].include?(val)
           params['platform'] = val
         else
-          raise_command_error "Invalid platform '#{val}'. Available platforms: linux, windows"
+          raise_command_error "Invalid platform '#{val}'. Available platforms: centos, debian, fedora, canonical, opensuse, redhat, suse, xen, linux, windows"
         end
       end
       opts.on("--software [TEXT]", String, "Price software. Required for software price type") do |val|
@@ -614,7 +614,7 @@ class Morpheus::Cli::PricesCommand
   def prompt_for_price_type(params, options, price={})
     case params['priceType']
     when 'platform'
-      params['platform'] ||= price['platform'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'platform', 'type' => 'select', 'fieldLabel' => 'Platform', 'required' => true, 'description' => 'Select platform for platform price type', 'selectOptions' => [{'name' => 'Linux', 'value' => 'linux'}, {'name' => 'Windows', 'value' => 'windows'}]}], options[:options], @api_client, {}, options[:no_prompt])['platform']
+      params['platform'] ||= price['platform'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'platform', 'type' => 'select', 'fieldLabel' => 'Platform', 'required' => true, 'description' => 'Select platform for platform price type', 'selectOptions' => [ {'name' => 'CentOS', 'value' => 'centos'}, {'name' => 'Debian', 'value' => 'debian'}, {'name' => 'Fedora', 'value' => 'fedora'}, {'name' => 'Canonical', 'value' => 'canonical'}, {'name' => 'openSUSE', 'value' => 'opensuse'}, {'name' => 'Red Hat', 'value' => 'redhat'}, {'name' => 'SUSE', 'value' => 'suse'}, {'name' => 'Xen', 'value' => 'xen'}, {'name' => 'Linux', 'value' => 'linux'}, {'name' => 'Windows', 'value' => 'windows'}]}], options[:options], @api_client, {}, options[:no_prompt])['platform']
     when 'software'
       params['software'] ||= price['software'] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'software', 'type' => 'text', 'fieldLabel' => 'Software', 'required' => true, 'description' => 'Set software for software price type'}], options[:options], @api_client,{}, options[:no_prompt])['software']
     when 'datastore'

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

@@ -17,7 +17,8 @@ class Morpheus::Cli::Remote
 
   set_default_subcommand :list
 
-  set_subcommands_hidden :setup # this is going away too
+  set_subcommands_hidden :setup # moved to 'setup'
+  set_subcommands_hidden :view # moved to 'view'
 
   def initialize()
     @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -101,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] },
@@ -335,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)}"
@@ -389,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
@@ -895,6 +897,7 @@ EOT
   end
 
   def view(args)
+    print_error "#{yellow}DEPRECATION WARNING: `remote view` has been deprecated and replaced with `view`. Please use `view` instead.#{reset}\n"
     options = {}
     path = "/"
     no_auth = false
@@ -903,7 +906,7 @@ EOT
       opts.on('--path PATH', String, "Specify a path to load. eg '/logs'" ) do |val|
         path = val
       end
-      opts.on('--no-auth PATH', String, "Do not attempt to login with access token." ) do |val|
+      opts.on('--no-auth', "Do not attempt to login with access token." ) do |val|
         no_auth = true
       end
       build_common_options(opts, options, [:dry_run])
@@ -1276,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]) },
@@ -1694,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)
@@ -1732,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/roles.rb

@@ -20,7 +20,7 @@ class Morpheus::Cli::Roles
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @whoami_interface = @api_client.whoami
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @accounts_interface = @api_client.accounts
     @roles_interface = @api_client.roles
     @groups_interface = @api_client.groups

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

@@ -723,10 +723,10 @@ class Morpheus::Cli::Shell
       end
       if options[:show_pagination]
         if options[:phrase] || options[:sort] || options[:direction] || options[:offset]
-          print_results_pagination({:meta => history_result[:meta]})
+          print_results_pagination(history_result[:meta])
         else
           # default order is weird, it's the last page of results, 1-25 is misleading and showing the indexes is stranger
-          print_results_pagination({:meta => history_result[:meta]}, {:message =>"Viewing most recent %{size} of %{total} %{label}"})
+          print_results_pagination(history_result[:meta], {:message =>"Viewing most recent %{size} of %{total} %{label}"})
         end
         print reset, "\n"
       else

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

@@ -0,0 +1,50 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::StorageServerTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::StorageServersHelper
+
+  set_command_description "View storage server types"
+  set_command_name :'storage-server-types'
+  register_subcommands :list, :get
+
+  # register_interfaces :storage_server_types
+
+  protected
+
+  def storage_server_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+    }
+  end
+
+  def storage_server_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+      "Creatable" => lambda {|it| format_boolean(it['creatable']) },
+      "Create Namespaces" => lambda {|it| format_boolean(it['createNamespaces']) },
+      "Create Groups" => lambda {|it| format_boolean(it['createGroups']) },
+      "Create Hosts" => lambda {|it| format_boolean(it['createHosts']) },
+      "Create Disks" => lambda {|it| format_boolean(it['createDisks']) },
+      "Has Namespaces" => lambda {|it| format_boolean(it['hasNamespaces']) },
+      "Has Groups" => lambda {|it| format_boolean(it['hasGroups']) },
+      "Has Hosts" => lambda {|it| format_boolean(it['hasHosts']) },
+      "Has Disks" => lambda {|it| format_boolean(it['hasDisks']) },
+      "Has File Browser" => lambda {|it| format_boolean(it['hasFileBrowser']) },
+    }
+  end
+
+  # overridden to support name or code
+  def find_storage_server_type_by_name_or_id(name)
+    storage_server_type_for_name_or_id(name)
+  end
+
+end
+