From f1d435bf93b9f1004c25ec41edaf957dd429586f Mon Sep 17 00:00:00 2001 From: Brian Hartsock Date: Tue, 15 May 2012 17:38:45 -0400 Subject: [PATCH] [rackspace|loadbalancers] fixed broken tests --- tests/rackspace/helper.rb | 2 +- .../models/load_balancers/access_list_tests.rb | 2 +- .../models/load_balancers/access_lists_tests.rb | 2 +- .../models/load_balancers/load_balancer_tests.rb | 2 +- .../models/load_balancers/load_balancers_tests.rb | 2 +- tests/rackspace/models/load_balancers/node_tests.rb | 2 +- tests/rackspace/models/load_balancers/nodes_tests.rb | 2 +- .../requests/load_balancers/load_balancer_tests.rb | 10 +++++----- tests/rackspace/requests/load_balancers/node_tests.rb | 10 +++++----- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/rackspace/helper.rb b/tests/rackspace/helper.rb index d1e05ef21..c4993391f 100644 --- a/tests/rackspace/helper.rb +++ b/tests/rackspace/helper.rb @@ -10,7 +10,7 @@ module Shindo :protocol => 'HTTP', :port => 80, :virtual_ips => [{ :type => 'PUBLIC'}], - :nodes => [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}] + :nodes => [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}] }) @lb.wait_for { ready? } begin diff --git a/tests/rackspace/models/load_balancers/access_list_tests.rb b/tests/rackspace/models/load_balancers/access_list_tests.rb index 264a8e725..b7f0fd375 100644 --- a/tests/rackspace/models/load_balancers/access_list_tests.rb +++ b/tests/rackspace/models/load_balancers/access_list_tests.rb @@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | access_list', ['rackspace']) do given_a_load_balancer_service do given_a_load_balancer do - model_tests(@lb.access_rules, { :address => '10.0.0.2', :type => 'ALLOW'}, false) do + model_tests(@lb.access_rules, { :address => '1.1.1.2', :type => 'ALLOW'}, false) do @lb.wait_for { ready? } end end diff --git a/tests/rackspace/models/load_balancers/access_lists_tests.rb b/tests/rackspace/models/load_balancers/access_lists_tests.rb index 4873a80c3..0e6b2a42d 100644 --- a/tests/rackspace/models/load_balancers/access_lists_tests.rb +++ b/tests/rackspace/models/load_balancers/access_lists_tests.rb @@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | access_lists', ['rackspace']) do given_a_load_balancer_service do given_a_load_balancer do - collection_tests(@lb.access_rules, { :address => '10.0.0.2', :type => 'ALLOW'}, false) do + collection_tests(@lb.access_rules, { :address => '1.1.1.2', :type => 'ALLOW'}, false) do @lb.wait_for { ready? } end end diff --git a/tests/rackspace/models/load_balancers/load_balancer_tests.rb b/tests/rackspace/models/load_balancers/load_balancer_tests.rb index dc028a830..b2ecf41f4 100644 --- a/tests/rackspace/models/load_balancers/load_balancer_tests.rb +++ b/tests/rackspace/models/load_balancers/load_balancer_tests.rb @@ -7,7 +7,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer', ['rackspace']) do :protocol => 'HTTP', :port => 80, :virtual_ips => [{ :type => 'PUBLIC'}], - :nodes => [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}] + :nodes => [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}] } given_a_load_balancer_service do diff --git a/tests/rackspace/models/load_balancers/load_balancers_tests.rb b/tests/rackspace/models/load_balancers/load_balancers_tests.rb index 9a37b2c08..fb7033eeb 100644 --- a/tests/rackspace/models/load_balancers/load_balancers_tests.rb +++ b/tests/rackspace/models/load_balancers/load_balancers_tests.rb @@ -10,7 +10,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancers', ['rackspace']) do :protocol => 'HTTP', :port => 80, :virtual_ips => [{ :type => 'PUBLIC'}], - :nodes => [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}] + :nodes => [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}] }, false) do @instance.wait_for { ready? } diff --git a/tests/rackspace/models/load_balancers/node_tests.rb b/tests/rackspace/models/load_balancers/node_tests.rb index c1bc197fc..43620e0bd 100644 --- a/tests/rackspace/models/load_balancers/node_tests.rb +++ b/tests/rackspace/models/load_balancers/node_tests.rb @@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node', ['rackspace']) do given_a_load_balancer_service do given_a_load_balancer do - model_tests(@lb.nodes, { :address => '10.0.0.2', :port => 80, :condition => 'ENABLED'}, false) do + model_tests(@lb.nodes, { :address => '1.1.1.2', :port => 80, :condition => 'ENABLED'}, false) do @lb.wait_for { ready? } tests("#save() => existing node with port = 88").succeeds do diff --git a/tests/rackspace/models/load_balancers/nodes_tests.rb b/tests/rackspace/models/load_balancers/nodes_tests.rb index 5e81dcd48..b51c3c958 100644 --- a/tests/rackspace/models/load_balancers/nodes_tests.rb +++ b/tests/rackspace/models/load_balancers/nodes_tests.rb @@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | nodes', ['rackspace']) do given_a_load_balancer_service do given_a_load_balancer do - collection_tests(@lb.nodes, { :address => '10.0.0.2', :port => 80, :condition => 'ENABLED'}, false) do + collection_tests(@lb.nodes, { :address => '1.1.1.2', :port => 80, :condition => 'ENABLED'}, false) do @lb.wait_for { ready? } end end diff --git a/tests/rackspace/requests/load_balancers/load_balancer_tests.rb b/tests/rackspace/requests/load_balancers/load_balancer_tests.rb index e23d71639..d912aafca 100644 --- a/tests/rackspace/requests/load_balancers/load_balancer_tests.rb +++ b/tests/rackspace/requests/load_balancers/load_balancer_tests.rb @@ -9,14 +9,14 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace' @lb_name = 'fog' + Time.now.to_i.to_s tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...)").formats(LOAD_BALANCER_FORMAT) do - data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]).body + data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]).body @lb_id = data['loadBalancer']['id'] data end tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...with algorithm)").formats(LOAD_BALANCER_FORMAT) do data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], - [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}], + [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}], { :algorithm => 'LEAST_CONNECTIONS' }).body @lb_id = data['loadBalancer']['id'] returns('LEAST_CONNECTIONS') { data['loadBalancer']['algorithm'] } @@ -39,8 +39,8 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace' sleep 10 end - tests("#list_load_balancers({:node_address => '10.0.0.1'})").formats(LOAD_BALANCERS_FORMAT) do - @service.list_load_balancers({:node_address => '10.0.0.1'}).body + tests("#list_load_balancers({:node_address => '1.1.1.1'})").formats(LOAD_BALANCERS_FORMAT) do + @service.list_load_balancers({:node_address => '1.1.1.1'}).body end tests("#update_load_balancer(#{@lb_id}, { :port => 80 })").succeeds do @@ -58,7 +58,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace' tests('failure') do tests('#create_load_balancer(invalid name)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do - @service.create_load_balancer('', 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]) + @service.create_load_balancer('', 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]) end tests('#get_load_balancer(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do diff --git a/tests/rackspace/requests/load_balancers/node_tests.rb b/tests/rackspace/requests/load_balancers/node_tests.rb index 637025411..10d004885 100644 --- a/tests/rackspace/requests/load_balancers/node_tests.rb +++ b/tests/rackspace/requests/load_balancers/node_tests.rb @@ -9,15 +9,15 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do tests('success') do @lb.wait_for { ready? } - tests("#create_node(#{@lb.id}, '10.10.10.10', 80, 'ENABLED')").formats(NODES_FORMAT) do - data = @service.create_node(@lb.id, '10.10.10.10', 80, 'ENABLED').body + tests("#create_node(#{@lb.id}, '1.1.1.2', 80, 'ENABLED')").formats(NODES_FORMAT) do + data = @service.create_node(@lb.id, '1.1.1.2', 80, 'ENABLED').body @nodes_created << data['nodes'][0]['id'] data end @lb.wait_for { ready? } tests('#create_node with weight').formats(NODES_FORMAT) do - data = @service.create_node(@lb.id, '10.10.10.11', 80, 'ENABLED', { :weight => 10 }).body + data = @service.create_node(@lb.id, '1.1.1.3', 80, 'ENABLED', { :weight => 10 }).body @nodes_created << data['nodes'][0]['id'] data end @@ -53,7 +53,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do @service.create_node(@lb.id, '', 80, 'ENABLED') end tests('#create_node(invalid condition)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do - @service.create_node(@lb.id, '10.10.10.10', 80, 'EABLED') + @service.create_node(@lb.id, '1.1.1.2', 80, 'EABLED') end tests("#get_node(#{@lb.id}, 0)").raises(Fog::Rackspace::LoadBalancers::NotFound) do @service.get_node(@lb.id, 0) @@ -76,7 +76,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do end @lb.wait_for { ready? } tests("#delete_node()").succeeds do - node_id = @service.create_node(@lb.id, '10.10.10.12', 80, 'ENABLED').body['nodes'][0]['id'] + node_id = @service.create_node(@lb.id, '1.1.1.3', 80, 'ENABLED').body['nodes'][0]['id'] @lb.wait_for { ready? } @service.delete_node(@lb.id, node_id) end