From a5a3ee95f9d275fabe091b41fc305ae11db5a8c0 Mon Sep 17 00:00:00 2001
From: Carl Woodward <carl@88cartell.com>
Date: Tue, 25 Sep 2012 13:28:13 +1000
Subject: [PATCH] Fix create load balancer test.

---
 tests/ninefold/requests/compute/helper.rb            |  8 ++++----
 .../ninefold/requests/compute/load_balancer_tests.rb | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/ninefold/requests/compute/helper.rb b/tests/ninefold/requests/compute/helper.rb
index 365704fdd..a76dc39fd 100644
--- a/tests/ninefold/requests/compute/helper.rb
+++ b/tests/ninefold/requests/compute/helper.rb
@@ -318,13 +318,13 @@ class Ninefold
           "account"=>String,
           "algorithm"=>String,
           "cidrlist"=>String,
-          "description"=>String,
           "domain"=>String,
           "domainid"=>Integer,
           "name"=>String,
-          "privateport"=>Integer,
-          "publicip"=>Integer,
-          "publicport"=>Integer,
+          "privateport"=>String,
+          "publicip"=>String,
+          "publicipid"=>Integer,
+          "publicport"=>String,
           "state"=>String,
           "zoneid"=>Integer
         }
diff --git a/tests/ninefold/requests/compute/load_balancer_tests.rb b/tests/ninefold/requests/compute/load_balancer_tests.rb
index 9219f784b..5f300cff4 100644
--- a/tests/ninefold/requests/compute/load_balancer_tests.rb
+++ b/tests/ninefold/requests/compute/load_balancer_tests.rb
@@ -1,11 +1,19 @@
 Shindo.tests('Fog::Compute[:ninefold] | load balancers', ['ninefold']) do
 
+  # NOTE: all of these tests require you to have a vm built with a public IP address.
   tests('success') do
 
+    p Ninefold::Compute::Formats::LoadBalancers::CREATE_LOAD_BALANCER_RULE_RESPONSE
     tests("#create_load_balancer_rule()").formats(Ninefold::Compute::Formats::LoadBalancers::CREATE_LOAD_BALANCER_RULE_RESPONSE) do
       pending if Fog.mocking?
-      job = Fog::Compute[:ninefold].create_load_balancer_rule(:algorithm => 'roundrobin', :name => 'test', :privateport => 1000, :publicport => 2000)
-      Ninefold::Compute::TestSupport.wait_for_job(job)['jobresult']['createloadbalancerruleresponse']
+      compute = Fog::Compute[:ninefold]
+      public_ip_id = compute.list_public_ip_addresses.first['id']
+      create_load_balancer = compute.create_load_balancer_rule(:algorithm => 'roundrobin', :name => 'test',
+                                                               :privateport => 1000, :publicport => 2000,
+                                                               :publicipid => public_ip_id)
+      result = Ninefold::Compute::TestSupport.wait_for_job(create_load_balancer['jobid'])
+      compute.delete_load_balancer_rule id: create_load_balancer['id']
+      result['jobresult']['loadbalancer']
     end
 
   end