From ba9ef798068630497e5626f2680a33c1144fe344 Mon Sep 17 00:00:00 2001
From: siddheshwar-more <siddheshwar.more@clogeny.com>
Date: Wed, 24 Jul 2013 17:02:07 +0530
Subject: [PATCH] Updated integration tests to use proper openstack-floating-ip
 openstack-private-network option

---
 spec/integration/openstack_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/integration/openstack_spec.rb b/spec/integration/openstack_spec.rb
index e93798c2..86e8cf3a 100644
--- a/spec/integration/openstack_spec.rb
+++ b/spec/integration/openstack_spec.rb
@@ -263,7 +263,7 @@ def get_winrm_credentials
         end
       end
 
-      context 'create server with --private-network option' do
+      context 'create server with --openstack-private-network option' do
         cmd_out = ""
         before(:each) { create_node_name("linux") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -273,7 +273,7 @@ def get_winrm_credentials
         " --yes" +
         get_ssh_credentials +
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --private-network"+
+        " --openstack-private-network"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should bootstrap sucessfully with private ip address.' do
@@ -281,7 +281,7 @@ def get_winrm_credentials
         end
       end
 
-      context 'create server with --floating-ip option' do
+      context 'create server with --openstack-floating-ip option' do
         cmd_out = ""
         before(:each) { create_node_name("linux") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -291,7 +291,7 @@ def get_winrm_credentials
         " --yes" +
         get_ssh_credentials +
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --floating-ip"+
+        " --openstack-floating-ip"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should associate a floating IP address to the new OpenStack node.' do
@@ -478,7 +478,7 @@ def get_winrm_credentials
         end
       end
 
-      context 'create server (for windows) with --private-network option' do
+      context 'create server (for windows) with --openstack-private-network option' do
         cmd_out = ""
         before(:each) { create_node_name("windows") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -490,7 +490,7 @@ def get_winrm_credentials
         " --bootstrap-protocol winrm" +
         get_winrm_credentials+
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --private-network"+
+        " --openstack-private-network"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should bootstrap sucessfully with private ip address.' do
@@ -498,7 +498,7 @@ def get_winrm_credentials
         end
       end
 
-      context 'create server (for windows) with --floating-ip option' do
+      context 'create server (for windows) with --openstack-floating-ip option' do
         cmd_out = ""
         before(:each) { create_node_name("windows") }
         let(:command) { "knife openstack server create -N #{@name_node}"+
@@ -510,7 +510,7 @@ def get_winrm_credentials
         " --bootstrap-protocol winrm" +
         get_winrm_credentials+
         " --identity-file #{temp_dir}/openstack.pem"+
-        " --floating-ip"+
+        " --openstack-floating-ip"+
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should associate a floating IP address to the new OpenStack node.' do