morpheus-cli 3.5.1.3 → 3.5.2

data/lib/morpheus/cli/key_pairs.rb

@@ -29,7 +29,7 @@ class Morpheus::Cli::KeyPairs
   def list(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:account, :list, :json])
     end
@@ -76,7 +76,7 @@ class Morpheus::Cli::KeyPairs
   def get(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:account, :json])
     end
@@ -109,7 +109,7 @@ class Morpheus::Cli::KeyPairs
           "ID" => 'id',
           "Name" => 'name',
           "Fingerprint" => 'fingerprint',
-          "MD5" => 'md5',
+          #"MD5" => 'md5',
           # "Has Private Key" => lambda {|it| format_boolean(it['hasPrivateKey']) },
           # "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
           "Created" => lambda {|it| format_local_dt(it['dateCreated']) }
@@ -140,7 +140,7 @@ class Morpheus::Cli::KeyPairs
 
   def add(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       opts.on('', '--public-key-file FILENAME', "Public Key File" ) do |filename|
         if File.exists?(File.expand_path(filename))
@@ -229,7 +229,7 @@ class Morpheus::Cli::KeyPairs
 
   def update(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_key_pair_option_types)
       build_common_options(opts, options, [:account, :options, :json, :dry_run])
@@ -282,7 +282,7 @@ class Morpheus::Cli::KeyPairs
 
   def remove(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
     end

data/lib/morpheus/cli/load_balancers.rb

@@ -27,7 +27,7 @@ class Morpheus::Cli::LoadBalancers
 
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :dry_run, :remote])
     end
@@ -78,7 +78,7 @@ class Morpheus::Cli::LoadBalancers
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :csv, :yaml, :fields, :dry_run, :remote])
     end
@@ -161,7 +161,7 @@ class Morpheus::Cli::LoadBalancers
     lb_name = args[0]
     options = {}
     account_name = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
@@ -222,7 +222,7 @@ class Morpheus::Cli::LoadBalancers
 
   def lb_types(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -261,7 +261,7 @@ class Morpheus::Cli::LoadBalancers
   def add(args)
     lb_type_name = nil
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] -t LB_TYPE")
       opts.on( '-t', '--type LB_TYPE', "Load Balancer Type" ) do |val|
         lb_type_name = val
@@ -305,7 +305,7 @@ class Morpheus::Cli::LoadBalancers
   def remove(args)
     lb_name = args[0]
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end

data/lib/morpheus/cli/login.rb

@@ -28,7 +28,7 @@ class Morpheus::Cli::Login
   def login(args)
     options = {}
     username, password = nil, nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       opts.on( '-u', '--username USERNAME', "Username" ) do |val|
         username = val
@@ -52,21 +52,21 @@ class Morpheus::Cli::Login
         @appliance_name, @appliance_url = nil, nil
       end
       if !@appliance_name
-        print_red_alert "You have no appliance named '#{options[:remote]}' configured. See the `remote list` command."
+        print_error red, "You have no appliance named '#{options[:remote]}' configured. See the `remote list` command.", reset, "\n"
         return false
       end
     else
       @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
       if !@appliance_name
-        print yellow,"Please specify a remote appliance with -r or see the command `remote use`#{reset}\n"
+        print_error yellow, "Please specify a remote appliance with -r or see the command `remote use`", reset, "\n"
         return false
       end
     end
 
     begin
       if options[:quiet]
-        if !options[:remote_token] && (username.empty? || password.empty?)
-          print yellow,"You have not specified username and password\n"
+        if ((!options[:remote_token]) && !(username && password))
+          print_error yellow,"Please specify a username and password, or token.", reset, "\n"
           return false
         end
       end
@@ -86,6 +86,9 @@ class Morpheus::Cli::Login
       end
 
       if creds
+        if !options[:quiet]
+          print green,"Logged in to #{@appliance_name} as #{::Morpheus::Cli::Remote.load_active_remote()[:username]}#{reset}", reset, "\n"
+        end
         return 0 # ,  nil
       else
         return 1 # , "Login failed"

data/lib/morpheus/cli/logout.rb

@@ -30,7 +30,7 @@ class Morpheus::Cli::Logout
 
   def logout(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       build_common_options(opts, options, [:remote, :quiet])
     end

data/lib/morpheus/cli/monitoring_contacts_command.rb

@@ -32,7 +32,7 @@ class Morpheus::Cli::MonitoringContactsCommand
   def list(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :json, :dry_run])
     end
@@ -82,7 +82,7 @@ class Morpheus::Cli::MonitoringContactsCommand
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id list]")
       opts.on(nil,'--history', "Display History") do |val|
         options[:show_history] = true
@@ -152,7 +152,7 @@ class Morpheus::Cli::MonitoringContactsCommand
   def add(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       opts.on("--name STRING", String, "Contact name") do |val|
         params['name'] = val
@@ -207,7 +207,7 @@ class Morpheus::Cli::MonitoringContactsCommand
   def update(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       opts.on("--name STRING", String, "Contact name") do |val|
         params['name'] = val
@@ -266,7 +266,7 @@ class Morpheus::Cli::MonitoringContactsCommand
 
   def remove(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id list]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
     end
@@ -307,7 +307,7 @@ class Morpheus::Cli::MonitoringContactsCommand
 
   def reopen(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id list]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
     end

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -20,7 +20,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   def list(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('--status LIST', Array, "Filter by status. open, closed") do |list|
         params['status'] = list
@@ -72,7 +72,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   # it is not stats about a particular incident
   def stats(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       #opts.on('-j','--json', "JSON Output") do
       opts.on( '-m', '--max MAX', "Max open incidents to display. Default is 25" ) do |max|
@@ -157,7 +157,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id list]")
       opts.on(nil,'--history', "Display Incident History") do |val|
         options[:show_history] = true
@@ -280,7 +280,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   def history(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [options]")
       opts.on('--severity LIST', Array, "Filter by severity. critical, warning, info") do |list|
         params['severity'] = list
@@ -335,7 +335,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def notifications(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [options]")
       build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :json, :dry_run, :remote])
     end
@@ -388,7 +388,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   def update(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       opts.on("-c", "--comment STRING", String, "Comment on this incident") do |val|
         params['comment'] = val == 'null' ? nil : val
@@ -565,7 +565,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def close(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id list]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
     end
@@ -609,7 +609,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def reopen(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id list]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
     end

data/lib/morpheus/cli/preseed_scripts_command.rb

@@ -34,7 +34,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :json, :dry_run])
     end
@@ -92,7 +92,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[preseed-script]")
       build_common_options(opts, options, [:json, :dry_run])
     end
@@ -146,7 +146,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   def add(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[fileName]")
       build_option_type_options(opts, options, add_preseed_script_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run, :quiet])
@@ -205,7 +205,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   def update(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[preseed-script] [options]")
       build_option_type_options(opts, options, update_preseed_script_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run])
@@ -275,7 +275,7 @@ class Morpheus::Cli::PreseedScriptsCommand
 
   def remove(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[preseed-script]")
       build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
     end

data/lib/morpheus/cli/recent_activity_command.rb

@@ -28,7 +28,7 @@ class Morpheus::Cli::RecentActivityCommand
   end
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
         options[:start] = parse_time(val).iso8601

data/lib/morpheus/cli/remote.rb

@@ -431,7 +431,7 @@ EOT
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json,:csv, :fields, :quiet])
     end

data/lib/morpheus/cli/security_group_rules.rb

@@ -31,7 +31,7 @@ Usage: morpheus #{command_name} add-custom-rule SOURCE_CIDR PORT_RANGE PROTOCOL
 EOT
     options = {}
     security_group_id = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       opts.on( '-s', '--secgroup SECGROUP', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
         security_group_id = id
@@ -90,7 +90,7 @@ EOT
 
     options = {}
     security_group_id = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       opts.on( '-s', '--secgroup secgroup', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
         security_group_id = id
@@ -139,7 +139,7 @@ EOT
   def list(args)
     options = {}
     security_group_id = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       build_common_options(opts, options, [:json, :dry_run])
     end
@@ -186,7 +186,7 @@ EOT
   def remove(args)
     options = {}
     security_group_id = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [options]")
       opts.on( '-s', '--secgroup secgroup', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
         security_group_id = id

data/lib/morpheus/cli/security_groups.rb

@@ -25,7 +25,7 @@ class Morpheus::Cli::SecurityGroups
 
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:json, :dry_run])
     end
@@ -69,7 +69,7 @@ class Morpheus::Cli::SecurityGroups
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       build_common_options(opts, options, [:json, :dry_run])
     end
@@ -110,7 +110,7 @@ class Morpheus::Cli::SecurityGroups
   def add(args)
     params = {:securityGroup => {}}
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       opts.on( '-d', '--description Description', "Description of the security group" ) do |description|
         params[:securityGroup][:description] = description
@@ -144,7 +144,7 @@ class Morpheus::Cli::SecurityGroups
 
   def remove(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       build_common_options(opts, options, [:json, :dry_run])
     end
@@ -180,7 +180,7 @@ class Morpheus::Cli::SecurityGroups
 
   def use(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [--none]")
       opts.on('--none','--none', "Do not use an active group.") do |json|
         options[:unuse] = true

data/lib/morpheus/cli/shell.rb

@@ -111,7 +111,7 @@ class Morpheus::Cli::Shell
 
   def handle(args)
     usage = "Usage: morpheus #{command_name}"
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       # change to a temporary home directory, delete it afterwards.
       opts.on('-e','--exec COMMAND', "Execute the provided morpheus commands and exit.") do |val|

data/lib/morpheus/cli/storage_providers_command.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::StorageProvidersCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::InfrastructureHelper
 
-  set_command_name :'storage-providers'
+  set_command_name :'storage-buckets'
 
   register_subcommands :list, :get, :add, :update, :remove
   # file commands
@@ -46,7 +46,7 @@ class Morpheus::Cli::StorageProvidersCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
-      opts.footer = "List storage providers."
+      opts.footer = "List storage buckets."
     end
     optparse.parse!(args)
     if args.count != 0
@@ -62,23 +62,23 @@ class Morpheus::Cli::StorageProvidersCommand
         return
       end
       json_response = @storage_providers_interface.list(params)
-      storage_providers = json_response["storageProviders"]
+      storage_providers = json_response["storageBuckets"]
       if options[:json]
-        puts as_json(json_response, options, "storageProviders")
+        puts as_json(json_response, options, "storageBuckets")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options, "storageProviders")
+        puts as_yaml(json_response, options, "storageBuckets")
         return 0
       elsif options[:csv]
         puts records_as_csv(storage_providers, options)
         return 0
       end
-      title = "Morpheus Storage Providers"
+      title = "Morpheus Storage Buckets"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if storage_providers.empty?
-        print cyan,"No storage providers found.",reset,"\n"
+        print cyan,"No storage buckets found.",reset,"\n"
       else
         rows = storage_providers.collect {|storage_provider| 
           row = {
@@ -100,7 +100,7 @@ class Morpheus::Cli::StorageProvidersCommand
         print cyan
         print as_pretty_table(rows, columns, options)
         print reset
-        print_results_pagination(json_response, {:label => "storage provider", :n_label => "storage providers"})
+        print_results_pagination(json_response, {:label => "storage bucket", :n_label => "storage buckets"})
       end
       print reset,"\n"
       return 0
@@ -113,15 +113,15 @@ class Morpheus::Cli::StorageProvidersCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[storage-provider]")
+      opts.banner = subcommand_usage("[storage-bucket]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "Get details about a storage provider." + "\n" +
-                    "[storage-provider] is required. This is the name or id of a storage provider."
+      opts.footer = "Get details about a storage bucket." + "\n" +
+                    "[storage-bucket] is required. This is the name or id of a storage bucket."
     end
     optparse.parse!(args)
     if args.count != 1
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} missing argument: [storage-provider]\n#{optparse}"
+      puts_error  "#{command_name} missing argument: [storage-bucket]\n#{optparse}"
       return 1
     end
     connect(options)
@@ -136,20 +136,20 @@ class Morpheus::Cli::StorageProvidersCommand
       end
       storage_provider = find_storage_provider_by_name_or_id(args[0])
       return 1 if storage_provider.nil?
-      json_response = {'storageProvider' => storage_provider}  # skip redundant request
+      json_response = {'storageBucket' => storage_provider}  # skip redundant request
       # json_response = @storage_providers_interface.get(storage_provider['id'])
-      storage_provider = json_response['storageProvider']
+      storage_provider = json_response['storageBucket']
       if options[:json]
-        puts as_json(json_response, options, "storageProvider")
+        puts as_json(json_response, options, "storageBucket")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options, "storageProvider")
+        puts as_yaml(json_response, options, "storageBucket")
         return 0
       elsif options[:csv]
         puts records_as_csv([storage_provider], options)
         return 0
       end
-      print_h1 "Storage Provider Details"
+      print_h1 "Storage Bucket Details"
       print cyan
       description_cols = {
         "ID" => 'id',
@@ -176,10 +176,10 @@ class Morpheus::Cli::StorageProvidersCommand
     create_bucket = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on('--name VALUE', String, "Name for this storage provider") do |val|
+      opts.on('--name VALUE', String, "Name for this storage bucket") do |val|
         options['name'] = val
       end
-      opts.on('--type code', String, "Storage Provider Type Code") do |val|
+      opts.on('--type code', String, "Storage Bucket Type Code") do |val|
         options['providerType'] = val
       end
       opts.on('--bucket-name VALUE', String, "Bucket Name") do |val|
@@ -201,7 +201,7 @@ class Morpheus::Cli::StorageProvidersCommand
       #  create_bucket = val.to_s == 'on' || val.to_s == 'true' || val.nil?
       #end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
-      opts.footer = "Create a new storage provider." + "\n" +
+      opts.footer = "Create a new storage bucket." + "\n" +
                     "[name] is required and can be passed as --name instead."
     end
     optparse.parse!(args)
@@ -225,35 +225,35 @@ class Morpheus::Cli::StorageProvidersCommand
       if options[:payload]
         payload = options[:payload]
       else
-        # prompt for storage provider options
+        # prompt for storage bucket options
         payload = {
-          'storageProvider' => {
+          'storageBucket' => {
             # 'config' => {}
           }
         }
         
         # allow arbitrary -O options
-        payload['storageProvider'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload['storageBucket'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
         # Name
         if options['name']
-          payload['storageProvider']['name'] = options['name']
+          payload['storageBucket']['name'] = options['name']
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this storage provider.'}], options)
-          payload['storageProvider']['name'] = v_prompt['name']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this storage bucket.'}], options)
+          payload['storageBucket']['name'] = v_prompt['name']
         end
 
-        # Storage Provider Type
+        # Storage Bucket Type
         storage_provider_type_code = nil
         if options['type']
           storage_provider_type_code = options['type'].to_s
         elsif options['providerType']
           storage_provider_type_code = options['providerType'].to_s
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'providerType', 'fieldLabel' => 'Provider Type', 'type' => 'select', 'selectOptions' => get_storage_provider_types(), 'required' => true, 'description' => 'Choose a storage provider type.'}], options, @api_client, {})
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'providerType', 'fieldLabel' => 'Provider Type', 'type' => 'select', 'selectOptions' => get_storage_provider_types(), 'required' => true, 'description' => 'Choose a storage bucket type.'}], options, @api_client, {})
           storage_provider_type_code = v_prompt['providerType'] unless v_prompt['providerType'].nil?
         end
-        payload['storageProvider']['providerType'] = storage_provider_type_code
+        payload['storageBucket']['providerType'] = storage_provider_type_code
 
         # Provider Type Specific Options
         provider_type_option_types = nil
@@ -316,49 +316,49 @@ class Morpheus::Cli::StorageProvidersCommand
             {'fieldName' => 'createBucket', 'fieldLabel' => 'Create Bucket', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Create the bucket if it does not exist.'}
           ]
         else
-          puts "warning: unrecognized storage provider type: '#{storage_provider_type_code}'"
+          puts "warning: unrecognized storage bucket type: '#{storage_provider_type_code}'"
         end
         if provider_type_option_types
           v_prompt = Morpheus::Cli::OptionTypes.prompt(provider_type_option_types, options, @api_client, {})
-          payload['storageProvider'].deep_merge!(v_prompt)
+          payload['storageBucket'].deep_merge!(v_prompt)
         end
 
         # Default Backup Target
         if options['defaultBackupTarget'] != nil
-          payload['storageProvider']['defaultBackupTarget'] = options['defaultBackupTarget']
+          payload['storageBucket']['defaultBackupTarget'] = options['defaultBackupTarget']
         else
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultBackupTarget', 'fieldLabel' => 'Default Backup Target', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => 'off'}], options)
-          payload['storageProvider']['defaultBackupTarget'] = (v_prompt['defaultBackupTarget'].to_s == 'on') unless v_prompt['defaultBackupTarget'].nil?
+          payload['storageBucket']['defaultBackupTarget'] = (v_prompt['defaultBackupTarget'].to_s == 'on') unless v_prompt['defaultBackupTarget'].nil?
         end
 
         # Archive Snapshots
         if options['copyToStore'] != nil
-          payload['storageProvider']['copyToStore'] = options['copyToStore']
+          payload['storageBucket']['copyToStore'] = options['copyToStore']
         else
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'copyToStore', 'fieldLabel' => 'Archive Snapshots', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => 'on'}], options)
-          payload['storageProvider']['copyToStore'] = (v_prompt['copyToStore'].to_s == 'on') unless v_prompt['copyToStore'].nil?
+          payload['storageBucket']['copyToStore'] = (v_prompt['copyToStore'].to_s == 'on') unless v_prompt['copyToStore'].nil?
         end
 
         # Default Deployment Target
         if options['defaultDeploymentTarget'] != nil
-          payload['storageProvider']['defaultDeploymentTarget'] = options['defaultDeploymentTarget']
+          payload['storageBucket']['defaultDeploymentTarget'] = options['defaultDeploymentTarget']
         else
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultDeploymentTarget', 'fieldLabel' => 'Default Deployment Target', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => 'off'}], options)
-          payload['storageProvider']['defaultDeploymentTarget'] = (v_prompt['defaultDeploymentTarget'].to_s == 'on') unless v_prompt['defaultDeploymentTarget'].nil?
+          payload['storageBucket']['defaultDeploymentTarget'] = (v_prompt['defaultDeploymentTarget'].to_s == 'on') unless v_prompt['defaultDeploymentTarget'].nil?
         end
 
         # Default Virtual Image Store
         if options['defaultVirtualImageTarget'] != nil
-          payload['storageProvider']['defaultVirtualImageTarget'] = options['defaultVirtualImageTarget']
+          payload['storageBucket']['defaultVirtualImageTarget'] = options['defaultVirtualImageTarget']
         else
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultVirtualImageTarget', 'fieldLabel' => 'Default Virtual Image Store', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => 'off'}], options)
-          payload['storageProvider']['defaultVirtualImageTarget'] = (v_prompt['defaultVirtualImageTarget'].to_s == 'on') unless v_prompt['defaultVirtualImageTarget'].nil?
+          payload['storageBucket']['defaultVirtualImageTarget'] = (v_prompt['defaultVirtualImageTarget'].to_s == 'on') unless v_prompt['defaultVirtualImageTarget'].nil?
         end
         #if create_bucket
         #  payload['createBucket'] = true
         #end
-        if payload['storageProvider']['createBucket'] == 'on'
-          payload['storageProvider']['createBucket'] = true
+        if payload['storageBucket']['createBucket'] == 'on'
+          payload['storageBucket']['createBucket'] = true
         end
       end
 
@@ -372,8 +372,8 @@ class Morpheus::Cli::StorageProvidersCommand
         print JSON.pretty_generate(json_response)
         print "\n"
       elsif !options[:quiet]
-        storage_provider = json_response['storageProvider']
-        print_green_success "Added storage provider #{storage_provider['name']}"
+        storage_provider = json_response['storageBucket']
+        print_green_success "Added storage bucket #{storage_provider['name']}"
         get([storage_provider['id']])
       end
       return 0
@@ -387,11 +387,11 @@ class Morpheus::Cli::StorageProvidersCommand
     options = {}
     ip_range_list = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[storage-provider] [options]")
-      opts.on('--name VALUE', String, "Name for this storage provider") do |val|
+      opts.banner = subcommand_usage("[storage-bucket] [options]")
+      opts.on('--name VALUE', String, "Name for this storage bucket") do |val|
         options['name'] = val
       end
-      opts.on('--type code', String, "Storage Provider Type Code") do |val|
+      opts.on('--type code', String, "Storage Bucket Type Code") do |val|
         options['providerType'] = val
       end
       opts.on('--bucket-name VALUE', String, "Bucket Name") do |val|
@@ -410,8 +410,8 @@ class Morpheus::Cli::StorageProvidersCommand
         options['copyToStore'] = val.to_s == 'on' || val.to_s == 'true'
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
-      opts.footer = "Update a storage provider." + "\n" +
-                    "[storage-provider] is required. This is the id of a storage provider."
+      opts.footer = "Update a storage bucket." + "\n" +
+                    "[storage-bucket] is required. This is the id of a storage bucket."
     end
     optparse.parse!(args)
     if args.count != 1
@@ -433,44 +433,44 @@ class Morpheus::Cli::StorageProvidersCommand
       if options[:payload]
         payload = options[:payload]
       else
-        # prompt for storage provider options
+        # prompt for storage bucket options
         # preserve previous config settings
         payload = {
-          'storageProvider' => {
+          'storageBucket' => {
             'config' => storage_provider['config']
           }
         }
         
         # allow arbitrary -O options
-        payload['storageProvider'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload['storageBucket'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
         # Name
         if options['name']
-          payload['storageProvider']['name'] = options['name']
+          payload['storageBucket']['name'] = options['name']
         end
 
         # Default Backup Target
         if options['defaultBackupTarget'] != nil
-          payload['storageProvider']['defaultBackupTarget'] = options['defaultBackupTarget']
+          payload['storageBucket']['defaultBackupTarget'] = options['defaultBackupTarget']
         end
 
         # Archive Snapshots
         if options['copyToStore'] != nil
-          payload['storageProvider']['copyToStore'] = options['copyToStore']
+          payload['storageBucket']['copyToStore'] = options['copyToStore']
         end
 
         # Default Deployment Target
         if options['defaultDeploymentTarget'] != nil
-          payload['storageProvider']['defaultDeploymentTarget'] = options['defaultDeploymentTarget']
+          payload['storageBucket']['defaultDeploymentTarget'] = options['defaultDeploymentTarget']
         end
 
         # Default Virtual Image Store
         if options['defaultVirtualImageTarget'] != nil
-          payload['storageProvider']['defaultVirtualImageTarget'] = options['defaultVirtualImageTarget']
+          payload['storageBucket']['defaultVirtualImageTarget'] = options['defaultVirtualImageTarget']
         end
 
-        if payload['storageProvider']['createBucket'] == 'on'
-          payload['storageProvider']['createBucket'] = true
+        if payload['storageBucket']['createBucket'] == 'on'
+          payload['storageBucket']['createBucket'] = true
         end
       end
 
@@ -482,8 +482,8 @@ class Morpheus::Cli::StorageProvidersCommand
       if options[:json]
         puts as_json(json_response)
       else
-        storage_provider = json_response['storageProvider']
-        print_green_success "Updated storage provider #{storage_provider['name']}"
+        storage_provider = json_response['storageBucket']
+        print_green_success "Updated storage bucket #{storage_provider['name']}"
         get([storage_provider['id']])
       end
       return 0
@@ -496,16 +496,16 @@ class Morpheus::Cli::StorageProvidersCommand
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[storage-provider]")
+      opts.banner = subcommand_usage("[storage-bucket]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
-      opts.footer = "Delete a storage provider." + "\n" +
-                    "[storage-provider] is required. This is the name or id of a storage provider."
+      opts.footer = "Delete a storage bucket." + "\n" +
+                    "[storage-bucket] is required. This is the name or id of a storage bucket."
     end
     optparse.parse!(args)
 
     if args.count < 1
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} missing argument: [storage-provider]\n#{optparse}"
+      puts_error  "#{command_name} missing argument: [storage-bucket]\n#{optparse}"
       return 1
     end
 
@@ -514,7 +514,7 @@ class Morpheus::Cli::StorageProvidersCommand
       storage_provider = find_storage_provider_by_name_or_id(args[0])
       return 1 if storage_provider.nil?
 
-      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the storage provider: #{storage_provider['name']}?")
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the storage bucket: #{storage_provider['name']}?")
         return 9, "aborted command"
       end
       if options[:dry_run]
@@ -526,7 +526,7 @@ class Morpheus::Cli::StorageProvidersCommand
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Removed storage provider #{storage_provider['name']}"
+        print_green_success "Removed storage bucket #{storage_provider['name']}"
         # list([])
       end
       return 0
@@ -545,7 +545,7 @@ class Morpheus::Cli::StorageProvidersCommand
         params[:fullTree] = true
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run])
-      opts.footer = "List files in a storage provider. \nInclude [/path] to show files under a directory."
+      opts.footer = "List files in a storage bucket. \nInclude [/path] to show files under a directory."
     end
     optparse.parse!(args)
     if args.count < 1 || args.count > 2
@@ -568,7 +568,7 @@ class Morpheus::Cli::StorageProvidersCommand
       end
       json_response = @storage_providers_interface.list_files(storage_provider['id'], search_file_path, params)
       storage_files = json_response['storageFiles']
-      # storage_provider = json_response['storageProvider']
+      # storage_provider = json_response['storageBucket']
       if options[:json]
         print JSON.pretty_generate(json_response)
         return
@@ -603,7 +603,7 @@ class Morpheus::Cli::StorageProvidersCommand
       else
         # puts "No files found for path #{search_file_path}"
         if search_file_path.empty? || search_file_path == "/"
-          puts "This storage provider has no files."
+          puts "This storage bucket has no files."
           print reset,"\n"
           return 0
         else
@@ -625,7 +625,7 @@ class Morpheus::Cli::StorageProvidersCommand
     do_long_format = false
     do_human_bytes = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[provider/path]")
+      opts.banner = subcommand_usage("[bucket/path]")
       opts.on('-a', '--all', "Show all files, including subdirectories under the /path.") do
         params[:fullTree] = true
         do_one_file_per_line = true
@@ -641,7 +641,7 @@ class Morpheus::Cli::StorageProvidersCommand
         do_one_file_per_line = true
       end
       build_common_options(opts, options, [:list, :json, :fields, :dry_run])
-      opts.footer = "Print filenames for a given location.\nPass storage location in the format provider/path."
+      opts.footer = "Print filenames for a given location.\nPass storage location in the format bucket/path."
     end
     optparse.parse!(args)
     if args.count < 1 || args.count > 2
@@ -671,7 +671,7 @@ class Morpheus::Cli::StorageProvidersCommand
         end
         return 0
       end
-      #storage_provider = json_response['storageProvider'] # yep, this is returned too
+      #storage_provider = json_response['storageBucket'] # yep, this is returned too
       storage_files = json_response['storageFiles']
       # print_h2 "Directory: #{search_file_path}"
       # print "Directory: #{search_file_path}"
@@ -795,7 +795,7 @@ class Morpheus::Cli::StorageProvidersCommand
       opts.on('--ignore-files PATTERN', String, "Pattern of files to be ignored when uploading a directory." ) do |val|
         ignore_regexp = /#{Regexp.escape(val)}/
       end
-      opts.footer = "Upload a local file or folder to a storage provider. " +
+      opts.footer = "Upload a local file or folder to a storage bucket. " +
                     "\nThe first argument [local-file] should be the path of a local file or directory." +
                     "\nThe second argument [provider:/path] should contain the name or id of the provider." +
                     "\nThe [:/path] component is optional and can be used to specify the destination of the uploaded file or folder." +
@@ -1242,10 +1242,10 @@ class Morpheus::Cli::StorageProvidersCommand
   def find_storage_provider_by_id(id)
     begin
       json_response = @storage_providers_interface.get(id.to_i)
-      return json_response['storageProvider']
+      return json_response['storageBucket']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
-        print_red_alert "Storage Provider not found by id #{id}"
+        print_red_alert "Storage Bucket not found by id #{id}"
         return nil
       else
         raise e
@@ -1255,12 +1255,12 @@ class Morpheus::Cli::StorageProvidersCommand
 
   def find_storage_provider_by_name(name)
     json_response = @storage_providers_interface.list({name: name.to_s})
-    storage_providers = json_response['storageProviders']
+    storage_providers = json_response['storageBuckets']
     if storage_providers.empty?
-      print_red_alert "Storage Provider not found by name #{name}"
+      print_red_alert "Storage Bucket not found by name #{name}"
       return nil
     elsif storage_providers.size > 1
-      print_red_alert "#{storage_providers.size} storage providers found by name #{name}"
+      print_red_alert "#{storage_providers.size} storage buckets found by name #{name}"
       rows = storage_providers.collect do |storage_provider|
         {id: it['id'], name: it['name']}
       end