Merge pull request #518 from anodelman/maint

(QENG-1449) proxy package managers before configuration/validation...

lib/beaker/cli.rb

@@ -51,6 +51,7 @@ def provision
         @hosts =  []
         @network_manager = Beaker::NetworkManager.new(@options, @logger)
         @hosts = @network_manager.provision
+        @network_manager.proxy_package_manager
         @network_manager.validate
         @network_manager.configure
       rescue => e

lib/beaker/hypervisor.rb

@@ -85,7 +85,15 @@ def cleanup
       nil
     end
 
-    #Default configuration steps to be run for a given hypervisor
+    #Proxy package managers on tests hosts created by this hypervisor, runs before validation and configuration.
+    def proxy_package_manager
+      if @options[:package_proxy]
+        package_proxy(@hosts, @options)
+      end
+    end
+
+    #Default configuration steps to be run for a given hypervisor.  Any additional configuration to be done
+    #to the provided SUT for test execution to be successful.
     def configure
       if @options[:timesync]
         timesync(@hosts, @options)
@@ -96,15 +104,13 @@ def configure
       if @options[:add_el_extras]
         add_el_extras(@hosts, @options)
       end
-      if @options[:package_proxy]
-        package_proxy(@hosts, @options)
-      end
       if @options[:disable_iptables]
         disable_iptables @hosts, @options
       end
     end
 
-    #Default validation steps to be run for a given hypervisor
+    #Default validation steps to be run for a given hypervisor.  Ensures that SUTs meet requirements to be
+    #beaker test nodes.
     def validate
       if @options[:validate]
         validate_host(@hosts, @options)

lib/beaker/network_manager.rb

@@ -75,10 +75,10 @@ def configure
 
     # configure proxy on all provioned machines
     #@raise [Exception] Raise an exception if virtual machines fail to be configured
-    def package_proxy
+    def proxy_package_manager
       if @hypervisors
         @hypervisors.each_key do |type|
-          @hypervisors[type].package_proxy
+          @hypervisors[type].proxy_package_manager
         end
       end
     end