morpheus-cli 4.2.20 → 5.0.2

data/lib/morpheus/cli/groups.rb

@@ -52,7 +52,7 @@ class Morpheus::Cli::Groups
     end
     json_response = @groups_interface.list(params)
     exit_code, err = 0, nil
-    render_response(json_response, options) do
+    render_response(json_response, options, "groups") do
       groups = json_response['groups']
       subtitles = []
       subtitles += parse_list_subtitles(options)

data/lib/morpheus/cli/health_command.rb

@@ -475,8 +475,8 @@ class Morpheus::Cli::HealthCommand
       opts.footer = "List health logs. These are the logs of the morpheus appliance itself."
     end
     optparse.parse!(args)
-    if args.count != 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
+    if args.count > 0
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/hosts.rb

@@ -16,10 +16,11 @@ class Morpheus::Cli::Hosts
   include Morpheus::Cli::LogsHelper
   set_command_name :hosts
   set_command_description "View and manage hosts (servers)."
-  register_subcommands :list, :count, :get, :view, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, :run_workflow, :make_managed, :upgrade_agent
-  register_subcommands :'types' => :list_types
-  register_subcommands :exec => :execution_request
-  register_subcommands :wiki, :update_wiki
+  register_subcommands :list, :count, :get, :view, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, 
+                       :run_workflow, :make_managed, :upgrade_agent, :snapshots,
+                       {:'types' => :list_types},
+                       {:exec => :execution_request},
+                       :wiki, :update_wiki
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -108,17 +109,29 @@ class Morpheus::Cli::Hosts
       opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
         options[:details] = true
       end
+      opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
+      end
       opts.on('--tag-compliant', "Displays only servers that are valid according to applied tag policies. Does not show servers that do not have tag policies." ) do
         params[:tagCompliant] = true
       end
       opts.on('--non-tag-compliant', "Displays only servers with tag compliance warnings." ) do
         params[:tagCompliant] = false
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List hosts."
     end
     optparse.parse!(args)
     connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       params.merge!(parse_list_options(options))
       account = nil
@@ -159,6 +172,11 @@ class Morpheus::Cli::Hosts
           params['clusterId'] = cluster['id']
         end
       end
+      if options[:tags] && !options[:tags].empty?
+        options[:tags].each do |k,v|
+          params['tags.' + k] = v
+        end
+      end
 
       @servers_interface.setopts(options)
       if options[:dry_run]
@@ -240,31 +258,66 @@ class Morpheus::Cli::Hosts
             end
             row = {
               id: server['id'],
-              tenant: server['account'] ? server['account']['name'] : server['accountId'],
               name: server['name'],
+              hostname: server['hostname'],
               platform: server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A',
-              cloud: server['zone'] ? server['zone']['name'] : '',
               type: server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged',
+              tenant: server['account'] ? server['account']['name'] : server['accountId'],
+              owner: server['owner'] ? server['owner']['username'] : server['owner'],
+              cloud: server['zone'] ? server['zone']['name'] : '',
+              ip: server['externalIp'],
+              internal_ip: server['internalIp'],
               nodes: server['containers'] ? server['containers'].size : '',
-              status: format_server_status(server, cyan),
+              # status: format_server_status(server, cyan),
+              status: (options[:details]||options[:all_fields]) ? format_server_status(server, cyan) : format_server_status_friendly(server, cyan),
               power: format_server_power_state(server, cyan),
               cpu: cpu_usage_str + cyan,
               memory: memory_usage_str + cyan,
-              storage: storage_usage_str + cyan
+              storage: storage_usage_str + cyan,
+              created: format_local_dt(server['dateCreated']),
+              updated: format_local_dt(server['lastUpdated']),
             }
             row
           }
-          columns = [:id, :name, :type, :cloud, :nodes, :status, :power]
-          if multi_tenant
-            columns.insert(4, :tenant)
+          # columns = [:id, :name, :type, :cloud, :ip, :internal_ip, :nodes, :status, :power]
+          columns = {
+            "ID" => :id,
+            "Name" => :name,
+            "Hostname" => :hostname,
+            "Type" => :type,
+            "Owner" => :owner,
+            "Tenant" => :tenant,
+            "Cloud" => :cloud,
+            "IP" => :ip,
+            "Private IP" => :internal_ip,
+            "Nodes" => :nodes,
+            "Status" => :status,
+            "Power" => :power,
+            "CPU" => :cpu,
+            "Memory" => :memory,
+            "Storage" => :storage,
+            "Created" => :created,
+            "Updated" => :updated,
+          }
+          if options[:details] != true
+            columns.delete("Hostname")
+            columns.delete("Private IP")
+            columns.delete("Owner")
+            columns.delete("Tenant")
+            columns.delete("Power")
+            columns.delete("Created")
+            columns.delete("Updated")
           end
-          columns += [:cpu, :memory, :storage]
-          # custom pretty table columns ...
-          if options[:include_fields]
-            columns = options[:include_fields]
+          if !multi_tenant
+            columns.delete("Tenant")
           end
+          # columns += [:cpu, :memory, :storage]
+          # # custom pretty table columns ...
+          # if options[:include_fields]
+          #   columns = options[:include_fields]
+          # end
           print cyan
-          print as_pretty_table(rows, columns, options)
+          print as_pretty_table(rows, columns.upcase_keys!, options)
           print reset
           print_results_pagination(json_response)
         end
@@ -392,6 +445,9 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is provisioned,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "provisioned,failed"
         if !val.to_s.empty?
@@ -453,22 +509,37 @@ class Morpheus::Cli::Hosts
       title = "Host Details"
       print_h1 title, [], options
       print cyan
-      print_description_list({
+      server_columns = {
         "ID" => 'id',
         "Name" => 'name',
+        "Hostname" => 'hostname',
         "Description" => 'description',
-        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
+        "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         #"Group" => lambda {|it| it['group'] ? it['group']['name'] : '' },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
+        "IP" => lambda {|it| it['externalIp'] },
+        "Private IP" => lambda {|it| it['internalIp'] },
         "Type" => lambda {|it| it['computeServerType'] ? it['computeServerType']['name'] : 'unmanaged' },
         "Platform" => lambda {|it| it['serverOs'] ? it['serverOs']['name'].upcase : 'N/A' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Agent" => lambda {|it| it['agentInstalled'] ? "#{server['agentVersion'] || ''} updated at #{format_local_dt(server['lastAgentUpdate'])}" : '(not installed)' },
-        "Status" => lambda {|it| format_server_status(it) },
         "Nodes" => lambda {|it| it['containers'] ? it['containers'].size : 0 },
-        "Power" => lambda {|it| format_server_power_state(it) },
-      }, server)
-      
+        # "Status" => lambda {|it| format_server_status(it) },
+        # "Power" => lambda {|it| format_server_power_state(it) },
+        "Status" => lambda {|it| format_server_status_friendly(it) }, # combo
+      }
+      server_columns.delete("Hostname") if server['hostname'].to_s.empty? || server['hostname'] == server['name']
+      server_columns.delete("IP") if server['externalIp'].to_s.empty?
+      server_columns.delete("Private IP") if server['internalIp'].to_s.empty?
+      # server_columns.delete("Tenant") if multi_tenant != true
+      server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
+      server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
+
+      print_description_list(server_columns, server)
+
       if server['statusMessage']
         print_h2 "Status Message", options
         if server['status'] == 'failed'
@@ -485,6 +556,16 @@ class Morpheus::Cli::Hosts
 
       print_h2 "Host Usage", options
       print_stats_usage(stats)
+
+      if options[:include_costs]
+        print_h2 "Host Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, server)
+      end
+
       print reset, "\n"
 
 
@@ -1781,6 +1862,53 @@ class Morpheus::Cli::Hosts
     end
   end
 
+  def snapshots(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      # no pagination yet
+      # build_standard_list_options(opts, options)
+      build_standard_get_options(opts, options)
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    begin
+      server = find_host_by_name_or_id(args[0])
+      return 1 if server.nil?
+      params = {}
+      @servers_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.snapshots(server['id'], params)
+        return
+      end
+      json_response = @servers_interface.snapshots(server['id'], params)
+      snapshots = json_response['snapshots']      
+      render_response(json_response, options, 'snapshots') do
+        print_h1 "Snapshots: #{server['name']}", [], options
+        if snapshots.empty?
+          print cyan,"No snapshots found",reset,"\n"
+        else
+          snapshot_column_definitions = {
+            "ID" => lambda {|it| it['id'] },
+            "Name" => lambda {|it| it['name'] },
+            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
+            "Status" => lambda {|it| format_snapshot_status(it) }
+          }
+          print cyan
+          print as_pretty_table(snapshots, snapshot_column_definitions.upcase_keys!, options)
+          print_results_pagination({size: snapshots.size, total: snapshots.size})
+        end
+        print reset, "\n"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
   def find_host_by_id(id)
@@ -1897,11 +2025,38 @@ class Morpheus::Cli::Hosts
 
   def format_server_status(server, return_color=cyan)
     out = ""
-    status_string = server['status']
-    # todo: colorize, upcase?
-    out << status_string.to_s
+    status_string = server['status'].to_s.downcase
+    if status_string == 'provisioned'
+      out = "#{cyan}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'provisioning'
+      out = "#{cyan}#{status_string.upcase}#{cyan}"
+    elsif status_string == 'failed' or status_string == 'error'
+      out = "#{red}#{status_string.upcase}#{return_color}"
+    else
+      out = "#{yellow}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
+  def format_server_status_friendly(server, return_color=cyan)
+    out = ""
+    status_string = server['status'].to_s.downcase
+    if status_string == 'provisioned'
+      # out = format_server_power_state(server, return_color)
+      # make it looks like format_instance_status
+      if server['powerState'] == 'on'
+        out << "#{green}RUNNING#{return_color}"
+      elsif server['powerState'] == 'off'
+        out << "#{red}STOPPED#{return_color}"
+      else
+        out << "#{white}#{server['powerState'].to_s.upcase}#{return_color}"
+      end
+    else
+      out = format_server_status(server, return_color)
+    end
     out
   end
+  
 
    def make_managed_option_types(connected=true)
     [

data/lib/morpheus/cli/instances.rb

@@ -19,7 +19,7 @@ class Morpheus::Cli::Instances
                        :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, 
                        :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
                        :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
-                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, 
+                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :snapshots,
                        :console, :status_check, {:containers => :list_containers}, 
                        :scaling, {:'scaling-update' => :scaling_update},
                        :wiki, :update_wiki,
@@ -92,11 +92,28 @@ class Morpheus::Cli::Instances
       opts.on('--pending-removal-only', "Only instances pending removal.") do
         options[:deleted] = true
       end
+      opts.on('--labels label',String, "Filter by labels (keywords).") do |val|
+        val.split(",").each do |k|
+          options[:labels] ||= []
+          options[:labels] << k.strip
+        end
+      end
+      opts.on('--tags Name=Value',String, "Filter by tags (metadata name value pairs).") do |val|
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List instances."
     end
     optparse.parse!(args)
-    verify_args!(args:args, count:0, optparse:optparse)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params.merge!(parse_list_options(options))
@@ -129,7 +146,13 @@ class Morpheus::Cli::Instances
 
       params['showDeleted'] = true if options[:showDeleted]
       params['deleted'] = true if options[:deleted]
-      
+      params['labels'] = options[:labels] if options[:labels]
+      if options[:tags]
+        options[:tags].each do |k,v|
+          params['tags.' + k] = v
+        end
+      end
+
       @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.list(params)
@@ -344,18 +367,16 @@ class Morpheus::Cli::Instances
       opts.on("--environment ENV", String, "Environment code") do |val|
         options[:environment] = val.to_s
       end
-      opts.on('--metadata LIST', String, "Metadata tags in the format 'name:value, name:value'") do |val|
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
         options[:metadata] = val
       end
-      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        #options[:tags] = val
-        options[:tags] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
       end
-      opts.on('--tags LIST', String, "Tags") do |val|
-        #options[:tags] = val
-        options[:tags] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      opts.add_hidden_option('--metadata')
+      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        options[:labels] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
       end
-      opts.add_hidden_option('--tags')
       opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
         options[:copies] = val.to_i
       end
@@ -525,18 +546,17 @@ class Morpheus::Cli::Instances
       opts.on('--group GROUP', String, "Group Name or ID") do |val|
         options[:group] = val
       end
-      opts.on('--metadata LIST', String, "Metadata tags in the format 'name:value, name:value'") do |val|
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
         options[:metadata] = val
       end
-      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        #params['tags'] = val
-        params['tags'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
       end
-      opts.on('--tags LIST', String, "Tags") do |val|
-        #params['tags'] = val
+      opts.add_hidden_option('--metadata')
+      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        # todo switch this from 'tags' to 'labels'
         params['tags'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
       end
-      opts.add_hidden_option('--tags')
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
       end
@@ -607,6 +627,9 @@ class Morpheus::Cli::Instances
           metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
           metadata_list = metadata_list.collect do |it|
             metadata_pair = it.split(":")
+            if metadata_pair.size == 1 && it.include?("=")
+              metadata_pair = it.split("=")
+            end
             row = {}
             row['name'] = metadata_pair[0].to_s.strip
             row['value'] = metadata_pair[1].to_s.strip
@@ -1148,6 +1171,9 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--scaling', "Display Instance Scaling Settings" ) do
         options[:include_scaling] = true
       end
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
@@ -1249,6 +1275,8 @@ class Morpheus::Cli::Instances
         "Layout" => lambda {|it| it['layout'] ? it['layout']['name'] : '' },
         "Version" => lambda {|it| it['instanceVersion'] },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Environment" => 'instanceContext',
         "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
         "Metadata" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
@@ -1304,6 +1332,16 @@ class Morpheus::Cli::Instances
         print_h2 "Instance Usage", options
         print_stats_usage(stats)
       end
+
+      if options[:include_costs]
+        print_h2 "Instance Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, instance)
+      end
+
       print reset, "\n"
 
       # if options[:include_lb]
@@ -2880,6 +2918,52 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def snapshots(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      # no pagination yet
+      # build_standard_list_options(opts, options)
+      build_standard_get_options(opts, options)
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      params = {}
+      @instances_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.snapshots(instance['id'], params)
+        return
+      end
+      json_response = @instances_interface.snapshots(instance['id'], params)
+      snapshots = json_response['snapshots']      
+      render_response(json_response, options, 'snapshots') do
+        print_h1 "Snapshots: #{instance['name']} (#{instance['instanceType']['name']})", [], options
+        if snapshots.empty?
+          print cyan,"No snapshots found",reset,"\n"
+        else
+          snapshot_column_definitions = {
+            "ID" => lambda {|it| it['id'] },
+            "Name" => lambda {|it| it['name'] },
+            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
+            "Status" => lambda {|it| format_snapshot_status(it) }
+          }
+          print cyan
+          print as_pretty_table(snapshots, snapshot_column_definitions.upcase_keys!, options)
+          print_results_pagination({size: snapshots.size, total: snapshots.size})
+        end
+        print reset, "\n"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def import_snapshot(args)
     options = {}
     query_params = {}
@@ -4006,19 +4090,4 @@ private
     }
   end
 
-  def format_app_deploy_status(status, return_color=cyan)
-    out = ""
-    s = status.to_s.downcase
-    if s == 'deployed'
-      out << "#{green}#{s.upcase}#{return_color}"
-    elsif s == 'open' || s == 'archived' || s == 'committed'
-      out << "#{cyan}#{s.upcase}#{return_color}"
-    elsif s == 'failed'
-      out << "#{red}#{s.upcase}#{return_color}"
-    else
-      out << "#{yellow}#{s.upcase}#{return_color}"
-    end
-    out
-  end
-
 end