From 717067906c6068704ebb24619d3946cd65315ff7 Mon Sep 17 00:00:00 2001
From: siddheshwar-more <siddheshwar.more@clogeny.com>
Date: Thu, 1 Aug 2013 17:35:51 +0530
Subject: [PATCH] Marked openstack-private-network option related integration
 tests as pending

---
 spec/integration/openstack_spec.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/spec/integration/openstack_spec.rb b/spec/integration/openstack_spec.rb
index de2143b2..7b8c41a8 100644
--- a/spec/integration/openstack_spec.rb
+++ b/spec/integration/openstack_spec.rb
@@ -49,6 +49,10 @@ def get_winrm_credentials
   " --winrm-password #{@openstack_config['os_winrm_params']['winrm_password']}"
 end
 
+def rm_known_host
+  FileUtils.rm_rf("~/.ssh/known_hosts")
+end
+
 describe 'knife-openstack' do
   include KnifeTestBed
   include RSpec::KnifeTestUtils
@@ -120,6 +124,7 @@ def get_winrm_credentials
     end
 
     describe 'Linux Platform Tests - knife' , :if => is_config_present do
+      after(:each) {rm_known_host}
       context 'create server with standard options' do
         cmd_out = ""
         before(:each) { create_node_name("linux") }
@@ -130,7 +135,7 @@ def get_winrm_credentials
         " --yes" +
         get_ssh_credentials +
         " --identity-file #{temp_dir}/openstack.pem"+
-        append_openstack_creds }
+        append_openstack_creds + "  --sudo"}
         after(:each)  { cmd_out = "#{cmd_stdout}" }
         it 'should successfully create the server with the provided options.' do
           match_status("should succeed")
@@ -277,6 +282,7 @@ def get_winrm_credentials
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should bootstrap sucessfully with private ip address.' do
+          pending "not yet done"
           match_status("should succeed")
         end
       end
@@ -302,6 +308,7 @@ def get_winrm_credentials
     end
 
     describe 'Windows Platform Tests - knife' , :if => is_config_present do
+      after(:each) {rm_known_host}
       context 'create server (for windows) with standard options' do
         cmd_out = ""
         before(:each) { create_node_name("windows") }
@@ -311,7 +318,7 @@ def get_winrm_credentials
         " --template-file " + get_windows_msi_template_file_path +
         " --server-url http://localhost:8889" +
         " --bootstrap-protocol winrm" +
-        " --yes" +
+        " --yes --server-create-timeout 1800" +
         get_winrm_credentials+
         append_openstack_creds_for_windows() }
         after(:each)  { cmd_out = "#{cmd_stdout}" }
@@ -394,7 +401,7 @@ def get_winrm_credentials
         " -f #{@openstack_config['os_params']['windows_flavor']} "+
         " --template-file " + get_windows_msi_template_file_path +
         " --server-url http://localhost:8889" +
-        " --yes" +
+        " --yes --server-create-timeout 1800" +
         " --identity-file #{temp_dir}/openstack.pem"+
         " --ssh-key #{@openstack_config['os_ssh_params']['key_pair']}"+
         get_ssh_credentials_for_windows_image+
@@ -496,6 +503,7 @@ def get_winrm_credentials
         append_openstack_creds() }
         after(:each)  { run(delete_instance_cmd("#{cmd_stdout}")) }
         it 'should bootstrap sucessfully with private ip address.' do
+          pending "not yet done"
           match_status("should succeed")
         end
       end