Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Openstack changes for Sprint86 merged into a common branch #44

Merged
merged 19 commits into from
Aug 6, 2013
Merged

Openstack changes for Sprint86 merged into a common branch #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ba9ef79
Updated integration tests to use proper openstack-floating-ip opensta…
Jul 24, 2013
54f45e1
Updated integration tests to add missing ssh-key option
Jul 24, 2013
d5f9b9c
Updated Gemfile to use CT/knife-cloud bootstrap branch
Jul 25, 2013
288636b
Added validation for openstack winrm password
Jul 26, 2013
06381a1
Marked floating ip related integration test as a pending
Jul 29, 2013
1cda189
Updated Gemfile to use refactor knife-windows
Jul 30, 2013
87a9c0d
Fixed typo in Gemfile
Jul 30, 2013
b923518
Updated Gemfile to use refactor knife-windows
Jul 30, 2013
2eec015
Fixed typo in Gemfile
Jul 30, 2013
aa085fd
Merge branch 'sid-oc-9112-gem-deps' of https://github.com/ClogenyTech…
Jul 30, 2013
4a24562
Updated Gemfile
Jul 30, 2013
0c99ec7
Fixing gem file dependency
Aug 1, 2013
7170679
Marked openstack-private-network option related integration tests as …
Aug 1, 2013
a1fd236
Fixed unit tests that failed after merge
Aug 1, 2013
00ee397
Merge branch 'knife-cloud-issues' of https://github.com/ClogenyTechno…
Aug 1, 2013
a8c3f79
Updated server create functional tests to stub validate_params
Aug 1, 2013
d0a0160
Updated integration tests to add image-os-type option
Aug 6, 2013
759221e
Merge branch 'sid-oc-9108-knife-openstack-travis' of https://github.c…
Aug 6, 2013
ad18300
Updated gem file with correct gem dependency for knife-cloud
Aug 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ group :development do
gem 'mixlib-shellout'
gem 'active_support'
gem 'activesupport'
gem 'knife-cloud', :git => 'https://github.com/ClogenyTechnologies/knife-cloud.git', :branch => 'bootstrap'
gem 'knife-cloud', :git => 'https://github.com/opscode/knife-cloud.git'
gem 'knife-windows', :git => 'https://github.com/opscode/knife-windows.git', :branch => 'knife-cloud'
end
2 changes: 1 addition & 1 deletion spec/functional/server_create_func_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

describe "run" do
before(:each) do
@knife_openstack_create.stub(:validate!)
@knife_openstack_create.stub(:validate_params!)
Fog::Compute::OpenStack.stub_chain(:new, :servers, :create).and_return(@new_openstack_server)
@knife_openstack_create.config[:openstack_floating_ip] = '-1'
@new_openstack_server.stub(:wait_for)
Expand Down
18 changes: 9 additions & 9 deletions spec/integration/openstack_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def rm_known_host
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}"+
Expand All @@ -283,7 +283,7 @@ def rm_known_host
" --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
Expand All @@ -292,7 +292,7 @@ def rm_known_host
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}"+
Expand All @@ -302,7 +302,7 @@ def rm_known_host
" --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
Expand Down Expand Up @@ -415,7 +415,7 @@ def rm_known_host
" --identity-file #{temp_dir}/openstack.pem"+
" --ssh-key #{@openstack_config['os_ssh_params']['key_pair']}"+
get_ssh_credentials_for_windows_image+
append_openstack_creds() }
append_openstack_creds() + " --image-os-type windows" }
after(:each) { run(delete_instance_cmd("#{cmd_stdout}")) }
it 'successfully create the (windows VM) server with the provided options and bootstrap.' do
pending 'not yet implemented'
Expand Down Expand Up @@ -502,7 +502,7 @@ def rm_known_host
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}"+
Expand All @@ -514,7 +514,7 @@ def rm_known_host
" --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
Expand All @@ -523,7 +523,7 @@ def rm_known_host
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}"+
Expand All @@ -535,7 +535,7 @@ def rm_known_host
" --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
Expand Down