use_cookbook-openstackclient/identity_v3

- Now use cookbook-openstackclient to create endpoints role service and
  user
- added domain creation and access granting
- added values to work with identity_v3
- rewrote specs to work again
- added needed keystone_authtoken attributes
- updated README

Change-Id: I2f339055883354c6a8a77daa7967ff279c4d18d9
Depends-On: I0f8955f05de9b33711c54b9a198f45018cceb8e1
Depends-On: If7b4d6e563081a0be9957353d73ef61a9688df56

3 files changed, 88 insertions, 124 deletions

diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index a224659..8e65abf 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -77,13 +77,11 @@ describe 'openstack-block-storage::cinder-common' do
 
         context 'endpoint related' do
           it 'has auth_uri' do
-            expect(chef_run).to render_file(file.name).with_content(%r{^auth_url = http://127.0.0.1:5000/v2.0$})
+            expect(chef_run).to render_file(file.name).with_content(%r{^auth_url = http://127.0.0.1:5000/v3$})
           end
         end
 
-        it 'has no auth_version when auth_version is v2.0' do
-          node.set['openstack']['block-storage']['api']['auth']['version'] = 'v2.0'
-
+        it do
           expect(chef_run).not_to render_file(file.name).with_content(/^auth_version = v2.0$/)
         end
 
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 35b79ea..6a8def2 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -12,153 +12,117 @@ describe 'openstack-block-storage::identity_registration' do
 
     include_context 'block-storage-stubs'
 
-    it 'registers service tenant' do
-      expect(chef_run).to create_tenant_openstack_identity_register(
-        'Register Service Tenant'
+    connection_params = {
+      openstack_auth_url: 'http://127.0.0.1:35357/v3/auth/tokens',
+      openstack_username: 'admin',
+      openstack_api_key: 'emc_test_pass',
+      openstack_project_name: 'admin',
+      openstack_domain_name: 'default'
+    }
+    service_name = 'cinderv2'
+    service_type = 'volumev2'
+    service_user = 'cinder'
+    url = 'http://127.0.0.1:8776/v2/%(tenant_id)s'
+    region = 'RegionOne'
+    project_name = 'service'
+    role_name = 'service'
+    password = 'cinder-pass'
+    domain_name = 'Default'
+
+    it "registers #{project_name} Project" do
+      expect(chef_run).to create_openstack_project(
+        project_name
       ).with(
-        auth_uri: 'http://127.0.0.1:35357/v2.0',
-        bootstrap_token: 'bootstrap-token',
-        tenant_name: 'service',
-        tenant_description: 'Service Tenant'
+        connection_params: connection_params
       )
     end
 
-    it 'registers cinder v2 volume service' do
-      expect(chef_run).to create_service_openstack_identity_register(
-        'Register Cinder V2 Volume Service'
+    it "registers #{service_name} service" do
+      expect(chef_run).to create_openstack_service(
+        service_name
       ).with(
-        auth_uri: 'http://127.0.0.1:35357/v2.0',
-        bootstrap_token: 'bootstrap-token',
-        service_name: 'cinderv2',
-        service_type: 'volumev2',
-        service_description: 'Cinder Volume Service V2',
-        endpoint_region: 'RegionOne',
-        endpoint_adminurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s',
-        endpoint_internalurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s',
-        endpoint_publicurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s'
+        connection_params: connection_params,
+        type: service_type
       )
     end
 
-    context 'registers v2 volume endpoint' do
-      it 'with default values' do
-        expect(chef_run).to create_endpoint_openstack_identity_register(
-          'Register Cinder V2 Volume Endpoint'
-        ).with(
-          auth_uri: 'http://127.0.0.1:35357/v2.0',
-          bootstrap_token: 'bootstrap-token',
-          service_name: 'cinderv2',
-          service_type: 'volumev2',
-          service_description: 'Cinder Volume Service V2',
-          endpoint_region: 'RegionOne',
-          endpoint_adminurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s',
-          endpoint_internalurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s',
-          endpoint_publicurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s'
-        )
-      end
-
-      it 'with all different URLs' do
-        admin_url = 'https://admin.host:123/admin_path'
-        internal_url = 'http://internal.host:456/internal_path'
-        public_url = 'https://public.host:789/public_path'
-
-        node.set['openstack']['endpoints']['internal']['block-storage']['uri'] = internal_url
-        node.set['openstack']['endpoints']['admin']['block-storage']['uri'] = admin_url
-        node.set['openstack']['endpoints']['public']['block-storage']['uri'] = public_url
-
-        expect(chef_run).to create_endpoint_openstack_identity_register(
-          'Register Cinder V2 Volume Endpoint'
-        ).with(
-          auth_uri: 'http://127.0.0.1:35357/v2.0',
-          bootstrap_token: 'bootstrap-token',
-          service_name: 'cinderv2',
-          service_type: 'volumev2',
-          service_description: 'Cinder Volume Service V2',
-          endpoint_region: 'RegionOne',
-          endpoint_adminurl: admin_url,
-          endpoint_internalurl: internal_url,
-          endpoint_publicurl: public_url
-        )
+    context "registers #{service_name} endpoint" do
+      %w(admin internal public).each do |interface|
+        it "#{interface} endpoint with default values" do
+          expect(chef_run).to create_openstack_endpoint(
+            service_type
+          ).with(
+            service_name: service_name,
+            # interface: interface,
+            url: url,
+            region: region,
+            connection_params: connection_params
+          )
+        end
       end
+      %w(admin internal public).each do |interface|
+        it "#{interface} with different service type/name and registers v1 endpoint" do
+          node.set['openstack']['block-storage']['service_name'] = 'cinder'
+          node.set['openstack']['block-storage']['service_type'] = 'volume'
 
-      it 'with different service type/name' do
-        node.set['openstack']['block-storage']['service_name'] = 'cinder'
-        node.set['openstack']['block-storage']['service_type'] = 'volume'
-
-        expect(chef_run).to create_endpoint_openstack_identity_register(
-          'Register Cinder V2 Volume Endpoint'
-        ).with(
-          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 V2',
-          endpoint_region: 'RegionOne',
-          endpoint_adminurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s',
-          endpoint_internalurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s',
-          endpoint_publicurl: 'http://127.0.0.1:8776/v2/%(tenant_id)s'
-        )
+          expect(chef_run).to create_openstack_endpoint(
+            'volume'
+          ).with(
+            service_name: 'cinder',
+            # interface: interface,
+            url: 'http://127.0.0.1:8776/v1/%(tenant_id)s',
+            region: 'RegionOne',
+            connection_params: connection_params
+          )
+        end
       end
 
       it 'with custom region override' do
         node.set['openstack']['block-storage']['region'] = 'volumeRegion'
-        expect(chef_run).to create_endpoint_openstack_identity_register(
-          'Register Cinder V2 Volume Endpoint'
-        ).with(endpoint_region: 'volumeRegion')
+        expect(chef_run).to create_openstack_endpoint(
+          service_type
+        ).with(region: 'volumeRegion')
       end
     end
 
     it 'registers service user' do
-      expect(chef_run).to create_user_openstack_identity_register(
-        'Register Cinder Service User'
+      expect(chef_run).to create_openstack_user(
+        service_user
       ).with(
-        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
+        project_name: project_name,
+        role_name: role_name,
+        password: password,
+        connection_params: connection_params
       )
     end
 
-    it 'grants service role to service user for service tenant' do
-      expect(chef_run).to grant_role_openstack_identity_register(
-        'Grant service Role to Cinder Service User for Cinder Service Tenant'
+    it do
+      expect(chef_run).to grant_domain_openstack_user(
+        service_user
       ).with(
-        auth_uri: 'http://127.0.0.1:35357/v2.0',
-        bootstrap_token: 'bootstrap-token',
-        tenant_name: 'service',
-        user_name: 'cinder',
-        role_name: 'service'
+        domain_name: domain_name,
+        role_name: role_name,
+        connection_params: connection_params
       )
     end
+
     it do
-      expect(chef_run).to create_service_openstack_identity_register(
-        'Register Cinder V1 Volume Service'
+      expect(chef_run).to grant_role_openstack_user(
+        service_user
       ).with(
-        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 V1',
-        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'
+        project_name: project_name,
+        role_name: role_name,
+        password: password,
+        connection_params: connection_params
       )
     end
-    it do
-      expect(chef_run).to create_endpoint_openstack_identity_register(
-        'Register Cinder V1 Volume Endpoint'
+
+    it 'registers cinder v1 volume service' do
+      expect(chef_run).to create_openstack_service(
+        'cinder'
       ).with(
-        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 V1',
-        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'
+        connection_params: connection_params,
+        type: 'volume'
       )
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9b80925..0876859 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -108,12 +108,14 @@ shared_examples 'creates_cinder_conf' do |service, user, group, action = :restar
 
     it do
       [
-        /^auth_type = v2password$/,
+        /^auth_type = v3password$/,
         /^region_name = RegionOne$/,
         /^username = cinder/,
-        /^tenant_name = service$/,
+        /^project_name = service$/,
+        /^user_domain_name = Default/,
+        /^project_domain_name = Default/,
         %r{^signing_dir = /var/cache/cinder/api$},
-        %r{^auth_url = http://127.0.0.1:5000/v2.0$},
+        %r{^auth_url = http://127.0.0.1:5000/v3$},
         /^password = cinder-pass$/
       ].each do |line|
         expect(chef_run).to render_config_file(file.name)