openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

Unified Rubocop cleanups under single file.

Browse Source 
Consolidate all the .rubocop.yml into a single file, finished out cleanups for
all the Ruby files.

Change-Id: I92d5983724d5d0185cd25bea6a0f46657a6c05d4
Addresses: blueprint rubocop-for-block-storage
This commit is contained in:
Matt Ray
2014-01-15 23:12:39 -06:00
parent df36ef89be
commit 60e37c5eb0
33 changed files with 726 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
spec/identity_registration_spec.rb
View File

@@ -2,85 +2,85 @@
#
# Cookbook Name:: openstack-block-storage
require_relative "spec_helper"
require_relative 'spec_helper'
describe "openstack-block-storage::identity_registration" do
describe 'openstack-block-storage::identity_registration' do
before do
block_storage_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-block-storage::identity_registration"
@chef_run.converge 'openstack-block-storage::identity_registration'
end
it "registers cinder volume service" do
it 'registers cinder volume service' do
resource = @chef_run.find_resource(
"openstack-identity_register",
"Register Cinder Volume Service"
'openstack-identity_register',
'Register Cinder Volume Service'
).to_hash
expect(resource).to include(
:auth_uri => "http://127.0.0.1:35357/v2.0",
:bootstrap_token => "bootstrap-token",
:service_name => "cinder",
:service_type => "volume",
:service_description => "Cinder Volume Service",
:endpoint_region => "RegionOne",
:endpoint_adminurl => "http://127.0.0.1:8776/v1/%(tenant_id)s",
:endpoint_internalurl => "http://127.0.0.1:8776/v1/%(tenant_id)s",
:endpoint_publicurl => "http://127.0.0.1:8776/v1/%(tenant_id)s",
:action => [:create_service]
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
service_name: 'cinder',
service_type: 'volume',
service_description: 'Cinder Volume Service',
endpoint_region: 'RegionOne',
endpoint_adminurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
endpoint_internalurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
endpoint_publicurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
action: [:create_service]
)
end
it "registers cinder volume endpoint" do
it 'registers cinder volume endpoint' do
resource = @chef_run.find_resource(
"openstack-identity_register",
"Register Cinder Volume Endpoint"
'openstack-identity_register',
'Register Cinder Volume Endpoint'
).to_hash
expect(resource).to include(
:auth_uri => "http://127.0.0.1:35357/v2.0",
:bootstrap_token => "bootstrap-token",
:service_name => "cinder",
:service_type => "volume",
:service_description => "Cinder Volume Service",
:endpoint_region => "RegionOne",
:endpoint_adminurl => "http://127.0.0.1:8776/v1/%(tenant_id)s",
:endpoint_internalurl => "http://127.0.0.1:8776/v1/%(tenant_id)s",
:endpoint_publicurl => "http://127.0.0.1:8776/v1/%(tenant_id)s",
:action => [:create_endpoint]
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
service_name: 'cinder',
service_type: 'volume',
service_description: 'Cinder Volume Service',
endpoint_region: 'RegionOne',
endpoint_adminurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
endpoint_internalurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
endpoint_publicurl: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
action: [:create_endpoint]
)
end
it "registers service user" do
it 'registers service user' do
resource = @chef_run.find_resource(
"openstack-identity_register",
"Register Cinder Service User"
'openstack-identity_register',
'Register Cinder Service User'
).to_hash
expect(resource).to include(
:auth_uri => "http://127.0.0.1:35357/v2.0",
:bootstrap_token => "bootstrap-token",
:tenant_name => "service",
:user_name => "cinder",
:user_pass => "cinder-pass",
:user_enabled => true,
:action => [:create_user]
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
tenant_name: 'service',
user_name: 'cinder',
user_pass: 'cinder-pass',
user_enabled: true,
action: [:create_user]
)
end
it "grants admin role to service user for service tenant" do
it 'grants admin role to service user for service tenant' do
resource = @chef_run.find_resource(
"openstack-identity_register",
"Grant service Role to Cinder Service User for Cinder Service Tenant"
'openstack-identity_register',
'Grant service Role to Cinder Service User for Cinder Service Tenant'
).to_hash
expect(resource).to include(
:auth_uri => "http://127.0.0.1:35357/v2.0",
:bootstrap_token => "bootstrap-token",
:tenant_name => "service",
:user_name => "cinder",
:role_name => "admin",
:action => [:grant_role]
auth_uri: 'http://127.0.0.1:35357/v2.0',
bootstrap_token: 'bootstrap-token',
tenant_name: 'service',
user_name: 'cinder',
role_name: 'admin',
action: [:grant_role]
)
end
end