Updated integration tests to use proper openstack-floating-ip opensta…

…ck-private-network option
chef · Jul 24, 2013 · ba9ef79 · ba9ef79
1 parent f66ae53
commit ba9ef79
Showing 1 changed file with 8 additions and 8 deletions.
diff --git 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,15 +273,15 @@ 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
           match_status("should succeed")
         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,15 +490,15 @@ 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
           match_status("should succeed")
         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