morpheus-cli 5.3.0.1 → 5.3.2

data/lib/morpheus/cli/library_option_types_command.rb

@@ -17,10 +17,10 @@ class Morpheus::Cli::LibraryOptionTypesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
-    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-    @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
-    @option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
+    @library_instance_types_interface = @api_client.library_instance_types
+    @provision_types_interface = @api_client.provision_types
+    @option_types_interface = @api_client.option_types
+    @option_type_lists_interface = @api_client.option_type_lists
   end
 
   def handle(args)
@@ -35,6 +35,10 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       opts.footer = "List option types."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params = {}

data/lib/morpheus/cli/library_spec_templates_command.rb

@@ -26,12 +26,11 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.footer = "List spec templates."
     end
     optparse.parse!(args)
-    connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
+    connect(options)
     begin
       # construct payload
       params.merge!(parse_list_options(options))

data/lib/morpheus/cli/library_upgrades_command.rb

@@ -18,12 +18,12 @@ class Morpheus::Cli::LibraryUpgradesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_container_upgrades_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_container_upgrades
-    @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
-    @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
-    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-    @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
-    @option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
+    @library_container_upgrades_interface = @api_client.library_container_upgrades
+    @library_layouts_interface = @api_client.library_layouts
+    @library_instance_types_interface = @api_client.library_instance_types
+    @provision_types_interface = @api_client.provision_types
+    @option_types_interface = @api_client.option_types
+    @option_type_lists_interface = @api_client.option_type_lists
   end
 
   def handle(args)

data/lib/morpheus/cli/license.rb

@@ -20,8 +20,8 @@ class Morpheus::Cli::License
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)		
-    @license_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).license
+    @api_client = @api_client		
+    @license_interface = @api_client.license
   end
 
   def handle(args)

data/lib/morpheus/cli/load_balancers.rb

@@ -16,7 +16,7 @@ class Morpheus::Cli::LoadBalancers
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @load_balancers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).load_balancers
+    @load_balancers_interface = @api_client.load_balancers
   end
 
 

data/lib/morpheus/cli/login.rb

@@ -36,6 +36,13 @@ class Morpheus::Cli::Login
       opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
         password = val
       end
+      opts.on( '--password-file FILE', String, "Password File, read a file containing the password." ) do |val|
+        password_file = File.expand_path(val)
+        if !File.exists?(password_file) || !File.file?(password_file) # check readable too
+          raise ::OptionParser::InvalidOption.new("File not found: #{password_file}")
+        end
+        password = File.read(password_file) #.to_s.split("\n").first.strip
+      end
       opts.on( '-t', '--test', "Test credentials only, does not update stored credentials for the appliance." ) do
         options[:test_only] = true
       end
@@ -70,7 +77,9 @@ EOT
     # connect(options)
     @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
     
-    if @remote_appliance[:authenticated]
+    if options[:test_only]
+      puts "Testing credentials, your current session will not be modified."
+    elsif @remote_appliance[:authenticated]
       puts "You will be automatically logged out of your current session as '#{@remote_appliance[:username]}'"
     end
 

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

@@ -178,7 +178,7 @@ module Morpheus::Cli::OptionSourceHelper
   # todo: some other common ones, accounts (tenants), etc.
   # todo: a generic set of parse and find methods like 
   # like this:
-  def parse_option_source_id_list(option_source, id_list, api_params={}, refresh=false)
+  def parse_option_source_id_list(option_source, id_list, api_params={}, refresh=false, allow_any_id=false)
     option_source_label = option_source.to_s # .capitalize
     option_data = load_option_source_data(option_source, api_params, refresh)
     found_ids = []
@@ -189,9 +189,8 @@ module Morpheus::Cli::OptionSourceHelper
         # never match blank nil or empty strings
         print_red_alert "#{option_source_label} cannot be not found by with a blank id!"
         return nil
-      # elsif record_id.to_s =~ /\A\d{1,}\Z/
-      #   # always allow any ID for now..
-      #   found_ids << record_id
+      elsif allow_any_id && record_id.to_s =~ /\A\d{1,}\Z/
+        found_ids << record_id.to_i
       else
         # search with in a presedence by value, then name, then id (usually same as value)
         # exact match on value first.
@@ -228,28 +227,28 @@ module Morpheus::Cli::OptionSourceHelper
     return found_ids
   end
 
-  def parse_cloud_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('clouds', id_list, api_params, refresh)
+  def parse_cloud_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('clouds', id_list, api_params, refresh, allow_any_id)
   end
 
-  def parse_group_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('groups', id_list, api_params, refresh)
+  def parse_group_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('groups', id_list, api_params, refresh, allow_any_id)
   end
 
-  def parse_user_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('users', id_list, api_params, refresh)
+  def parse_user_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('users', id_list, api_params, refresh, allow_any_id)
   end
 
-  def parse_tenant_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('allTenants', id_list, api_params, refresh)
+  def parse_tenant_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('allTenants', id_list, api_params, refresh, allow_any_id)
   end
 
-  # def parse_blueprints_id_list(id_list)
-  #   parse_option_source_id_list('blueprints', id_list, api_params, refresh)
+  # def parse_blueprints_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+  #   parse_option_source_id_list('blueprints', id_list, api_params, refresh, allow_any_id)
   # end
 
-  def parse_project_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('projects', id_list, api_params, refresh)
+  def parse_project_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('projects', id_list, api_params, refresh, allow_any_id)
   end
 
 end

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

@@ -228,7 +228,8 @@ module Morpheus::Cli::PrintHelper
     out << cyan
     if payload
       out << "\n"
-      content_type = (headers && headers['Content-Type']) ? headers['Content-Type'] : 'application/x-www-form-urlencoded'
+      is_multipart = (payload.is_a?(Hash) && payload[:multipart] == true)
+      content_type = (headers && headers['Content-Type']) ? headers['Content-Type'] : (is_multipart ? 'multipart/form-data' : 'application/x-www-form-urlencoded')
       if content_type == 'application/json'
         if payload.is_a?(String)
           begin
@@ -257,12 +258,21 @@ module Morpheus::Cli::PrintHelper
             out << payload
           end
         else
-          if content_type == 'application/x-www-form-urlencoded'
+          if content_type == 'application/x-www-form-urlencoded' || content_type.to_s.include?('multipart')
             body_str = payload.to_s
             begin
+              payload.delete(:multipart) if payload.is_a?(Hash)
+              # puts "grailsifying it!"
+              payload = Morpheus::RestClient.grails_params(payload)
+              payload.each do |k,v|
+                if v.is_a?(File)
+                  payload[k] = "@#{v.path}"
+                  payload[k] = v.path
+                end
+              end
               body_str = URI.encode_www_form(payload)
             rescue => ex
-              # raise ex
+              raise ex
             end
             if options[:scrub]
               out << Morpheus::Logging.scrub_message(body_str)
@@ -273,7 +283,7 @@ module Morpheus::Cli::PrintHelper
             if options[:scrub]
               out << Morpheus::Logging.scrub_message(payload)
             else
-              out << payload
+              out << payload.to_s
             end
           end
         end
@@ -327,7 +337,9 @@ module Morpheus::Cli::PrintHelper
         else
           out << "  -d '#{payload}'"
         end
+        out << "\n"
       else
+        is_multipart = (payload.is_a?(Hash) && payload[:multipart] == true)
         content_type = headers['Content-Type'] || 'application/x-www-form-urlencoded'
         
         if payload.is_a?(File)
@@ -337,21 +349,22 @@ module Morpheus::Cli::PrintHelper
           out << "  -d @#{payload.path}"
         elsif payload.is_a?(String)
           out << "  -d '#{payload}'"
-        else
-          if content_type == 'application/x-www-form-urlencoded'
-            body_str = payload.to_s
-            begin
-              body_str = URI.encode_www_form(payload)
-            rescue => ex
-              # raise ex
+        elsif payload.respond_to?(:map)
+          payload.delete(:multipart) if payload.is_a?(Hash)
+          # puts "grailsifying it!"
+          payload = Morpheus::RestClient.grails_params(payload)
+          payload.each do |k,v|
+            if v.is_a?(File)
+              out << "  -F '#{k}=@#{v.path}"
+            else
+              out << "  -d '#{URI.encode_www_form({(k) => v})}'"
             end
-            out << "  -d '#{body_str}'"
-          else
-            out << "  -d '#{payload}'"
+            out << "\n"
           end
+          #body_str = URI.encode_www_form(payload)
+          # out << "  -d '#{body_str}'"
         end
       end
-      out << "\n"
     else
       out << "\n"
     end
@@ -431,12 +444,13 @@ module Morpheus::Cli::PrintHelper
     out = ""
     bars = []
     percent = 0
+    percent_sigdig = opts[:percent_sigdig] || 2
     if max_value.to_i == 0
       percent = 0
     else
       percent = ((used_value.to_f / max_value.to_f) * 100)
     end
-    percent_label = ((used_value.nil? || max_value.to_f == 0.0) ? "n/a" : "#{percent.round(2)}%").rjust(6, ' ')
+    percent_label = ((used_value.nil? || max_value.to_f == 0.0) ? "n/a" : "#{percent.round(percent_sigdig)}%").rjust(6, ' ')
     bar_display = ""
     if percent > 100
       max_bars.times { bars << "|" }
@@ -674,7 +688,7 @@ module Morpheus::Cli::PrintHelper
       else
         # so let's use the passed in column definitions instead of the raw data properties
         # columns = options[:include_fields]
-        new_columns = []
+        new_columns = {}
         options[:include_fields].each do |f|
           matching_column = nil
           # column definitions vary right now, array of symbols/strings/hashes or perhaps a single hash
@@ -692,7 +706,7 @@ module Morpheus::Cli::PrintHelper
               matching_column = columns[matching_key]
             end
           end
-          new_columns << (matching_column ? matching_column : f)
+          new_columns[f] = matching_column ? matching_column : f
         end
         columns = new_columns
       end
@@ -1072,6 +1086,7 @@ module Morpheus::Cli::PrintHelper
         column_defs.each do |column_def|
           label = column_def.label
           value = column_def.display_method.call(obj)
+          value = value.is_a?(String) ? value : JSON.fast_generate(value)
           # value = get_object_value(obj, column_def)
           if do_quotes
             cells << quote_csv_value(value)

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

@@ -508,7 +508,7 @@ module Morpheus::Cli::ProvisioningHelper
       if name_prompt['name'].nil? && !options[:name_required]
         break
       else
-        if instances_interface.get({name: name_prompt['name']})['instances'].empty?
+        if instances_interface.list({name: name_prompt['name']})['instances'].empty?
           instance_name = name_prompt['name']
         else
           print_red_alert "Name must be unique"
@@ -696,7 +696,7 @@ module Morpheus::Cli::ProvisioningHelper
     # prompt for service plan
     plan_id = nil
     service_plan = nil
-    service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
+    service_plans_json = instances_interface.service_plans({zoneId: cloud_id, layoutId: layout['id'], siteId: group_id})
     service_plans = service_plans_json["plans"]
     if locked_fields.include?('plan.id')
       plan_id = options[:options]['plan']['id'] rescue nil
@@ -764,7 +764,7 @@ module Morpheus::Cli::ProvisioningHelper
         # pluck out the resourcePoolId option type to prompt for
         resource_pool_option_type = option_type_list.find {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
         option_type_list = option_type_list.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
-        resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], planId: service_plan["id"], layoutId: layout["id"]})['data']
+        resource_pool_options = options_interface.options_for_source('zonePools', {groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], planId: service_plan["id"], layoutId: layout["id"]})['data']
         resource_pool = resource_pool_options.find {|opt| opt['id'] == options[:resource_pool].to_i} if options[:resource_pool]
 
         if resource_pool
@@ -1409,7 +1409,7 @@ module Morpheus::Cli::ProvisioningHelper
       if plan_info['addVolumes']
         volume_index = current_volumes.size
         has_another_volume = options[:options] && options[:options]["dataVolume#{volume_index}"]
-        add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?"))
+        add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => false}))
         while add_another_volume do
             #puts "Configure Data #{volume_index} Volume"
 

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

@@ -0,0 +1,246 @@
+require 'morpheus/cli/mixins/print_helper'
+# Provides common finder methods for VDI Pool management commands
+module Morpheus::Cli::VdiHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  ## VDI Pools
+
+  def vdi_pools_interface
+    raise "#{self.class} has not defined @vdi_pools_interface" if @vdi_pools_interface.nil?
+    @vdi_pools_interface
+  end
+
+  def vdi_pool_object_key
+    'vdiPool'
+  end
+
+  def vdi_pool_list_key
+    'vdiPools'
+  end
+
+  def find_vdi_pool_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_vdi_pool_by_id(val)
+    else
+      return find_vdi_pool_by_name(val)
+    end
+  end
+
+  def find_vdi_pool_by_id(id)
+    begin
+      json_response = vdi_pools_interface.get(id.to_i)
+      return json_response[vdi_pool_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "VDI Pool not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_vdi_pool_by_name(name)
+    json_response = vdi_pools_interface.list({name: name.to_s})
+    vdi_pools = json_response[vdi_pool_list_key]
+    if vdi_pools.empty?
+      print_red_alert "VDI Pool not found by name '#{name}'"
+      return nil
+    elsif vdi_pools.size > 1
+      print_red_alert "#{vdi_pools.size} VDI Pools found by name '#{name}'"
+      print_error "\n"
+      puts_error as_pretty_table(vdi_pools, [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      print_error reset,"\n"
+      return nil
+    else
+      return vdi_pools[0]
+    end
+  end
+
+  def format_vdi_pool_status(vdi_pool, return_color=cyan)
+    out = ""
+    status_string = vdi_pool['status'].to_s.downcase
+    if status_string
+      if ['available'].include?(status_string)
+        out << "#{green}#{status_string.upcase}"
+      elsif ['unavailable'].include?(status_string)
+        out << "#{red}#{status_string.upcase}"
+      else
+        out << "#{return_color}#{status_string.upcase}"
+      end
+    end
+    out + return_color
+  end
+
+  ## VDI Allocations
+
+  def vdi_allocations_interface
+    raise "#{self.class} has not defined @vdi_allocations_interface" if @vdi_allocations_interface.nil?
+    @vdi_allocations_interface
+  end
+
+  def vdi_allocation_object_key
+    'vdiAllocation'
+  end
+
+  def vdi_allocation_list_key
+    'vdiAllocations'
+  end
+
+  def find_vdi_allocation_by_id(id)
+    begin
+      json_response = vdi_allocations_interface.get(id.to_i)
+      return json_response[vdi_allocation_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "VDI Allocation not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def format_vdi_allocation_status(vdi_allocation, return_color=cyan)
+    out = ""
+    status_string = vdi_allocation['status'].to_s.downcase
+    if status_string
+      if ['available'].include?(status_string)
+        out << "#{green}#{status_string.upcase}"
+      # elsif ['preparing'].include?(status_string)
+      #   out << "#{yellow}#{status_string.upcase}"
+      # elsif ['reserved', 'shutdown'].include?(status_string)
+      #   out << "#{yellow}#{status_string.upcase}"
+      elsif ['failed'].include?(status_string)
+        out << "#{red}#{status_string.upcase}"
+      else
+        out << "#{return_color}#{status_string.upcase}"
+      end
+    end
+    out + return_color
+  end
+
+  def get_available_vdi_apps(refresh=false)
+    if !@available_vdi_apps || refresh
+      @available_vdi_apps = @vdi_apps_interface.list({max:-1})['vdiApps'] #  || []
+    end
+    return @available_vdi_apps
+  end
+  
+  def get_vdi_app_by_name_or_code(name)
+    return get_available_vdi_apps().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
+  end
+
+  ## VDI Apps
+
+  def vdi_apps_interface
+    raise "#{self.class} has not defined @vdi_apps_interface" if @vdi_apps_interface.nil?
+    @vdi_apps_interface
+  end
+
+  def vdi_app_object_key
+    'vdiApp'
+  end
+
+  def vdi_app_list_key
+    'vdiApps'
+  end
+
+  def find_vdi_app_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_vdi_app_by_id(val)
+    else
+      return find_vdi_app_by_name(val)
+    end
+  end
+
+  def find_vdi_app_by_id(id)
+    begin
+      json_response = vdi_apps_interface.get(id.to_i)
+      return json_response[vdi_app_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "VDI App not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_vdi_app_by_name(name)
+    json_response = vdi_apps_interface.list({name: name.to_s})
+    vdi_apps = json_response[vdi_app_list_key]
+    if vdi_apps.empty?
+      print_red_alert "VDI App not found by name '#{name}'"
+      return nil
+    elsif vdi_apps.size > 1
+      print_red_alert "#{vdi_apps.size} VDI App found by name '#{name}'"
+      print_error "\n"
+      puts_error as_pretty_table(vdi_apps, {"ID" => 'id', "NAME" => 'name'}, {color:red})
+      print_red_alert "Try using ID instead"
+      print_error reset,"\n"
+      return nil
+    else
+      return vdi_apps[0]
+    end
+  end
+
+
+  ## VDI Gateways
+
+  def vdi_gateways_interface
+    raise "#{self.class} has not defined @vdi_gateways_interface" if @vdi_gateways_interface.nil?
+    @vdi_gateways_interface
+  end
+
+  def vdi_gateway_object_key
+    'vdiGateway'
+  end
+
+  def vdi_gateway_list_key
+    'vdiGateways'
+  end
+
+  def find_vdi_gateway_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_vdi_gateway_by_id(val)
+    else
+      return find_vdi_gateway_by_name(val)
+    end
+  end
+
+  def find_vdi_gateway_by_id(id)
+    begin
+      json_response = vdi_gateways_interface.get(id.to_i)
+      return json_response[vdi_gateway_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "VDI Gateway not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_vdi_gateway_by_name(name)
+    json_response = vdi_gateways_interface.list({name: name.to_s})
+    vdi_gateways = json_response[vdi_gateway_list_key]
+    if vdi_gateways.empty?
+      print_red_alert "VDI Gateway not found by name '#{name}'"
+      return nil
+    elsif vdi_gateways.size > 1
+      print_red_alert "#{vdi_gateways.size} VDI Gateway found by name '#{name}'"
+      print_error "\n"
+      puts_error as_pretty_table(vdi_gateways, {"ID" => 'id', "NAME" => 'name'}, {color:red})
+      print_red_alert "Try using ID instead"
+      print_error reset,"\n"
+      return nil
+    else
+      return vdi_gateways[0]
+    end
+  end
+
+
+end