openstack
/
cookbook-openstack-common
Code Issues Proposed changes

Tempest / Integration fixes 

- added needed attributes to get glance image id
- edited specs in favor of identity v3

Change-Id: I9b87834190f013191cddaeffd1547278543e0dad
This commit is contained in:
Christoph Albers 2016-12-22 16:49:58 +01:00
parent d08dcf239c
commit 57fa9ecef7
4 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -27,7 +27,7 @@ default['openstack']['common']['custom_template_banner'] = '
'
# version for python-openstackclient
default['openstack']['common']['client_version'] = '3.4.1'
default['openstack']['common']['client_version'] = '3.6.0'
# OpenStack services and their project names
default['openstack']['common']['services'] = {

7
libraries/cli.rb
View File

@ -30,14 +30,17 @@ module ::Openstack
# @param [String] user name
# @param [String] tenant name
# @return [Hash] environment
def openstack_command_env(name, tenant)
def openstack_command_env(name, project, user_domain, project_domain)
identity_admin_endpoint = admin_endpoint 'identity'
auth_uri = ::URI.decode identity_admin_endpoint.to_s
pass = get_password 'user', name
{
'OS_USERNAME' => name,
'OS_PASSWORD' => pass,
'OS_TENANT_NAME' => tenant,
'OS_PROJECT_NAME' => project,
'OS_USER_DOMAIN_NAME' => user_domain,
'OS_PROJECT_DOMAIN_NAME' => project_domain,
'OS_IDENTITY_API_VERSION' => '3',
'OS_AUTH_URL' => auth_uri
}
end

56
spec/cli_spec.rb
View File

@ -18,7 +18,7 @@ describe 'openstack-common::default' do
node.set['openstack']['endpoints']['admin']['identity'] = {
host: '127.0.0.1',
scheme: 'http',
path: '/v2.0',
path: '/v3',
port: '35357'
}
end
@ -28,12 +28,15 @@ describe 'openstack-common::default' do
.and_return('pass')
expect(
subject.openstack_command_env('name', 'tenant')
subject.openstack_command_env('name', 'project', 'default', 'default')
).to eq(
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => '3'
)
end
end
@ -44,8 +47,11 @@ describe 'openstack-common::default' do
{
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => 3
}
allow(subject).to receive(:shell_out).with(
%w(openstack user list),
@ -61,8 +67,11 @@ describe 'openstack-common::default' do
{
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => 3
}
allow(subject).to receive(:shell_out).with(
%w(openstack --key1 value1 --key2 value2 --key3 user list),
@ -78,16 +87,16 @@ describe 'openstack-common::default' do
{
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => 3
}
allow(subject).to receive(:shell_out).with(
%w(openstack user list),
env: env
).and_return double('shell_out', exitstatus: 123, stdout: 'fail', stderr: '')
# TODO: need to figure out why this won't work.
# expect(subject.openstack_command('keystone', 'user-list', env)).to fail
end
end
@ -97,8 +106,11 @@ describe 'openstack-common::default' do
{
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => 3
}
allow(subject).to receive(:openstack_command).with('openstack', 'user list', env, {})
allow(subject).to receive(:prettytable_to_array)
@ -114,8 +126,11 @@ describe 'openstack-common::default' do
{
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => 3
}
end
@ -142,8 +157,11 @@ describe 'openstack-common::default' do
{
'OS_USERNAME' => 'name',
'OS_PASSWORD' => 'pass',
'OS_TENANT_NAME' => 'tenant',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
'OS_PROJECT_NAME' => 'project',
'OS_USER_DOMAIN_NAME' => 'default',
'OS_PROJECT_DOMAIN_NAME' => 'default',
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v3',
'OS_IDENTITY_API_VERSION' => 3
}
allow(subject).to receive(:openstack_command).with('openstack', 'network list', env, {})
allow(subject).to receive(:prettytable_to_array)

2
spec/client_spec.rb
View File

@ -15,7 +15,7 @@ describe 'openstack-common::client' do
it do
expect(chef_run).to install_python_package('python-openstackclient')
.with(version: '3.4.1')
.with(version: '3.6.0')
end
end
end