abs.rb in beaker-abs-0.3.0

- old
+ new

@@ -11,19 +11,43 @@
       resource_hosts = ENV['ABS_RESOURCE_HOSTS'] || @options[:abs_resource_hosts]
       raise ArgumentError.new("ABS_RESOURCE_HOSTS must be specified when using the Beaker::Abs hypervisor") if resource_hosts.nil?
       @resource_hosts = JSON.parse(resource_hosts)
     end
 
+    def connection_preference(host)
+      vmhostname = host[:vmhostname]
+      if vmhostname && host[:hypervisor] == 'abs'
+        @resource_hosts.each do |resource_host|
+          if resource_host['hostname'] == vmhostname
+            engine = resource_host['engine']
+            case engine
+            when /^(vmpooler|nspooler)$/
+              # putting ip last as its not set by ABS
+              return [:vmhostname, :hostname, :ip]
+            else
+              super
+            end
+          end
+        end
+      end
+      super
+    end
+
     def provision
       type2hosts = {}
 
       # Each resource_host is of the form:
       # {
-      #   "hostname" => "1234567890",
+      #   "hostname" => "mkbx0m6dnnntgz1.delivery.puppetlabs.net",
       #   "type"     => "centos-7-i386",
       #   "engine"   => "vmpooler",
       # }
+      # {
+      #   "hostname" => "sol10-1.delivery.puppetlabs.net",
+      #   "type"     => "solaris-10-sparc",
+      #   "engine"   => "nspooler",
+      # }
       @resource_hosts.each do |resource_host|
         type = resource_host['type']
         type2hosts[type] ||= []
         type2hosts[type] << resource_host['hostname']
       end
@@ -37,9 +61,12 @@
         if provisioned_hosts = type2hosts[template]
           host['vmhostname'] = provisioned_hosts.shift
         else
           raise ArgumentError.new("Failed to provision host '#{host.hostname}', no template of type '#{host['template']}' was provided.")
         end
+      end
+      if Beaker::Hypervisor.respond_to?(:set_ssh_connection_preference)
+        Beaker::Hypervisor.set_ssh_connection_preference(@hosts, self)
       end
     end
 
     def cleanup
       # nothing to do