Skip to content

Commit

Permalink
Changes made to tests - can not use private IPs for public IP testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Lopaka Delp committed Jan 22, 2015
1 parent 9eb585e commit 91d34d4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand Down Expand Up @@ -96,7 +96,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand All @@ -121,7 +121,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand All @@ -146,7 +146,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand All @@ -171,7 +171,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand All @@ -196,7 +196,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand All @@ -216,7 +216,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.1.1']
public_ips: ['100.64.1.1']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand All @@ -237,7 +237,7 @@ suites:
attributes:
cloud:
provider: 'vagrant'
public_ips: ['10.10.2.2']
public_ips: ['100.64.2.2']
private_ips: ['10.0.2.15']
rs-mysql:
backup:
Expand Down
4 changes: 2 additions & 2 deletions test/integration/default/serverspec/server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
expect(default_tags['server:uuid'].first.value).to eq('1111111')
end

it "should have a public of 10.10.1.1" do
expect(default_tags['server:public_ip_0'].first.value).to eq('10.10.1.1')
it "should have a public of 100.64.1.1" do
expect(default_tags['server:public_ip_0'].first.value).to eq('100.64.1.1')
end

it "should have a bind port of 3306" do
Expand Down
8 changes: 4 additions & 4 deletions test/integration/master/serverspec/master_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
# The kitchen.yml file is set up to provide a public ip in the master suite. This is what this is testing.
# The slave setup will provide a null public, and a private ip.
describe "Verify valid server-id entry" do
it "should correspond to the result of IPAddr converting 10.10.1.1 to an integer" do
db.query("SHOW VARIABLES LIKE 'server_id'").entries.first['Value'].to_i.should == 168427777
it "should correspond to the result of IPAddr converting 100.64.1.1 to an integer" do
db.query("SHOW VARIABLES LIKE 'server_id'").entries.first['Value'].to_i.should == 1681916161
end
end

Expand All @@ -59,8 +59,8 @@
master_tags['server:uuid'].first.value.should eq('1111111')
end

it "should have a public IP of 10.10.1.1" do
master_tags['server:public_ip_0'].first.value.should eq('10.10.1.1')
it "should have a public IP of 100.64.1.1" do
master_tags['server:public_ip_0'].first.value.should eq('100.64.1.1')
end

it "should have a bind ip address of 10.0.2.15" do
Expand Down
4 changes: 2 additions & 2 deletions test/integration/slave/serverspec/slave_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
slave_tags['server:uuid'].first.value.should eq('2222222')
end

it "should have a public of 10.10.2.2" do
slave_tags['server:public_ip_0'].first.value.should eq('10.10.2.2')
it "should have a public of 100.64.2.2" do
slave_tags['server:public_ip_0'].first.value.should eq('100.64.2.2')
end

it "should have a private ip address of 10.0.2.15" do
Expand Down

0 comments on commit 91d34d4

Please sign in to comment.