From 91d34d46d4e42884e669f954cc0dc07842de9193 Mon Sep 17 00:00:00 2001
From: Lopaka Delp <lopaka@rightscale.com>
Date: Thu, 22 Jan 2015 12:01:47 -0800
Subject: [PATCH] Changes made to tests - can not use private IPs for public IP
 testing

---
 .kitchen.yml                                     | 16 ++++++++--------
 .../default/serverspec/server_spec.rb            |  4 ++--
 .../integration/master/serverspec/master_spec.rb |  8 ++++----
 test/integration/slave/serverspec/slave_spec.rb  |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index a870a21..729cf80 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
diff --git a/test/integration/default/serverspec/server_spec.rb b/test/integration/default/serverspec/server_spec.rb
index 6e97e28..acf6f89 100644
--- a/test/integration/default/serverspec/server_spec.rb
+++ b/test/integration/default/serverspec/server_spec.rb
@@ -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
diff --git a/test/integration/master/serverspec/master_spec.rb b/test/integration/master/serverspec/master_spec.rb
index 51f9701..ef2cfdc 100644
--- a/test/integration/master/serverspec/master_spec.rb
+++ b/test/integration/master/serverspec/master_spec.rb
@@ -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
 
@@ -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
diff --git a/test/integration/slave/serverspec/slave_spec.rb b/test/integration/slave/serverspec/slave_spec.rb
index de85fa4..16e1aa5 100644
--- a/test/integration/slave/serverspec/slave_spec.rb
+++ b/test/integration/slave/serverspec/slave_spec.rb
@@ -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