morpheus-cli 2.11.0 → 2.11.1

data/lib/morpheus/cli/logout.rb

@@ -46,7 +46,7 @@ class Morpheus::Cli::Logout
         return 1
       end
       creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url)
-      token = creds.saved_credentials
+      token = creds.load_saved_credentials
       if !token
         if !options[:quiet]
           puts "You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}"

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

@@ -229,6 +229,15 @@ module Morpheus::Cli::ProvisioningHelper
       }
     }
 
+    # allow arbitrary -O values passed by the user (config and instance namespace only)
+    if options[:options] && options[:options]['config'].is_a?(Hash)
+      payload['config'] ||= {}
+      payload['config'].deep_merge!(options[:options]['config'])
+    end
+    if options[:options] && options[:options]['instance'].is_a?(Hash)
+      payload['instance'].deep_merge!(options[:options]['instance'])
+    end
+
     # Description
     v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
     payload['instance']['description'] = v_prompt['description'] if !v_prompt['description'].empty?
@@ -304,6 +313,11 @@ module Morpheus::Cli::ProvisioningHelper
       payload.deep_merge!(provision_payload)
     end
 
+    ## Advanced Options
+
+    # scale factor
+
+
     # prompt for environment variables
     evars = prompt_evars(options)
     if !evars.empty?
@@ -779,162 +793,162 @@ module Morpheus::Cli::ProvisioningHelper
       end
 
 
-      # This recreates the behavior of multi_networks.js
-      # This is used by both `instances add` and `hosts add`
-      # returns array of networkInterfaces based on provision type and cloud settings
-      def prompt_network_interfaces(zone_id, provision_type_id, options={})
-        #puts "Configure Networks:"
-        no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
-        network_interfaces = []
-
-        zone_network_options_json = api_client.options.options_for_source('zoneNetworkOptions', {zoneId: zone_id, provisionTypeId: provision_type_id})
-        # puts "zoneNetworkOptions JSON"
-        # puts JSON.pretty_generate(zone_network_options_json)
-        zone_network_data = zone_network_options_json['data'] || {}
-        networks = zone_network_data['networks']
-        network_interface_types = (zone_network_data['networkTypes'] || []).sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
-        enable_network_type_selection = (zone_network_data['enableNetworkTypeSelection'] == 'on' || zone_network_data['enableNetworkTypeSelection'] == true)
-        has_networks = zone_network_data["hasNetworks"] == true
-        max_networks = zone_network_data["maxNetworks"] ? zone_network_data["maxNetworks"].to_i : nil
-
-        # skip unless provision type supports networks
-        if !has_networks
-          return nil
-        end
+  # This recreates the behavior of multi_networks.js
+  # This is used by both `instances add` and `hosts add`
+  # returns array of networkInterfaces based on provision type and cloud settings
+  def prompt_network_interfaces(zone_id, provision_type_id, options={})
+    #puts "Configure Networks:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+    network_interfaces = []
 
-        # no networks available, shouldn't happen
-        if networks.empty?
-          return network_interfaces
-        end
+    zone_network_options_json = api_client.options.options_for_source('zoneNetworkOptions', {zoneId: zone_id, provisionTypeId: provision_type_id})
+    # puts "zoneNetworkOptions JSON"
+    # puts JSON.pretty_generate(zone_network_options_json)
+    zone_network_data = zone_network_options_json['data'] || {}
+    networks = zone_network_data['networks']
+    network_interface_types = (zone_network_data['networkTypes'] || []).sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
+    enable_network_type_selection = (zone_network_data['enableNetworkTypeSelection'] == 'on' || zone_network_data['enableNetworkTypeSelection'] == true)
+    has_networks = zone_network_data["hasNetworks"] == true
+    max_networks = zone_network_data["maxNetworks"] ? zone_network_data["maxNetworks"].to_i : nil
 
-        network_options = []
-        networks.each do |opt|
-          if !opt.nil?
-            network_options << {'name' => opt['name'], 'value' => opt['id']}
-          end
-        end
+    # skip unless provision type supports networks
+    if !has_networks
+      return nil
+    end
 
-        network_interface_type_options = []
-        network_interface_types.each do |opt|
-          if !opt.nil?
-            network_interface_type_options << {'name' => opt['name'], 'value' => opt['id']}
-          end
-        end
+    # no networks available, shouldn't happen
+    if networks.empty?
+      return network_interfaces
+    end
 
+    network_options = []
+    networks.each do |opt|
+      if !opt.nil?
+        network_options << {'name' => opt['name'], 'value' => opt['id']}
+      end
+    end
 
-        interface_index = 1
-        add_another_interface = true
-        while add_another_interface do
-            # if !no_prompt
-            #   if interface_index == 1
-            #     puts "Configure Network Interface"
-            #   else
-            #     puts "Configure Network Interface #{interface_index}"
-            #   end
-            # end
+    network_interface_type_options = []
+    network_interface_types.each do |opt|
+      if !opt.nil?
+        network_interface_type_options << {'name' => opt['name'], 'value' => opt['id']}
+      end
+    end
 
-            field_context = interface_index == 1 ? "networkInterface" : "networkInterface#{interface_index}"
-            network_interface = {}
 
-            # choose network
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkId', 'type' => 'select', 'fieldLabel' => "Network", 'selectOptions' => network_options, 'required' => true, 'skipSingleOption' => false, 'description' => 'Choose a network for this interface.', 'defaultValue' => network_interface['networkId']}], options[:options])
-            network_interface['network'] = {}
-            network_interface['network']['id'] = v_prompt[field_context]['networkId'].to_i
-            selected_network = networks.find {|it| it["id"] == network_interface['network']['id'] }
+    interface_index = 1
+    add_another_interface = true
+    while add_another_interface do
+      # if !no_prompt
+      #   if interface_index == 1
+      #     puts "Configure Network Interface"
+      #   else
+      #     puts "Configure Network Interface #{interface_index}"
+      #   end
+      # end
 
-            if !selected_network
-              print_red_alert "Network not found by id #{network_interface['network']['id']}!"
-              exit 1
-            end
+      field_context = interface_index == 1 ? "networkInterface" : "networkInterface#{interface_index}"
+      network_interface = {}
 
-            # choose network interface type
-            if enable_network_type_selection && !network_interface_type_options.empty?
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkInterfaceTypeId', 'type' => 'select', 'fieldLabel' => "Network Interface Type", 'selectOptions' => network_interface_type_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a network interface type.', 'defaultValue' => network_interface['networkInterfaceTypeId']}], options[:options])
-              network_interface['networkInterfaceTypeId'] = v_prompt[field_context]['networkInterfaceTypeId'].to_i
-            end
+      # choose network
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkId', 'type' => 'select', 'fieldLabel' => "Network", 'selectOptions' => network_options, 'required' => true, 'skipSingleOption' => false, 'description' => 'Choose a network for this interface.', 'defaultValue' => network_interface['networkId']}], options[:options])
+      network_interface['network'] = {}
+      network_interface['network']['id'] = v_prompt[field_context]['networkId'].to_i
+      selected_network = networks.find {|it| it["id"] == network_interface['network']['id'] }
 
-            # choose IP unless network has a pool configured
-            if selected_network['pool']
-              puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
-            elsif selected_network['dhcpServer']
-              puts "IP Address: Using DHCP" if !no_prompt
-            else
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'ipAddress', 'type' => 'text', 'fieldLabel' => "IP Address", 'required' => true, 'description' => 'Enter an IP for this network interface. x.x.x.x', 'defaultValue' => network_interface['ipAddress']}], options[:options])
-              network_interface['ipAddress'] = v_prompt[field_context]['ipAddress']
-            end
-            network_interfaces << network_interface
-            interface_index += 1
-            has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]
-            add_another_interface = has_another_interface || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another network interface?", {:default => false}))
-            if max_networks && network_interfaces.size >= max_networks
-              add_another_interface = false
-            end
+      if !selected_network
+        print_red_alert "Network not found by id #{network_interface['network']['id']}!"
+        exit 1
+      end
 
-          end
+      # choose network interface type
+      if enable_network_type_selection && !network_interface_type_options.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkInterfaceTypeId', 'type' => 'select', 'fieldLabel' => "Network Interface Type", 'selectOptions' => network_interface_type_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a network interface type.', 'defaultValue' => network_interface['networkInterfaceTypeId']}], options[:options])
+        network_interface['networkInterfaceTypeId'] = v_prompt[field_context]['networkInterfaceTypeId'].to_i
+      end
 
-          return network_interfaces
+      # choose IP unless network has a pool configured
+      if selected_network['pool']
+        puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
+      elsif selected_network['dhcpServer']
+        puts "IP Address: Using DHCP" if !no_prompt
+      else
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'ipAddress', 'type' => 'text', 'fieldLabel' => "IP Address", 'required' => true, 'description' => 'Enter an IP for this network interface. x.x.x.x', 'defaultValue' => network_interface['ipAddress']}], options[:options])
+        network_interface['ipAddress'] = v_prompt[field_context]['ipAddress']
+      end
+      network_interfaces << network_interface
+      interface_index += 1
+      has_another_interface = options[:options] && options[:options]["networkInterface#{interface_index}"]
+      add_another_interface = has_another_interface || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another network interface?", {:default => false}))
+      if max_networks && network_interfaces.size >= max_networks
+        add_another_interface = false
+      end
 
-        end
+    end
 
-        # Prompts user for environment variables for new instance
-        # returns array of evar objects {id: null, name: "VAR", value: "somevalue"}
-        def prompt_evars(options={})
-          #puts "Configure Environment Variables:"
-          no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
-          evars = []
-          evar_index = 0
-          has_another_evar = options[:options] && options[:options]["evar#{evar_index}"]
-          add_another_evar = has_another_evar || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add an environment variable?", {default: false}))
-          while add_another_evar do
-              field_context = "evar#{evar_index}"
-              evar = {}
-              evar['id'] = nil
-              evar_label = evar_index == 0 ? "ENV" : "ENV [#{evar_index+1}]"
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{evar_label} Name", 'required' => true, 'description' => 'Environment Variable Name.', 'defaultValue' => evar['name']}], options[:options])
-              evar['name'] = v_prompt[field_context]['name']
-              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => "#{evar_label} Value", 'required' => true, 'description' => 'Environment Variable Value', 'defaultValue' => evar['value']}], options[:options])
-              evar['value'] = v_prompt[field_context]['value']
-              evars << evar
-              evar_index += 1
-              has_another_evar = options[:options] && options[:options]["evar#{evar_index}"]
-              add_another_evar = has_another_evar || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another environment variable?", {default: false}))
-            end
+    return network_interfaces
 
-            return evars
-          end
+  end
 
-          # reject old volume option types
-          # these will eventually get removed from the associated optionTypes
-          def reject_volume_option_types(option_types)
-            option_types.reject {|opt|
-              ['osDiskSize', 'osDiskType',
-               'diskSize', 'diskType',
-               'datastoreId', 'storagePodId'
-               ].include?(opt['fieldName'])
-            }
-          end
+  # Prompts user for environment variables for new instance
+  # returns array of evar objects {id: null, name: "VAR", value: "somevalue"}
+  def prompt_evars(options={})
+    #puts "Configure Environment Variables:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+    evars = []
+    evar_index = 0
+    has_another_evar = options[:options] && options[:options]["evar#{evar_index}"]
+    add_another_evar = has_another_evar || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add an environment variable?", {default: false}))
+    while add_another_evar do
+      field_context = "evar#{evar_index}"
+      evar = {}
+      evar['id'] = nil
+      evar_label = evar_index == 0 ? "ENV" : "ENV [#{evar_index+1}]"
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{evar_label} Name", 'required' => true, 'description' => 'Environment Variable Name.', 'defaultValue' => evar['name']}], options[:options])
+      evar['name'] = v_prompt[field_context]['name']
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => "#{evar_label} Value", 'required' => true, 'description' => 'Environment Variable Value', 'defaultValue' => evar['value']}], options[:options])
+      evar['value'] = v_prompt[field_context]['value']
+      evars << evar
+      evar_index += 1
+      has_another_evar = options[:options] && options[:options]["evar#{evar_index}"]
+      add_another_evar = has_another_evar || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another environment variable?", {default: false}))
+    end
+
+    return evars
+  end
 
-          # reject old networking option types
-          # these will eventually get removed from the associated optionTypes
-          def reject_networking_option_types(option_types)
-            option_types.reject {|opt|
-              ['networkId', 'networkType', 'ipAddress', 'netmask', 'gateway', 'nameservers',
-               'vmwareNetworkType', 'vmwareIpAddress', 'vmwareNetmask', 'vmwareGateway', 'vmwareNameservers',
-               'subnetId'
-               ].include?(opt['fieldName'])
-            }
-          end
+  # reject old volume option types
+  # these will eventually get removed from the associated optionTypes
+  def reject_volume_option_types(option_types)
+    option_types.reject {|opt|
+      ['osDiskSize', 'osDiskType',
+       'diskSize', 'diskType',
+       'datastoreId', 'storagePodId'
+       ].include?(opt['fieldName'])
+    }
+  end
 
-          # reject old option types that now come from the selected service plan
-          # these will eventually get removed from the associated optionTypes
-          def reject_service_plan_option_types(option_types)
-            option_types.reject {|opt|
-              ['cpuCount', 'memorySize', 'memory'].include?(opt['fieldName'])
-            }
-          end
+  # reject old networking option types
+  # these will eventually get removed from the associated optionTypes
+  def reject_networking_option_types(option_types)
+    option_types.reject {|opt|
+      ['networkId', 'networkType', 'ipAddress', 'netmask', 'gateway', 'nameservers',
+       'vmwareNetworkType', 'vmwareIpAddress', 'vmwareNetmask', 'vmwareGateway', 'vmwareNameservers',
+       'subnetId'
+       ].include?(opt['fieldName'])
+    }
+  end
 
-          def instance_context_options
-            [{'name' => 'Dev', 'value' => 'dev'}, {'name' => 'Test', 'value' => 'qa'}, {'name' => 'Staging', 'value' => 'staging'}, {'name' => 'Production', 'value' => 'production'}]
-          end
+  # reject old option types that now come from the selected service plan
+  # these will eventually get removed from the associated optionTypes
+  def reject_service_plan_option_types(option_types)
+    option_types.reject {|opt|
+      ['cpuCount', 'memorySize', 'memory'].include?(opt['fieldName'])
+    }
+  end
 
-        end
+  def instance_context_options
+    [{'name' => 'Dev', 'value' => 'dev'}, {'name' => 'Test', 'value' => 'qa'}, {'name' => 'Staging', 'value' => 'staging'}, {'name' => 'Production', 'value' => 'production'}]
+  end
+
+end

data/lib/morpheus/cli/option_types.rb

@@ -58,7 +58,7 @@ module Morpheus
             if cur_namespace.key?(option_type['fieldName'])
               value = cur_namespace[option_type['fieldName']]
               if option_type['type'] == 'number'
-                value = value.to_i
+                value = value.to_s.include?('.') ? value.to_f : value.to_i
               elsif option_type['type'] == 'select'
                 # this should just fall down through below, with the extra params no_prompt, use_value
                 value = select_prompt(option_type, api_client, api_params, true, value)
@@ -70,7 +70,7 @@ module Morpheus
             if value_found == false && options.key?(option_type['fieldName'])
               value = options[option_type['fieldName']]
               if option_type['type'] == 'number'
-                value = value.to_i
+                value = value.to_s.include?('.') ? value.to_f : value.to_i
               end
               value_found = true
             end
@@ -81,7 +81,7 @@ module Morpheus
           no_prompt = no_prompt || options[:no_prompt]
           if no_prompt
             if !value_found
-              if option_type['defaultValue']
+              if option_type['defaultValue'] != nil
                 value = option_type['defaultValue']
                 value_found = true
               end
@@ -196,7 +196,8 @@ module Morpheus
         while !value_found do
           print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
           input = $stdin.gets.chomp!
-          value = input.empty? ? option_type['defaultValue'] : input.to_i
+          value = input.empty? ? option_type['defaultValue'] : input
+          value = value.to_s.include?('.') ? value.to_f : value.to_i
           if input == '?'
             help_prompt(option_type)
           elsif !value.nil? || option_type['required'] != true
@@ -280,22 +281,38 @@ module Morpheus
         return value
       end
 
+      # this is a funky one, the user is prompted for yes/no
+      # but the return value is 'on','off',nil
+      # todo: maybe make this easier to use, and have the api's be flexible too..
+      # @param option_type [Hash] option type object with type,fieldName,fieldLabel,etc..
+      # @return 'on', 'off' or nil
       def self.checkbox_prompt(option_type)
         value_found = false
         value = nil
+        has_default = option_type['defaultValue'] != nil
+        default_yes = has_default ? ['on', 'true', 'yes', '1'].include?(option_type['defaultValue'].to_s.downcase) : false
         while !value_found do
-          print "#{option_type['fieldLabel']} (yes/no) [#{option_type['defaultValue'] == 'on' ? 'yes' : 'no'}]: "
+          print "#{option_type['fieldLabel']} (yes/no)#{has_default ? ' ['+(default_yes ? 'yes' : 'no')+']' : ''}: "
           input = $stdin.gets.chomp!
+          if input == '?'
+            help_prompt(option_type)
+            next
+          end
           if input.downcase == 'yes'
+            value_found = true
             value = 'on'
           elsif input.downcase == 'no'
+            value_found = true
             value = 'off'
-          else
-            value = option_type['defaultValue']
+          elsif input == '' && has_default
+            value_found = true
+            value = default_yes ? 'on' : 'off'
           end
-          if input == '?'
-            help_prompt(option_type)
-          elsif !value.nil? || option_type['required'] != true
+          if value.nil? && option_type['required']
+            puts "Invalid Option... Please try again."
+            next
+          end
+          if value.nil? && !option_type['required']
             value_found = true
           end
         end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.11.0"
+    VERSION = "2.11.1"
   end
 end

data/lib/morpheus/cli/whoami.rb

@@ -217,15 +217,16 @@ class Morpheus::Cli::Whoami
 
         print reset,"\n"
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      if e.response && e.response.code == 401
-        puts "It looks like you need to login to the remote appliance [#{@appliance_name}] #{@appliance_url}"
-        if Morpheus::Cli::OptionTypes.confirm("Would you like to login now?")
-          return Morpheus::Cli::Login.new.login([])
-        end
-      end
-      exit 1
+      # if e.response && e.response.code == 401
+      #   puts "It looks like you need to login to the remote appliance [#{@appliance_name}] #{@appliance_url}"
+      #   if Morpheus::Cli::OptionTypes.confirm("Would you like to login now?")
+      #     return Morpheus::Cli::Login.new.login([])
+      #   end
+      # end
+      return 1
     end
   end