morpheus-cli 3.6.28 → 3.6.29

data/lib/morpheus/cli/clouds.rb

@@ -201,6 +201,8 @@ class Morpheus::Cli::Clouds
         "Location" => 'location',
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Groups" => lambda {|it| it['groups'].collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
+        #"Owner" => lambda {|it| it['owner'].instance_of?(Hash) ? it['owner']['name'] : it['ownerId'] },
+        "Tenant" => lambda {|it| it['account'].instance_of?(Hash) ? it['account']['name'] : it['accountId'] },
         "Enabled" => lambda {|it| format_boolean(it['enabled']) },
         "Status" => lambda {|it| format_cloud_status(it) }
       }

data/lib/morpheus/cli/hosts.rb

@@ -804,7 +804,7 @@ class Morpheus::Cli::Hosts
         end
       else
         if params.empty?
-          print_red_alert "Specify atleast one option to update"
+          print_red_alert "Specify at least one option to update"
           puts optparse
           return 1
         end
@@ -1173,7 +1173,7 @@ class Morpheus::Cli::Hosts
 
     host = find_host_by_name_or_id(args[0])
     return 1 if host.nil?
-    workflow = find_workflow_by_name(args[1])
+    workflow = find_workflow_by_name_or_id(args[1])
     return 1 if workflow.nil?
 
     # support -O options as arbitrary params
@@ -1485,16 +1485,41 @@ class Morpheus::Cli::Hosts
     return cloud_type
   end
 
-  def find_workflow_by_name(name)
-    task_set_results = @task_sets_interface.get(name)
-    if !task_set_results['taskSets'].nil? && !task_set_results['taskSets'].empty?
-      return task_set_results['taskSets'][0]
+  def find_workflow_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_workflow_by_id(val)
     else
-      print_red_alert "Workflow not found by name #{name}"
-      exit 1
+      return find_workflow_by_name(val)
+    end
+  end
+
+  def find_workflow_by_id(id)
+    begin
+      json_response = @task_sets_interface.get(id.to_i)
+      return json_response['taskSet']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Workflow not found by id #{id}"
+      else
+        raise e
+      end
     end
   end
 
+  def find_workflow_by_name(name)
+    workflows = @task_sets_interface.get({name: name.to_s})['taskSets']
+    if workflows.empty?
+      print_red_alert "Workflow not found by name #{name}"
+      return nil
+    elsif workflows.size > 1
+      print_red_alert "#{workflows.size} workflows by name #{name}"
+      print_workflows_table(workflows, {color: red})
+      print reset,"\n\n"
+      return nil
+    else
+      return workflows[0]
+    end
+  end
 
   def format_server_power_state(server, return_color=cyan)
     out = ""

data/lib/morpheus/cli/instances.rb

@@ -427,11 +427,11 @@ class Morpheus::Cli::Instances
   end
 
   def update(args)
-    usage = "Usage: morpheus instances update [name] [options]"
+    usage = "Usage: morpheus instances update [instance] [options]"
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on('--name VALUE', String, "Name") do |val|
         params['displayName'] = val
       end
@@ -508,7 +508,7 @@ class Morpheus::Cli::Instances
         end
       else
         if params.empty?
-          print_red_alert "Specify atleast one option to update"
+          print_red_alert "Specify at least one option to update"
           puts optparse
           exit 1
         end
@@ -537,11 +537,11 @@ class Morpheus::Cli::Instances
   end
 
   def update_notes(args)
-    usage = "Usage: morpheus instances update-notes [name] [options]"
+    usage = "Usage: morpheus instances update-notes [instance] [options]"
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on('--notes VALUE', String, "Notes content (Markdown)") do |val|
         params['notes'] = val
       end
@@ -616,7 +616,7 @@ class Morpheus::Cli::Instances
     out = ""
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:quiet, :json, :remote]) # no :dry_run, just do it man
     end
     optparse.parse!(args)
@@ -648,7 +648,7 @@ class Morpheus::Cli::Instances
   def stats(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -699,7 +699,7 @@ class Morpheus::Cli::Instances
   def console(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on( '-n', '--node NODE_ID', "Scope console to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
       end
@@ -736,7 +736,7 @@ class Morpheus::Cli::Instances
   def logs(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on( '-n', '--node NODE_ID', "Scope logs to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
       end
@@ -864,7 +864,7 @@ class Morpheus::Cli::Instances
         end
         return
       end
-      instance = find_instance_by_name_or_id(arg)
+      instance = find_instance_by_name_or_id(arg =~ /\A\d{1,}\Z/ ? arg.to_i : arg)
       @instances_interface.setopts(options)
       json_response = @instances_interface.get(instance['id'])
       if options[:quiet]
@@ -1059,7 +1059,7 @@ class Morpheus::Cli::Instances
   def list_containers(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1152,7 +1152,7 @@ class Morpheus::Cli::Instances
   def backups(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1245,7 +1245,7 @@ class Morpheus::Cli::Instances
   def clone(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] -g GROUP")
+      opts.banner = subcommand_usage("[instance] -g GROUP")
       build_option_type_options(opts, options, clone_instance_option_types(false))
       opts.on( '-g', '--group GROUP', "Group Name or ID for the new instance" ) do |val|
         options[:group] = val
@@ -1312,7 +1312,7 @@ class Morpheus::Cli::Instances
   def envs(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1353,7 +1353,7 @@ class Morpheus::Cli::Instances
     options = {}
 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] VAR VALUE [-e]")
+      opts.banner = subcommand_usage("[instance] VAR VALUE [-e]")
       opts.on( '-e', "Exportable" ) do |exportable|
         options[:export] = exportable
       end
@@ -1394,7 +1394,7 @@ class Morpheus::Cli::Instances
   def delenv(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] VAR")
+      opts.banner = subcommand_usage("[instance] VAR")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1428,7 +1428,7 @@ class Morpheus::Cli::Instances
     params = {'server' => true, 'muteMonitoring' => false}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       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
@@ -1496,10 +1496,10 @@ class Morpheus::Cli::Instances
     params = {'server' => true}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       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 [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1556,7 +1556,7 @@ class Morpheus::Cli::Instances
     params = {'server' => true, 'muteMonitoring' => true}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
@@ -1566,7 +1566,7 @@ class Morpheus::Cli::Instances
       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 an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1623,13 +1623,13 @@ class Morpheus::Cli::Instances
     params = {'server' => true, 'muteMonitoring' => false}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       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
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Suspend an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1674,10 +1674,10 @@ class Morpheus::Cli::Instances
     params = {'server' => true}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
       opts.footer = "Eject an instance.\n" +
-                    "[name] is required. This is the name or id of an instance. Supports 1-N [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1722,7 +1722,7 @@ class Morpheus::Cli::Instances
     params = {'server' => false, 'muteMonitoring' => false}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       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
@@ -1732,7 +1732,7 @@ class Morpheus::Cli::Instances
       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 [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1790,10 +1790,10 @@ class Morpheus::Cli::Instances
     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]")
+      opts.banner = subcommand_usage("[instance]")
       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 [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1850,7 +1850,7 @@ class Morpheus::Cli::Instances
     params = {'server' => false, 'muteMonitoring' => true}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on('--mute-monitoring [on|off]', String, "Mute monitoring. Default is on.") do |val|
         params['muteMonitoring'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
@@ -1860,7 +1860,7 @@ class Morpheus::Cli::Instances
       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 [name] arguments."
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -2060,7 +2060,7 @@ class Morpheus::Cli::Instances
   def resize(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -2136,7 +2136,7 @@ class Morpheus::Cli::Instances
   def backup(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -2186,7 +2186,7 @@ class Morpheus::Cli::Instances
     options = {}
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on( '-B', '--keep-backups', "Preserve copy of backups" ) do
         query_params[:keepBackups] = 'on'
       end
@@ -2239,7 +2239,7 @@ class Morpheus::Cli::Instances
   def firewall_disable(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
@@ -2271,7 +2271,7 @@ class Morpheus::Cli::Instances
   def firewall_enable(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
@@ -2303,7 +2303,7 @@ class Morpheus::Cli::Instances
   def security_groups(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -2351,7 +2351,7 @@ class Morpheus::Cli::Instances
     security_group_ids = nil
     clear_or_secgroups_specified = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [-S] [-c]")
+      opts.banner = subcommand_usage("[instance] [-S] [-c]")
       opts.on( '-S', '--secgroups SECGROUPS', "Apply the specified comma separated security group ids" ) do |secgroups|
         security_group_ids = secgroups.split(",")
         clear_or_secgroups_specified = true
@@ -2398,7 +2398,7 @@ class Morpheus::Cli::Instances
   def run_workflow(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [workflow] [options]")
+      opts.banner = subcommand_usage("[instance] [workflow] [options]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -2408,7 +2408,7 @@ class Morpheus::Cli::Instances
     end
     connect(options)
     instance = find_instance_by_name_or_id(args[0])
-    workflow = find_workflow_by_name(args[1])
+    workflow = find_workflow_by_name_or_id(args[1])
     task_types = @tasks_interface.task_types()
     editable_options = []
     workflow['taskSetTasks'].sort{|a,b| a['taskOrder'] <=> b['taskOrder']}.each do |task_set_task|
@@ -2457,7 +2457,7 @@ class Morpheus::Cli::Instances
     options = {}
     storage_provider_id = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on("--storage-provider ID", String, "Optional storage provider") do |val|
         storage_provider_id = val
       end
@@ -2513,7 +2513,7 @@ class Morpheus::Cli::Instances
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Show scaling threshold information for an instance."
     end
@@ -2567,10 +2567,10 @@ class Morpheus::Cli::Instances
   end
 
   def scaling_update(args)
-    usage = "Usage: morpheus instances scaling-update [name] [options]"
+    usage = "Usage: morpheus instances scaling-update [instance] [options]"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_option_type_options(opts, options, instance_scaling_option_types(nil))
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.footer = "Update scaling threshold information for an instance."
@@ -2689,10 +2689,10 @@ class Morpheus::Cli::Instances
 
   def load_balancer_update(args)
     raise "Not Yet Implemented"
-    usage = "Usage: morpheus instances lb-update [name] [options]"
+    usage = "Usage: morpheus instances lb-update [instance] [options]"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       #build_option_type_options(opts, options, instance_load_balancer_option_types(nil))
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.footer = "Assign a load balancer for an instance."
@@ -2770,10 +2770,10 @@ class Morpheus::Cli::Instances
   end
 
   def load_balancer_remove(args)
-    usage = "Usage: morpheus instances lb-remove [name] [options]"
+    usage = "Usage: morpheus instances lb-remove [instance] [options]"
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       build_option_type_options(opts, options, instance_scaling_option_types(nil))
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Remove a load balancer from an instance."
@@ -3273,16 +3273,41 @@ private
     end
   end
 
-  def find_workflow_by_name(name)
-    task_set_results = @task_sets_interface.get(name)
-    if !task_set_results['taskSets'].nil? && !task_set_results['taskSets'].empty?
-      return task_set_results['taskSets'][0]
+  def find_workflow_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_workflow_by_id(val)
     else
-      print_red_alert "Workflow not found by name #{name}"
-      exit 1
+      return find_workflow_by_name(val)
     end
   end
 
+  def find_workflow_by_id(id)
+    begin
+      json_response = @task_sets_interface.get(id.to_i)
+      return json_response['taskSet']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Workflow not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_workflow_by_name(name)
+    workflows = @task_sets_interface.get({name: name.to_s})['taskSets']
+    if workflows.empty?
+      print_red_alert "Workflow not found by name #{name}"
+      return nil
+    elsif workflows.size > 1
+      print_red_alert "#{workflows.size} workflows by name #{name}"
+      print_workflows_table(workflows, {color: red})
+      print reset,"\n\n"
+      return nil
+    else
+      return workflows[0]
+    end
+  end
 
   def format_instance_status(instance, return_color=cyan)
     out = ""