morpheus-cli 3.5.1.3 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e9f063e72c623f8a392db49dc77b94b06415473c2c18c7bff94ccc5218a022c
-  data.tar.gz: 6a66477f1c7c240ab9ddb4aec6179f6b25f1422005d85ceedbd5de32631097be
+  metadata.gz: e69dc73a61a5113eda7600546cc3930dfdd4f47a9a882cd0aa27bb9af12a5f97
+  data.tar.gz: 9d47bacf74b477ab1d887f110b055b5cf9d89e0f65fff187b0bf2471a92b8616
 SHA512:
-  metadata.gz: 42f2e77de921b17cd70a69f643df6af7e8f4545aea5008a9ba0f35db4c505e3ef303cfa34c0253e4de4438a804efc3e1e78252fe1b0aae6bdac104760f9af3d3
-  data.tar.gz: 6d8400cff18682f4274aeafac9f5ade199cc037106efe03b7a980e7151fba23fbc807e9ef3b0e1856a9528547c51949cef983bcf439b211acea8c1c490205f6c
+  metadata.gz: 2187ecea61941471a82f73f0f2a86d555ec739d22bfe4bc30b7aa620fca16aa9b6a3372c9cc0adf21868d4283c83b5bd545cb8fc4cc1a253d1e37accb58e01af
+  data.tar.gz: b39bc39b4b012dabad7c821b55690c1976d92a671abcb660fd57140506c499042b3cf77d80394d0c6e07669e59b3113856f256a5187ac7461929c8fbb4583d19

data/lib/morpheus/api/instances_interface.rb

@@ -255,4 +255,11 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def update_notes(id, payload)
+    url = "#{@base_url}/api/instances/#{id}/notes"
+    headers = {authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/storage_providers_interface.rb

@@ -11,35 +11,35 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
 
   def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/storage/providers/#{id}"
+    url = "#{@base_url}/api/storage/buckets/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def list(params={})
-    url = "#{@base_url}/api/storage/providers"
+    url = "#{@base_url}/api/storage/buckets"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def create(payload)
-    url = "#{@base_url}/api/storage/providers"
+    url = "#{@base_url}/api/storage/buckets"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def update(id, payload)
-    url = "#{@base_url}/api/storage/providers/#{id}"
+    url = "#{@base_url}/api/storage/buckets/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def destroy(id, params={})
-    url = "#{@base_url}/api/storage/providers/#{id}"
+    url = "#{@base_url}/api/storage/buckets/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, timeout: 30, headers: headers}
     execute(opts)
@@ -49,7 +49,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     if file_path.to_s.strip == "/"
       file_path = ""
     end
-    url = "#{@base_url}/api/storage/providers/#{URI.escape(id.to_s)}" + "/files/#{URI.escape(file_path)}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/files/#{URI.escape(file_path)}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
@@ -74,7 +74,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     # if filename == "" || filename == "/"
     #   filename = File.basename(local_file)
     # end
-    url = "#{@base_url}/api/storage/providers/#{URI.escape(id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
     headers[:params][:filename] = filename # File.basename(destination)
     if !local_file.kind_of?(File)
@@ -89,7 +89,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
     raise "#{self.class}.download_file() passed a blank file path!" if file_path.to_s == ''
     escaped_file_path = file_path.split("/").collect {|it| URI.escape(it) }.join("/")
-    url = "#{@base_url}/api/storage/providers/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts, false)
@@ -99,7 +99,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
     raise "#{self.class}.download_file() passed a blank file path!" if file_path.to_s == ''
     escaped_file_path = file_path.split("/").collect {|it| URI.escape(it) }.join("/")
-    url = "#{@base_url}/api/storage/providers/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
@@ -128,8 +128,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   end
 
   def download_zip_chunked(id, outfile, params={})
-    #url = "#{@base_url}/api/storage/providers/#{URI.escape(id.to_s)}" + ".zip"
-    url = "#{@base_url}/api/storage/providers/#{URI.escape(id.to_s)}/download-zip"
+    #url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + ".zip"
+    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}/download-zip"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)

data/lib/morpheus/cli/accounts.rb

@@ -107,7 +107,7 @@ class Morpheus::Cli::Accounts
 
   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, :remote, :dry_run])
     end
@@ -166,7 +166,7 @@ class Morpheus::Cli::Accounts
 
   def add(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       build_option_type_options(opts, options, add_account_option_types)
       build_common_options(opts, options, [:options, :json, :remote, :dry_run])
@@ -212,7 +212,7 @@ class Morpheus::Cli::Accounts
 
   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_account_option_types)
       build_common_options(opts, options, [:options, :json, :remote, :dry_run])
@@ -274,7 +274,7 @@ class Morpheus::Cli::Accounts
 
   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, [:auto_confirm, :json, :remote, :dry_run])
     end

data/lib/morpheus/cli/apps.rb

@@ -166,7 +166,7 @@ class Morpheus::Cli::Apps
           payload['id'] = 'existing'
           payload['templateName'] = 'Existing Instances'
         else
-          found_app_template = get_available_app_templates.find {|it| it['id'].to_s == template_id.to_s }
+          found_app_template = get_available_app_templates.find {|it| it['id'].to_s == template_id.to_s || it['name'].to_s == template_id.to_s }
           if found_app_template.nil?
             print_red_alert "App Template not found by id #{template_id}"
             return 1
@@ -218,6 +218,16 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app]")
+      opts.on('--refresh-until [status]', String, "Refresh until status is reached. Default status is running.") do |val|
+        if val.to_s.empty?
+          options[:refresh_until_status] = "running"
+        else
+          options[:refresh_until_status] = val.to_s.downcase
+        end
+      end
+      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
+        options[:refresh_interval] = val.to_f
+      end
       build_common_options(opts, options, [:json, :dry_run])
       opts.footer = "Get details about an app.\n" +
                     "[app] is required. This is the name or id of an app."
@@ -270,7 +280,7 @@ class Morpheus::Cli::Apps
           if instances.empty?
             puts yellow, "This tier is empty", reset
           else
-            instance_table = instances.collect do |instance|
+            instances_rows = instances.collect do |instance|
               # JD: fix bug here, status is not returned because withStats: false !?
               status_string = instance['status'].to_s
               if status_string == 'running'
@@ -288,7 +298,10 @@ class Morpheus::Cli::Apps
               end
               {id: instance['id'], name: instance['name'], connection: connection_string, environment: instance['instanceContext'], nodes: instance['containers'].count, status: status_string, type: instance['instanceType']['name'], group: !instance['group'].nil? ? instance['group']['name'] : nil, cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil}
             end
-            tp instance_table, :id, :name, :cloud, :type, :environment, :nodes, :connection, :status
+            instances_rows = instances_rows.sort {|x,y| x[:id] <=> y[:id] } #oldest to newest..
+            print cyan
+            print as_pretty_table(instances_rows, [:id, :name, :cloud, :type, :environment, :nodes, :connection, :status])
+            print reset
           end
         end
       end
@@ -296,6 +309,19 @@ class Morpheus::Cli::Apps
 
       print reset,"\n"
 
+      # refresh until a status is reached
+      if options[:refresh_until_status]
+        if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
+          options[:refresh_interval] = 5
+        end
+        while app['status'].to_s.downcase != options[:refresh_until_status].to_s.downcase
+          print cyan
+          print "Refreshing until status #{options[:refresh_until_status]} ..."
+          sleep(options[:refresh_interval])
+          get(args)
+        end
+      end
+
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -429,24 +455,25 @@ class Morpheus::Cli::Apps
 
   def remove(args)
     options = {}
-    query_params = {keepBackups: 'off', force: 'off'}
+    query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[app] [-fB]")
-      opts.on( '-f', '--force', "Force Delete" ) do
-        query_params[:force] = 'on'
+      opts.banner = subcommand_usage("[app]")
+      #JD: UI defaults to on, but perhaps better to be explicate for now.
+      opts.on('--remove-instances [on|off]', ['on','off'], "Remove instances. Default is off.") do |val|
+        query_params[:removeInstances] = val
+      end
+      opts.on('--preserve-volumes [on|off]', ['on','off'], "Preserve Volumes. Default is off. Applies to certain types only.") do |val|
+        query_params[:preserveVolumes] = val
       end
       opts.on( '-B', '--keep-backups', "Preserve copy of backups" ) do
         query_params[:keepBackups] = 'on'
       end
-      opts.on('--remove-instances [on|off]', ['on','off'], "Remove instances. Default is on.") do |val|
-        query_params[:removeInstances] = val
-      end
-      opts.on('--remove-volumes [on|off]', ['on','off'], "Remove Volumes. Default is on. Applies to certain types only.") do |val|
-        query_params[:removeVolumes] = val
-      end
-      opts.on('--releaseEIPs', ['on','off'], "Release EIPs. Default is false. Applies to Amazon only.") do |val|
+      opts.on('--releaseEIPs', ['on','off'], "Release EIPs. Default is on. Applies to Amazon only.") do |val|
         query_params[:releaseEIPs] = val
       end
+      opts.on( '-f', '--force', "Force Delete" ) do
+        query_params[:force] = 'on'
+      end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :auto_confirm])
       opts.footer = "Delete an app.\n" +
                     "[app] is required. This is the name or id of an app."
@@ -464,6 +491,10 @@ class Morpheus::Cli::Apps
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the app '#{app['name']}'?", options)
         return 9
       end
+      # JD: removeVolumes to maintain the old behavior with pre-3.5.2 appliances, remove me later
+      if query_params[:preserveVolumes].nil?
+        query_params[:removeVolumes] = 'on'
+      end
       if options[:dry_run]
         print_dry_run @apps_interface.dry.destroy(app['id'], query_params)
         return
@@ -474,7 +505,7 @@ class Morpheus::Cli::Apps
         print "\n"
       elsif !options[:quiet]
         print_green_success "Removed app #{app['name']}"
-        list([])
+        #list([])
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -527,7 +558,7 @@ class Morpheus::Cli::Apps
         print "\n"
       else
         print_green_success "Removed instance #{instance['name']} from app #{app['name']}"
-        list([])
+        #list([])
         # details_options = [app['name']]
         # details(details_options)
       end
@@ -883,6 +914,7 @@ class Morpheus::Cli::Apps
     
     table_color = opts[:color] || cyan
     rows = apps.collect do |app|
+      tiers_str = format_app_tiers(app)
       instances_str = (app['instanceCount'].to_i == 1) ? "1 Instance" : "#{app['instanceCount']} Instances"
       containers_str = (app['containerCount'].to_i == 1) ? "1 Container" : "#{app['containerCount']} Containers"
       stats = app['stats']
@@ -893,6 +925,7 @@ class Morpheus::Cli::Apps
       {
         id: app['id'],
         name: app['name'],
+        tiers: tiers_str,
         instances: instances_str,
         containers: containers_str,
         account: app['account'] ? app['account']['name'] : nil,
@@ -907,6 +940,7 @@ class Morpheus::Cli::Apps
     columns = [
       :id,
       :name,
+      :tiers,
       :instances,
       :containers,
       #:account,
@@ -948,6 +982,23 @@ class Morpheus::Cli::Apps
     out
   end
 
+  def format_app_tiers(app)
+    out = ""
+    begin
+      app_tiers = app['appTiers']
+      if app_tiers
+        app_tier_names = app_tiers.collect { |app_tier| app_tier['tier']['name'] }
+        out << app_tier_names.join(", ")
+      end
+      if out.empty?
+        #out = "(Empty)"
+      end
+    rescue => ex
+      Morpheus::Logging::DarkPrinter.puts "A formatting exception occured: #{ex}" if Morpheus::Logging.debug?
+    end
+    out
+  end
+
   def get_available_app_templates(refresh=false)
     if !@available_app_templates || refresh
       results = @options_interface.options_for_source('appTemplates',{})

data/lib/morpheus/cli/boot_scripts_command.rb

@@ -35,7 +35,7 @@ class Morpheus::Cli::BootScriptsCommand
 
   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
@@ -93,7 +93,7 @@ class Morpheus::Cli::BootScriptsCommand
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[boot-script]")
       build_common_options(opts, options, [:json, :dry_run])
     end
@@ -147,7 +147,7 @@ class Morpheus::Cli::BootScriptsCommand
 
   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_boot_script_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run, :quiet])
@@ -206,7 +206,7 @@ class Morpheus::Cli::BootScriptsCommand
 
   def update(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[boot-script] [options]")
       build_option_type_options(opts, options, update_boot_script_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run])
@@ -276,7 +276,7 @@ class Morpheus::Cli::BootScriptsCommand
 
   def remove(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[boot-script]")
       build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
     end

data/lib/morpheus/cli/clouds.rb

@@ -226,7 +226,7 @@ class Morpheus::Cli::Clouds
   def add(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] --group GROUP --type TYPE")
       opts.on( '-g', '--group GROUP', "Group Name" ) do |val|
         params[:group] = val
@@ -345,7 +345,7 @@ class Morpheus::Cli::Clouds
   def update(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       # opts.on( '-g', '--group GROUP', "Group Name" ) do |val|
       #   params[:group] = val
@@ -415,7 +415,7 @@ class Morpheus::Cli::Clouds
   def remove(args)
     options = {}
     query_params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on( '-f', '--force', "Force Remove" ) do
         query_params[:force] = 'on'
@@ -450,7 +450,7 @@ class Morpheus::Cli::Clouds
   def firewall_disable(args)
     options = {}
     clear_or_secgroups_specified = false
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -482,7 +482,7 @@ class Morpheus::Cli::Clouds
   def firewall_enable(args)
     options = {}
     clear_or_secgroups_specified = false
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -514,7 +514,7 @@ class Morpheus::Cli::Clouds
   def security_groups(args)
     options = {}
     clear_or_secgroups_specified = false
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -560,7 +560,7 @@ class Morpheus::Cli::Clouds
   def apply_security_groups(args)
     options = {}
     clear_or_secgroups_specified = false
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [-s] [--clear]")
       opts.on( '-c', '--clear', "Clear all security groups" ) do
         options[:securityGroupIds] = []
@@ -600,7 +600,7 @@ class Morpheus::Cli::Clouds
   def list_cloud_types(args)
     options={}
     params = {}
-    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

data/lib/morpheus/cli/containers_command.rb

@@ -26,11 +26,21 @@ class Morpheus::Cli::ContainersCommand
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
+      opts.on('--refresh-until [status]', String, "Refresh until status is reached. Default status is running.") do |val|
+        if val.to_s.empty?
+          options[:refresh_until_status] = "running"
+        else
+          options[:refresh_until_status] = val.to_s.downcase
+        end
+      end
+      opts.on('--refresh-interval seconds', String, "Refresh interval. Default is 5 seconds.") do |val|
+        options[:refresh_interval] = val.to_f
+      end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -120,6 +130,19 @@ class Morpheus::Cli::ContainersCommand
 
       print reset, "\n"
 
+      # refresh until a status is reached
+      if options[:refresh_until_status]
+        if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
+          options[:refresh_interval] = 5
+        end
+        while container['status'].to_s.downcase != options[:refresh_until_status].to_s.downcase
+          print cyan
+          print "Refreshing until status #{options[:refresh_until_status]} ..."
+          sleep(options[:refresh_interval])
+          _get(arg, options)
+        end
+      end
+
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -130,7 +153,7 @@ class Morpheus::Cli::ContainersCommand
 
   def stop(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, :json, :dry_run, :quiet, :remote])
     end
@@ -169,7 +192,7 @@ class Morpheus::Cli::ContainersCommand
 
   def start(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, :json, :dry_run, :quiet, :remote])
     end
@@ -208,7 +231,7 @@ class Morpheus::Cli::ContainersCommand
 
   def restart(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, :json, :dry_run, :quiet, :remote])
     end
@@ -247,7 +270,7 @@ class Morpheus::Cli::ContainersCommand
 
   def suspend(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, :json, :dry_run, :quiet, :remote])
     end
@@ -286,7 +309,7 @@ class Morpheus::Cli::ContainersCommand
 
   def eject(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, :json, :dry_run, :quiet, :remote])
     end