morpheus-cli 3.6.4 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb3ffe2cbabe89c6f9ba8148cf1e2d2a7bfd51893a71f69acf05c406013454d
-  data.tar.gz: 298427126d4530f189b3ffbc09a9c06baeaf91018412a9b5633dda1ed76e5571
+  metadata.gz: e5af54f955b29a018c9dc09a30706f3dff383b42b71f08e92ba63539cf679171
+  data.tar.gz: f10233595e661594134eb2605bbe3dd48be90458c36441c5bd7afddbabc7093f
 SHA512:
-  metadata.gz: 0bcc8b841e8a23e6c90e81c724dcc5fecd967eee7294c97069708f849db2e98880c2f3832188a5740c4dd3aa81267682b7cd5b8bd84af0d229df8807ad6f9c33
-  data.tar.gz: 6b94513b1484b9caa2d04ced8c24f143f5e41f4746e3bbeb92c074aa0c2dacaf9166f4b5d409c390d25ec11965fa58678d0d9568e6d4dd9b27c66e33aac3107c
+  metadata.gz: 19e02a97f046c115b8080fb6489f07e4973e0dc734dd6986a492816e4abcd805d32ad49008593973acc9fc1346c1416d2cfc93121c96576a8fcb8cdb1b056dc3
+  data.tar.gz: 69d7ab3ae77e4fccc8ee42f09fc7c16f4f3383801a39acd57c8d661bcc0ea38633ed97a6c81840f761e84d3038aded3e2bd15667c8d9522f129dc39a265e3339

data/lib/morpheus/api/instances_interface.rb

@@ -94,14 +94,24 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
   end
 
   def suspend(id, params={})
-    url = "#{@base_url}/api/instances/#{id}/suspend"
+    url = "#{@base_url}/api/instances/suspend"
+    if id.is_a?(Array)
+      params['ids'] = id
+    else
+      url = "#{@base_url}/api/instances/#{id}/suspend"
+    end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers}
     execute(opts)
   end
 
   def eject(id, params={})
-    url = "#{@base_url}/api/instances/#{id}/eject"
+    url = "#{@base_url}/api/instances/eject"
+    if id.is_a?(Array)
+      params['ids'] = id
+    else
+      url = "#{@base_url}/api/instances/#{id}/eject"
+    end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/servers_interface.rb

@@ -42,16 +42,26 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def stop(serverId,payload = {})
-    url = "#{@base_url}/api/servers/#{serverId}/stop"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+  def stop(serverId,payload = {}, params={})
+    url = "#{@base_url}/api/servers/stop"
+    if serverId.is_a?(Array)
+      params['ids'] = serverId
+    else
+      url = "#{@base_url}/api/servers/#{serverId}/stop"
+    end
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def start(serverId,payload = {})
-    url = "#{@base_url}/api/servers/#{serverId}/start"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+  def start(serverId,payload = {}, params = {})
+    url = "#{@base_url}/api/servers/start"
+    if serverId.is_a?(Array)
+      params['ids'] = serverId
+    else
+      url = "#{@base_url}/api/servers/#{serverId}/start"
+    end
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end

data/lib/morpheus/cli/blueprints_command.rb

@@ -1999,13 +1999,17 @@ class Morpheus::Cli::BlueprintsCommand
         group_access_str = ""
         begin
           rows = []
-          if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
-            rows.push({"name" => 'All'})
-          end
-          if blueprint['resourcePermission']['sites']
-            blueprint['resourcePermission']['sites'].each do |site|
-              rows.push(site)
+          if blueprint['resourcePermission']
+            if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
+              rows.push({"name" => 'All'})
+            end
+            if blueprint['resourcePermission']['sites']
+              blueprint['resourcePermission']['sites'].each do |site|
+                rows.push(site)
+              end
             end
+          else
+            # rows.push({"name" => 'All'})
           end
           group_access_str = rows.collect {|it| it['default'] ? "#{it['name']} (default)" : "#{it['name']}"}.join(',')
         rescue => ex

data/lib/morpheus/cli/hosts.rb

@@ -820,17 +820,27 @@ class Morpheus::Cli::Hosts
     end
     connect(options)
     begin
-      host = find_host_by_name_or_id(args[0])
+      host_ids = parse_id_list(args)
+      hosts = []
+      host_ids.each do |host_id|
+        host = find_host_by_name_or_id(host_id)
+        return 1 if host.nil?
+        hosts << host
+      end
+      objects_label = "#{hosts.size == 1 ? 'host' : (hosts.size.to_s + ' hosts')} #{anded_list(hosts.collect {|it| it['name'] })}"
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start #{objects_label}?", options)
+        return 9, "aborted command"
+      end
       if options[:dry_run]
-        print_dry_run @servers_interface.dry.start(host['id'])
+        print_dry_run @servers_interface.dry.start(hosts.collect {|it| it['id'] })
         return
       end
-      json_response = @servers_interface.start(host['id'])
+      json_response = @servers_interface.start(hosts.collect {|it| it['id'] })
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
       elsif !options[:quiet]
-        print_green_success "Host #{host['name']} started."
+        print_green_success "Started #{objects_label}"
       end
       return
     rescue RestClient::Exception => e
@@ -852,17 +862,27 @@ class Morpheus::Cli::Hosts
     end
     connect(options)
     begin
-      host = find_host_by_name_or_id(args[0])
+      host_ids = parse_id_list(args)
+      hosts = []
+      host_ids.each do |host_id|
+        host = find_host_by_name_or_id(host_id)
+        return 1 if host.nil?
+        hosts << host
+      end
+      objects_label = "#{hosts.size == 1 ? 'host' : (hosts.size.to_s + ' hosts')} #{anded_list(hosts.collect {|it| it['name'] })}"
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop #{objects_label}?", options)
+        return 9, "aborted command"
+      end
       if options[:dry_run]
-        print_dry_run @servers_interface.dry.stop(host['id'])
+        print_dry_run @servers_interface.dry.stop(hosts.collect {|it| it['id'] })
         return
       end
-      json_response = @servers_interface.stop(host['id'])
+      json_response = @servers_interface.stop(hosts.collect {|it| it['id'] })
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
       elsif !options[:quiet]
-        puts "Host #{host['name']} stopped."
+        print_green_success "Stopped #{objects_label}"
       end
       return
     rescue RestClient::Exception => e

data/lib/morpheus/cli/instances.rb

@@ -1339,10 +1339,16 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+        params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
+      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Stop an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1351,21 +1357,44 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop this instance?", options)
-        exit 1
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
       end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.stop(instance['id'], params)
-        return
+        print_h1 "DRY RUN"
+        instances.each do |instance|
+          print_dry_run @instances_interface.dry.stop(instance['id'], params), false
+        end
+        return 0
       end
-      json_response = @instances_interface.stop(instance['id'], params)
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        print green, "Stopping instance #{instance['name']}", reset, "\n"
+      bad_responses = []
+      instances.each do |instance|
+        json_response = @instances_interface.stop(instance['id'], params)
+        render_result = render_with_format(json_response, options)
+        if render_result
+          #return 0
+        elsif !options[:quiet]
+          print green, "Stopping instance #{instance['name']}", reset, "\n"
+        end
+        if json_response['success'] == false
+          bad_responses << json_response
+          if !options[:quiet]
+            print_rest_errors(json_response)
+          end
+        end
+      end
+      if !bad_responses.empty?
+        return 1
       end
       return 0
+      
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1377,7 +1406,9 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Start an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1386,17 +1417,41 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
+      end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.start(instance['id'], params)
+        print_h1 "DRY RUN"
+        instances.each do |instance|
+          print_dry_run @instances_interface.dry.start(instance['id'], params), false
+        end
         return 0
       end
-      json_response = @instances_interface.start(instance['id'], params)
-      if options[:json]
-        puts as_json(json_response, options)
-        return 0
-      elsif !options[:quiet]
-        print green, "Starting instance #{instance['name']}", reset, "\n"
+      bad_responses = []
+      instances.each do |instance|
+        json_response = @instances_interface.start(instance['id'], params)
+        render_result = render_with_format(json_response, options)
+        if render_result
+          #return 0
+        elsif !options[:quiet]
+          print green, "Starting instance #{instance['name']}", reset, "\n"
+        end
+        if json_response['success'] == false
+          bad_responses << json_response
+          if !options[:quiet]
+            print_rest_errors(json_response)
+          end
+        end
+      end
+      if !bad_responses.empty?
+        return 1
       end
       return 0
     rescue RestClient::Exception => e
@@ -1410,10 +1465,16 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
+      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+        params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
+      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Start an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1422,19 +1483,41 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart this instance?", options)
-        exit 1
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
       end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.restart(instance['id'], params)
+        print_h1 "DRY RUN"
+        instances.each do |instance|
+          print_dry_run @instances_interface.dry.restart(instance['id'], params), false
+        end
         return 0
       end
-      json_response = @instances_interface.restart(instance['id'], params)
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        print green, "Restarting instance #{instance['name']}", reset, "\n"
+      bad_responses = []
+      instances.each do |instance|
+        json_response = @instances_interface.restart(instance['id'], params)
+        render_result = render_with_format(json_response, options)
+        if render_result
+          #return 0
+        elsif !options[:quiet]
+          print green, "Restarting instance #{instance['name']}", reset, "\n"
+        end
+        if json_response['success'] == false
+          bad_responses << json_response
+          if !options[:quiet]
+            print_rest_errors(json_response)
+          end
+        end
+      end
+      if !bad_responses.empty?
+        return 1
       end
       return 0
     rescue RestClient::Exception => e
@@ -1460,17 +1543,30 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to suspend this instance?", options)
-        exit 1
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to suspend #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
       end
+
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.suspend(instance['id'], params)
+        print_dry_run @instances_interface.dry.suspend(instances.collect {|it| it['id'] }, params)
         return
       end
-      json_response = @instances_interface.suspend(instance['id'], params)
+      json_response = @instances_interface.suspend(instances.collect {|it| it['id'] }, params)
       if options[:json]
         puts as_json(json_response, options)
+      elsif !options[:quiet]
+        if instances.size == 1
+          print_green_success "Suspended instance #{instances[0]['name']}"
+        else
+          print_green_success "Suspended #{instances.size} instances"
+        end
       end
       return 0
     rescue RestClient::Exception => e
@@ -1493,17 +1589,29 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
-      # unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to eject this instance?", options)
-      #   exit 1
-      # end
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to eject #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
+      end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.eject(instance['id'], params)
+        print_dry_run @instances_interface.dry.eject(instances.collect {|it| it['id'] }, params)
         return
       end
-      json_response = @instances_interface.eject(instance['id'], params)
+      json_response = @instances_interface.eject(instances.collect {|it| it['id'] }, params)
       if options[:json]
         puts as_json(json_response, options)
+      elsif !options[:quiet]
+        if instances.size == 1
+          print_green_success "Ejected instance #{instances[0]['name']}"
+        else
+          print_green_success "Ejected #{instances.size} instances"
+        end
       end
       return 0
     rescue RestClient::Exception => e
@@ -1517,10 +1625,16 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+        params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
       opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
+      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Stop service on an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1529,21 +1643,44 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop service on this instance?", options)
-        exit 1
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop service on #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
       end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.stop(instance['id'], params)
+        print_h1 "DRY RUN"
+        instances.each do |instance|
+          print_dry_run @instances_interface.dry.stop(instance['id'], params), false
+        end
         return 0
       end
-      json_response = @instances_interface.stop(instance['id'], params)
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        print green, "Stopping service on instance #{instance['name']}", reset, "\n"
+      bad_responses = []
+      instances.each do |instance|
+        json_response = @instances_interface.stop(instance['id'], params)
+        render_result = render_with_format(json_response, options)
+        if render_result
+          #return 0
+        elsif !options[:quiet]
+          print green, "Stopping service on instance #{instance['name']}", reset, "\n"
+        end
+        if json_response['success'] == false
+          bad_responses << json_response
+          if !options[:quiet]
+            print_rest_errors(json_response)
+          end
+        end
+      end
+      if !bad_responses.empty?
+        return 1
       end
       return 0
+      
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1551,11 +1688,13 @@ class Morpheus::Cli::Instances
   end
 
   def start_service(args)
-    params = {'server' => true}
+    params = {'server' => true} # server is true eh? so start-service is the same as start
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:quiet, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Start service on an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1564,17 +1703,43 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start service on #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
+      end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.start(instance['id'], params)
+        print_h1 "DRY RUN"
+        instances.each do |instance|
+          print_dry_run @instances_interface.dry.start(instance['id'], params), false
+        end
         return 0
       end
-      json_response = @instances_interface.start(instance['id'], params)
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        print green, "Starting service on instance #{instance['name']}", reset, "\n"
+      bad_responses = []
+      instances.each do |instance|
+        json_response = @instances_interface.start(instance['id'], params)
+        render_result = render_with_format(json_response, options)
+        if render_result
+          #return 0
+        elsif !options[:quiet]
+          print green, "Starting service on instance #{instance['name']}", reset, "\n"
+        end
+        if json_response['success'] == false
+          bad_responses << json_response
+          if !options[:quiet]
+            print_rest_errors(json_response)
+          end
+        end
+      end
+      if !bad_responses.empty?
+        return 1
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1586,10 +1751,16 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
+      opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
+      opts.on('--muteMonitoring [on|off]', String, "Mute monitoring. Default is off.") do |val|
+        params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.add_hidden_option('muteMonitoring') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Restart service on an instance.\n" +
+                    "[name] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1598,19 +1769,41 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart service on this instance?", options)
-        exit 1
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart service on #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
       end
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.restart(instance['id'], params)
+        print_h1 "DRY RUN"
+        instances.each do |instance|
+          print_dry_run @instances_interface.dry.restart(instance['id'], params), false
+        end
         return 0
       end
-      json_response = @instances_interface.restart(instance['id'], params)
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        print green, "Restarting service on instance #{instance['name']}", reset, "\n"
+      bad_responses = []
+      instances.each do |instance|
+        json_response = @instances_interface.restart(instance['id'], params)
+        render_result = render_with_format(json_response, options)
+        if render_result
+          #return 0
+        elsif !options[:quiet]
+          print green, "Restarting service on instance #{instance['name']}", reset, "\n"
+        end
+        if json_response['success'] == false
+          bad_responses << json_response
+          if !options[:quiet]
+            print_rest_errors(json_response)
+          end
+        end
+      end
+      if !bad_responses.empty?
+        return 1
       end
       return 0
     rescue RestClient::Exception => e
@@ -1684,7 +1877,7 @@ class Morpheus::Cli::Instances
         action_id = val.to_s
       end
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
-      opts.footer = "Execute an action for a instance or instances"
+      opts.footer = "Execute an action for one or many instances."
     end
     optparse.parse!(args)
     if args.count < 1

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -83,9 +83,7 @@ module Morpheus::Cli::PrintHelper
     print out
   end
 
-  # @deprecated, use ErrorHandler.print_rest_exception()
   def print_rest_exception(e, options={})
-    # ugh, time to clean this stuff up
     if respond_to?(:my_terminal)
       Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).print_rest_exception(e, options)
     else
@@ -93,6 +91,14 @@ module Morpheus::Cli::PrintHelper
     end
   end
 
+  def print_rest_errors(errors, options={})
+    if respond_to?(:my_terminal)
+      Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).print_rest_errors(errors, options)
+    else
+      Morpheus::Cli::ErrorHandler.new.print_rest_errors(errors, options)
+    end
+  end
+
   def print_dry_run(opts, command_string=nil)
     http_method = opts[:method]
     url = opts[:url]
@@ -104,10 +110,12 @@ module Morpheus::Cli::PrintHelper
     end
     request_string = "#{http_method.to_s.upcase} #{url}".strip
     payload = opts[:payload] || opts[:body]
-    if command_string
-      print_h1 "DRY RUN > #{command_string}"
-    else
-      print_h1 "DRY RUN"
+    if command_string != false
+      if command_string
+        print_h1 "DRY RUN > #{command_string}"
+      else
+        print_h1 "DRY RUN"
+      end
     end
     print cyan
     print "Request: ", "\n"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.4"
+    VERSION = "3.6.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.5
 platform: ruby
 authors:
 - David Estes