morpheus-cli 4.0.0.1 → 4.1.0

data/lib/morpheus/cli/containers_command.rb

@@ -12,12 +12,13 @@ class Morpheus::Cli::ContainersCommand
 
   set_command_name :containers
 
-  register_subcommands :get, :stop, :start, :restart, :suspend, :eject, :action, :actions
+  register_subcommands :get, :stop, :start, :restart, :suspend, :eject, :action, :actions, :logs
   register_subcommands :exec => :execution_request
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @containers_interface = @api_client.containers
+    @logs_interface = @api_client.logs
     @execution_request_interface = @api_client.execution_request
   end
   
@@ -28,7 +29,7 @@ class Morpheus::Cli::ContainersCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[id]")
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
@@ -504,6 +505,73 @@ class Morpheus::Cli::ContainersCommand
     return 0
   end
 
+  def logs(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List logs for a container.\n" +
+                    "[id] is required. This is the id of a container."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts_error "[id] argument is required"
+      puts_error optparse
+      return 1
+    end
+    connect(options)
+    id_list = parse_id_list(args)
+    begin
+      containers = id_list # heh
+      params = {}
+      params.merge!(parse_list_options(options))
+      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @logs_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @logs_interface.dry.container_logs(containers, params)
+        return
+      end
+      json_response = @logs_interface.container_logs(containers, params)
+      render_result = render_with_format(json_response, options, 'data')
+      return 0 if render_result
+
+      logs = json_response
+      title = "Container Logs: #{containers.join(', ')}"
+      subtitles = parse_list_subtitles(options)
+      if params[:query]
+        subtitles << "Search: #{params[:query]}".strip
+      end
+      # todo: startMs, endMs, sorts insteaad of sort..etc
+      print_h1 title, subtitles, options
+      if logs['data'].empty?
+        puts "#{cyan}No logs found.#{reset}"
+      else
+        logs['data'].reverse.each do |log_entry|
+          log_level = ''
+          case log_entry['level']
+          when 'INFO'
+            log_level = "#{blue}#{bold}INFO#{reset}"
+          when 'DEBUG'
+            log_level = "#{white}#{bold}DEBUG#{reset}"
+          when 'WARN'
+            log_level = "#{yellow}#{bold}WARN#{reset}"
+          when 'ERROR'
+            log_level = "#{red}#{bold}ERROR#{reset}"
+          when 'FATAL'
+            log_level = "#{red}#{bold}FATAL#{reset}"
+          end
+          puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}"
+        end
+        print_results_pagination({'meta'=>{'total'=>json_response['total'],'size'=>json_response['data'].size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
+      end
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def execution_request(args)
     options = {}
     params = {}

data/lib/morpheus/cli/hosts.rb

@@ -39,6 +39,7 @@ class Morpheus::Cli::Hosts
     @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
     @active_group_id = Morpheus::Cli::Groups.active_group
     @execution_request_interface = @api_client.execution_request
+    @clusters_interface = @api_client.clusters
   end
 
   def handle(args)
@@ -74,6 +75,10 @@ class Morpheus::Cli::Hosts
       opts.on( '-i', '--ip IPADDRESS', "Filter by IP Address" ) do |val|
         params[:ip] = val
       end
+      opts.on( '--cluster CLUSTER', '--cluster CLUSTER', "Filter by Cluster Name or ID" ) do |val|
+        # params[:clusterId] = val
+        options[:cluster] = val
+      end
       opts.on( '', '--vm', "Show only virtual machines" ) do |val|
         params[:vm] = true
       end
@@ -134,6 +139,17 @@ class Morpheus::Cli::Hosts
         return if created_by_ids.nil?
         params['createdBy'] = created_by_ids
       end
+      
+      cluster = nil
+      if options[:cluster]
+        if options[:cluster].to_s =~ /\A\d{1,}\Z/
+          params['clusterId'] = options[:cluster]
+        else
+          cluster = find_cluster_by_name_or_id(options[:cluster])
+          return 1 if cluster.nil?
+          params['clusterId'] = cluster['id']
+        end
+      end
 
       @servers_interface.setopts(options)
       if options[:dry_run]
@@ -171,6 +187,11 @@ class Morpheus::Cli::Hosts
         if cloud
           subtitles << "Cloud: #{cloud['name']}".strip
         end
+        if cluster
+          subtitles << "Cluster: #{cluster['name']}".strip
+        elsif params['clusterId']
+          subtitles << "Cluster: #{params['clusterId']}".strip
+        end
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
         if servers.empty?
@@ -182,10 +203,12 @@ class Morpheus::Cli::Hosts
           all_stats = json_response['stats'] || {} 
           servers.each do |it|
             found_stats = all_stats[it['id'].to_s] || all_stats[it['id']]
-            if !it['stats']
-              it['stats'] = found_stats # || {}
-            else
-              it['stats'] = found_stats.merge!(it['stats'])
+            if found_stats
+              if !it['stats']
+                it['stats'] = found_stats # || {}
+              else
+                it['stats'] = found_stats.merge!(it['stats'])
+              end
             end
           end
 
@@ -214,7 +237,7 @@ class Morpheus::Cli::Hosts
               cloud: server['zone'] ? server['zone']['name'] : '',
               type: server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged',
               nodes: server['containers'] ? server['containers'].size : '',
-              status: format_host_status(server, cyan),
+              status: format_server_status(server, cyan),
               power: format_server_power_state(server, cyan),
               cpu: cpu_usage_str + cyan,
               memory: memory_usage_str + cyan,
@@ -431,7 +454,7 @@ class Morpheus::Cli::Hosts
         "Platform" => lambda {|it| it['serverOs'] ? it['serverOs']['name'].upcase : 'N/A' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
         "Agent" => lambda {|it| it['agentInstalled'] ? "#{server['agentVersion'] || ''} updated at #{format_local_dt(server['lastAgentUpdate'])}" : '(not installed)' },
-        "Status" => lambda {|it| format_host_status(it) },
+        "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)
@@ -524,7 +547,7 @@ class Morpheus::Cli::Hosts
       title = "Host Stats: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
       print_h1 title, [], options
       puts cyan + "Power: ".rjust(12) + format_server_power_state(server).to_s
-      puts cyan + "Status: ".rjust(12) + format_host_status(server).to_s
+      puts cyan + "Status: ".rjust(12) + format_server_status(server).to_s
       puts cyan + "Nodes: ".rjust(12) + (server['containers'] ? server['containers'].size : '').to_s
       #print_h2 "Host Usage", options
       print_stats_usage(stats, {label_width: 10})
@@ -541,7 +564,7 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -552,29 +575,30 @@ class Morpheus::Cli::Hosts
     begin
       server = find_host_by_name_or_id(args[0])
       params = {}
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.server_logs([server['id']], params)
         return
       end
-      logs = @logs_interface.server_logs([server['id']], params)
-      output = ""
-      if options[:json]
-        output << JSON.pretty_generate(logs)
+      json_response = @logs_interface.server_logs([server['id']], params)
+      render_result = render_with_format(json_response, options, 'data')
+      return 0 if render_result
+      
+      logs = json_response
+      title = "Host Logs: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
+      subtitles = parse_list_subtitles(options)
+      if params[:query]
+        subtitles << "Search: #{params[:query]}".strip
+      end
+      # todo: startMs, endMs, sorts insteaad of sort..etc
+      print_h1 title, subtitles, options
+      if logs['data'].empty?
+        puts "#{cyan}No logs found.#{reset}"
       else
-        title = "Host Logs: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
-        subtitles = []
-        if params[:query]
-          subtitles << "Search: #{params[:query]}".strip
-        end
-        # todo: startMs, endMs, sorts insteaad of sort..etc
-        print_h1 title, subtitles, options
         if logs['data'].empty?
-          output << "#{cyan}No logs found.#{reset}\n"
+          puts "#{cyan}No logs found.#{reset}"
         else
           logs['data'].reverse.each do |log_entry|
             log_level = ''
@@ -590,11 +614,13 @@ class Morpheus::Cli::Hosts
             when 'FATAL'
               log_level = "#{red}#{bold}FATAL#{reset}"
             end
-            output << "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}\n"
+            puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}"
           end
+          print_results_pagination({'meta'=>{'total'=>json_response['total'],'size'=>json_response['data'].size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
         end
+        print reset, "\n"
+        return 0
       end
-      print output, reset, "\n"
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -749,7 +775,7 @@ class Morpheus::Cli::Hosts
         end
 
         # prompt for volumes
-        volumes = prompt_volumes(service_plan, options, @api_client, {})
+        volumes = prompt_volumes(service_plan, options, @api_client, {zoneId: cloud_id, serverTypeId: server_type['id'], siteId: group_id})
         if !volumes.empty?
           payload['volumes'] = volumes
         end
@@ -1809,40 +1835,30 @@ class Morpheus::Cli::Hosts
     return cloud_type
   end
 
-  def find_workflow_by_name_or_id(val)
+  def find_cluster_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
-      return find_workflow_by_id(val)
+      find_cluster_by_id(val)
     else
-      return find_workflow_by_name(val)
+      find_cluster_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
+  def find_cluster_by_id(id)
+    json_results = @clusters_interface.get(id.to_i)
+    if json_results['cluster'].empty?
+      print_red_alert "Cluster not found by id #{id}"
+      exit 1
     end
+    json_results['cluster']
   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]
+  def find_cluster_by_name(name)
+    json_results = @clusters_interface.list({name: name})
+    if json_results['clusters'].empty? || json_results['clusters'].count > 1
+      print_red_alert "Cluster not found by name #{name}"
+      exit 1
     end
+    json_results['clusters'][0]
   end
 
   def format_server_power_state(server, return_color=cyan)
@@ -1852,12 +1868,12 @@ class Morpheus::Cli::Hosts
     elsif server['powerState'] == 'off'
       out << "#{red}OFF#{return_color}"
     else
-      out << "#{white}#{server['powerState'].upcase}#{return_color}"
+      out << "#{white}#{server['powerState'].to_s.upcase}#{return_color}"
     end
     out
   end
 
-  def format_host_status(server, return_color=cyan)
+  def format_server_status(server, return_color=cyan)
     out = ""
     status_string = server['status']
     # todo: colorize, upcase?

data/lib/morpheus/cli/instances.rb

@@ -1017,7 +1017,7 @@ class Morpheus::Cli::Instances
       opts.on( '-n', '--node NODE_ID', "Scope logs to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
       end
-      build_common_options(opts, options, [:list, :query, :json, :csv, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -1039,42 +1039,42 @@ class Morpheus::Cli::Instances
         print_dry_run @logs_interface.dry.container_logs(container_ids, params)
         return
       end
-      logs = @logs_interface.container_logs(container_ids, params)
-      output = ""
-      if options[:json]
-        puts as_json(logs, options)
-        return 0
+      json_response = @logs_interface.container_logs(container_ids, params)
+      render_result = render_with_format(json_response, options, 'data')
+      return 0 if render_result
+      
+      logs = json_response
+      title = "Instance Logs: #{instance['name']} (#{instance['instanceType'] ? instance['instanceType']['name'] : ''})"
+      subtitles = parse_list_subtitles(options)
+      if params[:query]
+        subtitles << "Search: #{params[:query]}".strip
+      end
+      # todo: startMs, endMs, sorts insteaad of sort..etc
+      print_h1 title, subtitles, options
+      if logs['data'].empty?
+        puts "#{cyan}No logs found.#{reset}"
       else
-        title = "Instance Logs: #{instance['name']} (#{instance['instanceType'] ? instance['instanceType']['name'] : ''})"
-        subtitles = []
-        if params[:query]
-          subtitles << "Search: #{params[:query]}".strip
-        end
-        # todo: startMs, endMs, sorts insteaad of sort..etc
-        print_h1 title, subtitles, options
-        if logs['data'].empty?
-          puts "#{cyan}No logs found.#{reset}"
-        else
-          logs['data'].reverse.each do |log_entry|
-            log_level = ''
-            case log_entry['level']
-            when 'INFO'
-              log_level = "#{blue}#{bold}INFO#{reset}"
-            when 'DEBUG'
-              log_level = "#{white}#{bold}DEBUG#{reset}"
-            when 'WARN'
-              log_level = "#{yellow}#{bold}WARN#{reset}"
-            when 'ERROR'
-              log_level = "#{red}#{bold}ERROR#{reset}"
-            when 'FATAL'
-              log_level = "#{red}#{bold}FATAL#{reset}"
-            end
-            puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}"
+        logs['data'].reverse.each do |log_entry|
+          log_level = ''
+          case log_entry['level']
+          when 'INFO'
+            log_level = "#{blue}#{bold}INFO#{reset}"
+          when 'DEBUG'
+            log_level = "#{white}#{bold}DEBUG#{reset}"
+          when 'WARN'
+            log_level = "#{yellow}#{bold}WARN#{reset}"
+          when 'ERROR'
+            log_level = "#{red}#{bold}ERROR#{reset}"
+          when 'FATAL'
+            log_level = "#{red}#{bold}FATAL#{reset}"
           end
-          print output, reset, "\n"
-          return 0
+          puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}"
         end
+        print_results_pagination({'meta'=>{'total'=>json_response['total'],'size'=>json_response['data'].size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
       end
+      print reset, "\n"
+      return 0
+      
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/library_container_types_command.rb

@@ -511,6 +511,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
   end
 
   def remove(args)
+    layout_id = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
@@ -525,7 +526,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
     connect(options)
 
     begin
-      container_type = find_container_type_by_name_or_id(layout_id, id)
+      container_type = find_container_type_by_name_or_id(layout_id, args[0])
       if container_type.nil?
         return 1
       end

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -196,20 +196,23 @@ class Morpheus::Cli::LibraryOptionListsCommand
     
     connect(options)
     begin
+      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
         # support -O OPTION switch on top of --payload
-        if options[:options]
+        if !passed_options.empty?
           payload['optionTypeList'] ||= {}
-          payload['optionTypeList'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+          payload['optionTypeList'].deep_merge!(passed_options)
         end
       else
         if !list_type
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true}], options[:options], @api_client, {})
           list_type = v_prompt['type']
         end
-        params = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
+        params = passed_options
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
+        params.deep_merge!(v_prompt)
         params['type'] = list_type
         if params['type'] == 'rest'
           # prompt for Source Headers
@@ -259,20 +262,22 @@ class Morpheus::Cli::LibraryOptionListsCommand
     begin
       option_type_list = find_option_type_list_by_name_or_id(args[0])
       exit 1 if option_type_list.nil?
-
+      passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) }
       payload = nil
       if options[:payload]
         payload = options[:payload]
         # support -O OPTION switch on top of --payload
-        if options[:options]
+        if !passed_options.empty?
           payload['optionTypeList'] ||= {}
-          payload['optionTypeList'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+          payload['optionTypeList'].deep_merge!(passed_options)
         end
       else
         list_type = option_type_list['type']
         prompt_options = update_option_type_list_option_types(list_type)
-        #params = options[:options] || {}
-        params = Morpheus::Cli::OptionTypes.no_prompt(prompt_options, options[:options], @api_client, options[:params])
+        params = passed_options
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(prompt_options, options[:options], @api_client, options[:params])
+        params.deep_merge!(v_prompt)
+        
         if list_type == 'rest'
           # parse Source Headers
           source_headers = prompt_source_headers(options.merge({no_prompt: true}))