morpheus-cli 5.5.1.4 → 5.5.2

data/lib/morpheus/cli/commands/plugins.rb

@@ -0,0 +1,213 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::PluginsCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_name :plugins
+  set_command_description "View and manage plugins."
+  register_subcommands :list, :get, :upload, :update, :remove, :'check-updates'
+
+  # RestCommand settings
+  register_interfaces :plugins
+
+  def upload(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [file]")
+      build_standard_post_options(opts, options)
+      opts.footer = <<-EOT
+Upload a plugin file.
+[file] is required. This is the path of the .jar file to upload
+This can be used to install and register a new plugin and also
+to update an existing plugin to a new version.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    filename = args[0]
+    filename = File.expand_path(filename)
+    if !File.exists?(filename)
+      raise_command_error "File not found: #{filename}"
+    elsif !File.file?(filename)
+      raise_command_error "File is a directory: #{filename}"
+    end
+    plugin_file = File.new(filename, 'rb')
+    @plugins_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @plugins_interface.dry.upload(plugin_file)
+      return
+    end
+    json_response = @plugins_interface.upload(plugin_file)
+    render_response(json_response, options) do
+      plugin = json_response[rest_object_key]
+      print_green_success "Uploaded plugin #{plugin['name']} (#{plugin['version']})"
+      # _get(plugin['id'], {}, options)
+    end
+    return 0, nil
+  end
+
+  def check_updates(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [file]")
+      build_standard_post_options(opts, options)
+      opts.footer = <<-EOT
+Check for installed plugins that have available updates.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:0)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    payload = parse_payload(options)
+    @plugins_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @plugins_interface.dry.check_updates(payload, params)
+      return
+    end
+    json_response = @plugins_interface.check_updates(payload, params)
+    render_response(json_response, options) do
+      plugins_to_update = json_response['pluginsToUpdate'] || []
+      if plugins_to_update.size == 1
+        print_green_success("1 plugin has an available update")
+      else
+        print_green_success("#{plugins_to_update.size} plugins have available updates")
+      end
+      if plugins_to_update.size > 0
+        print_h2 "Plugins To Update", options
+        puts as_pretty_table(plugins_to_update, [:id, :name])
+      end
+    end
+    return 0, nil
+  end
+
+  protected
+
+  def build_list_options(opts, options, params)
+    opts.on('--name VALUE', String, "Filter by name") do |val|
+      add_query_parameter(params, 'name', val)
+    end
+    opts.on('--code VALUE', String, "Filter by code") do |val|
+      add_query_parameter(params, 'code', val)
+    end
+    opts.on('--version VALUE', String, "Filter by version") do |val|
+      add_query_parameter(params, 'version', val)
+    end
+    opts.on('--status VALUE', String, "Filter by status") do |val|
+      add_query_parameter(params, 'status', val)
+    end
+    opts.on('--enabled [true|false]', String, "Filter by enabled [true|false]") do |val|
+      params['enabled'] = ['true','on','1',''].include?(val.to_s.downcase)
+    end
+    opts.on('--valid [true|false]', String, "Filter by valid [true|false]") do |val|
+      params['valid'] = ['true','on','1',''].include?(val.to_s.downcase)
+    end
+    opts.on('--has-update [true|false]', String, "Filter by hasValidUpdate [true|false]") do |val|
+      params['hasValidUpdate'] = ['true','on','1',''].include?(val.to_s.downcase)
+    end
+    super
+  end
+
+  def render_response_for_get(json_response, options)
+    render_response(json_response, options, rest_object_key) do
+      record = json_response[rest_object_key]
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(rest_column_definitions(options), record, options)
+      if record['statusMessage'].to_s != ''
+        print_h2 "Status Message", options
+        if record['status'].to_s.downcase == 'error'
+          print red, record['statusMessage'], reset, "\n"
+        else
+          print record['statusMessage'], "\n"
+        end
+      end
+      # Plugin Providers
+      providers = record['providers']
+      if providers && !providers.empty?
+        print_h2 "Providers"
+        print as_pretty_table(providers, [:name, :type], options)
+      end
+      # Plugin Configuration
+      option_types = record["optionTypes"].sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
+      config = record['config'] || {}
+      if option_types && !option_types.empty?
+        print_h2 "Configuration"
+        rows = option_types.collect do |option_type|
+          {:label => option_type['fieldLabel'], :name => option_type['fieldName'], :value => config[option_type['fieldName']]}
+        end
+        print as_pretty_table(rows, [:label, :name, :value], options)
+      end
+      print reset,"\n"
+    end
+  end
+
+  def plugin_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      # "Code" => 'code',
+      "Description" => 'description',
+      "Version" => lambda {|it| it['version'] },
+      "Enabled" => lambda {|it| format_boolean it['enabled'] },
+      "Status" => lambda {|it| format_plugin_status(it) },
+    }
+  end
+
+  def plugin_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+      "Version" => lambda {|it| it['version'] },
+      "Author" => 'author',
+      "Enabled" => lambda {|it| format_boolean it['enabled'] },
+      "Valid" => lambda {|it| format_boolean it['valid'] },
+      "Has Update?" => lambda {|it| format_boolean it['hasValidUpdate'] },
+      "Status" => lambda {|it| format_plugin_status(it) },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def add_plugin_option_types()
+    [
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true},
+    ]
+  end
+
+  def add_plugin_advanced_option_types()
+    []
+  end
+
+  def update_plugin_option_types()
+    option_types = add_plugin_option_types.collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+    option_types.reject! {|it| it['fieldName'] == 'type' }
+    option_types
+  end
+
+  def update_plugin_advanced_option_types()
+    add_plugin_advanced_option_types().collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+  end
+
+  def format_plugin_status(plugin, return_color=cyan)
+    out = ""
+    status_string = plugin['status'].to_s.downcase
+    if status_string == 'loaded'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'error'
+      out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{plugin['statusMessage'] ? "#{return_color} - #{plugin['statusMessage']}" : ''}#{return_color}"
+    else
+      out << "#{cyan}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
+end

data/lib/morpheus/cli/commands/price_sets_command.rb

@@ -31,6 +31,9 @@ class Morpheus::Cli::PriceSetsCommand
     params = {'includeZones': true}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-t', '--type TYPE', String, "Filter by type") do |val|
+        add_query_parameter(params, 'type', parse_array(val).collect {|it| get_price_set_type_code(it) })
+      end
       opts.on('-i', '--include-inactive [on|off]', String, "Can be used to enable / disable inactive filter. Default is on") do |val|
         params['includeInactive'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
@@ -193,7 +196,7 @@ class Morpheus::Cli::PriceSetsCommand
         end
       end
       opts.on('-t', "--type [TYPE]", String, "Price set type") do |val|
-        if ['fixed', 'compute_plus_storage', 'component'].include?(val)
+        if ['fixed', 'compute_plus_storage', 'component','load_balancer','snapshot','virtual_image','software_or_service'].include?(val)
           params['type'] = val
         else
           raise_command_error "Unrecognized price set type #{val}"
@@ -268,7 +271,9 @@ class Morpheus::Cli::PriceSetsCommand
         end
 
         # type
-        params['type'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Price Set Type', 'selectOptions' => [{'name' => 'Everything', 'value' => 'fixed'}, {'name' => 'Compute + Storage', 'value' => 'compute_plus_storage'}, {'name' => 'Component', 'value' => 'component'}], 'required' => true, 'description' => 'Price Set Type.'}],options[:options],@api_client,{}, options[:no_prompt])['type']
+        price_set_type_options = price_set_types.collect {|k,v| {'name' => v[:label], 'value' => k} }
+        params['type'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Price Set Type', 'selectOptions' => price_set_type_options, 'required' => true, 'description' => 'Price Set Type.'}],options[:options],@api_client,{}, options[:no_prompt])['type']
+        
         if params['type'].nil?
           print_red_alert "Type is required"
           exit 1
@@ -491,20 +496,31 @@ class Morpheus::Cli::PriceSetsCommand
   end
 
   def price_set_type_label(type)
-    price_set_types[type][:label]
+    price_set_type = price_set_types[type]
+    if price_set_type.nil?
+      type.capitalize
+    else
+      price_set_type[:label]
+    end
   end
 
-  def price_type_label(type)
+  def price_types
     {
         'fixed' => 'Everything',
         'compute' => 'Memory + CPU',
-        'memory' => 'Memory Only (per MB)',
-        'cores' => 'Cores Only (per core)',
-        'storage' => 'Disk Only (per GB)',
-        'datastore' => 'Datastore (per GB)',
+        'memory' => 'Memory Only',
+        'cores' => 'Cores Only',
+        'storage' => 'Disk Only',
+        'datastore' => 'Datastore',
         'platform' => 'Platform',
-        'software' => 'Software'
-    }[type] || type.capitalize
+        'software' => 'Software',
+        'load_balancer' => 'Load Balancer',
+        'load_balancer_virtual_server' => 'Load Balancer Virtual Server',
+    }
+  end
+
+  def price_type_label(type)
+    price_types[type] || type.capitalize
   end
 
   def price_units
@@ -516,9 +532,23 @@ class Morpheus::Cli::PriceSetsCommand
         'fixed' => {:label => 'Everything', :requires => ['fixed'], :allows => ['platform', 'software']},
         'compute_plus_storage' => {:label => 'Compute + Storage', :requires => ['compute', 'storage'], :allows => ['platform', 'software']},
         'component' => {:label => 'Component', :requires => ['memory', 'cores', 'storage'], :allows => ['platform', 'software']},
+        'load_balancer' => {:label => 'Load Balancer', :requires => ['load_balancer'], :allows => ['load_balancer_virtual_server']},
+        'snapshot' => {:label => 'Snapshot', :requires => ['storage'], :allows => ['storage', 'datastore']},
+        'virtual_image' => {:label => 'Virtual Image', :requires => ['storage'], :allows => []},
+        'software_or_service' => {:label => 'Software / Service', :requires => ['software'], :allows => []},
     }
   end
 
+  def get_price_set_type_code(value)
+    rtn = value
+    price_set_types.each do |k,v|
+      if value.to_s.downcase == v[:label].downcase
+        rtn = k
+      end
+    end
+    return rtn
+  end
+
   def format_amount(amount)
     rtn = amount.to_s
     if rtn.index('.').nil?

data/lib/morpheus/cli/commands/prices_command.rb

@@ -16,6 +16,7 @@ class Morpheus::Cli::PricesCommand
     @api_client = establish_remote_appliance_connection(opts)
     @prices_interface = @api_client.prices
     @accounts_interface = @api_client.accounts
+    @options_interface = @api_client.options
   end
 
   def handle(args)
@@ -39,8 +40,8 @@ class Morpheus::Cli::PricesCommand
       opts.on('--currency CURRENCY', Array, "Filter by currency eg. usd") do |val|
         params['currency'] = val.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact
       end
-      opts.on('--price-type TYPE', Array, "Filter by priceType eg. fixed,platform,software,compute,storage,datastore,memory,cores,cpu") do |val|
-        params['priceType'] = val.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact
+      opts.on('--price-type TYPE', String, "Filter by priceType eg. fixed,platform,software,compute,storage,datastore,memory,cores,cpu") do |val|
+        add_query_parameter(params, 'priceType', parse_array(val).collect {|it| get_price_type_code(it) })
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List prices."
@@ -65,7 +66,7 @@ class Morpheus::Cli::PricesCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if prices.empty?
-        print yellow,"No prices found.",reset,"\n"
+        print cyan,"No prices found.",reset,"\n"
       else
         rows = prices.collect do |it|
           {
@@ -91,7 +92,6 @@ class Morpheus::Cli::PricesCommand
       end
       print reset,"\n"
     end
-    return 1,  "0 prices found" if prices.empty?
     return 0, nil
   end
 
@@ -600,10 +600,22 @@ class Morpheus::Cli::PricesCommand
         'storage' => 'Disk Only',
         'datastore' => 'Datastore',
         'platform' => 'Platform',
-        'software' => 'Software'
+        'software' => 'Software',
+        'load_balancer' => 'Load Balancer',
+        'load_balancer_virtual_server' => 'Load Balancer Virtual Server',
     }
   end
 
+  def get_price_type_code(value)
+    rtn = value
+    price_types.each do |k,v|
+      if value.to_s.downcase == v.downcase
+        rtn = k
+      end
+    end
+    return rtn
+  end
+
   def price_units
     ['minute', 'hour', 'day', 'month', 'year', 'two year', 'three year', 'four year', 'five year']
   end

data/lib/morpheus/cli/commands/processes_command.rb

@@ -302,6 +302,7 @@ class Morpheus::Cli::Processes
         history_records = []
         if process_events.empty?
           puts "#{cyan}No events found.#{reset}"
+          print reset,"\n"
         else      
           process_events.each do |process_event|
             event_row = {
@@ -336,8 +337,8 @@ class Morpheus::Cli::Processes
           print as_pretty_table(history_records, columns, options)
           print_results_pagination({size: process_events.size, total: process_events.size})
           print reset, "\n"
-          return 0
         end
+        return 0, nil
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)

data/lib/morpheus/cli/commands/remote.rb

@@ -797,19 +797,16 @@ EOT
     if use_it
       appliance[:active] = true
     end
-
     # save the new remote
-    ::Morpheus::Cli::Remote.save_remote(appliance_name, appliance)
+    appliance = ::Morpheus::Cli::Remote.save_remote(new_appliance_name, appliance)
     # refresh it now?
     appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name)
-
     # render
-    if options[:quiet]
-      return exit_code, err
+    if !options[:quiet]
+      print_green_success "Cloned remote #{original_appliance[:name]} to #{appliance[:name]}, status is #{format_appliance_status(appliance)}"
+      # print new appliance details
+      _get(appliance[:name].to_s, {})
     end
-    print_green_success "Cloned remote #{original_appliance[:name]} to #{appliance[:name]}"
-    # print new appliance details
-    _get(appliance[:name], {})
     return exit_code, err
   end
 
@@ -1255,9 +1252,9 @@ EOT
     return Morpheus::Cli::Setup.new.handle(cmd_args)
   end
 
-  def load_remote_by_name(appliance_name, allow_current=true)
+  def load_remote_by_name(appliance_name)
     appliance = nil
-    if appliance_name.to_s == "current" && allow_current
+    if appliance_name.to_s == "current"
       appliance = ::Morpheus::Cli::Remote.load_active_remote()
       if !appliance
         raise_command_error "No current appliance, see the command `remote use`"