X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Funit%2Fprovider%2Fkeystone_tenant%2Fopenstack_spec.rb;h=1dec49e0603027fa4d0033c990ba0c991fca38cd;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=11861fc8b26fde7e5c5fc6ec13582cf2bb37640e;hpb=4631045ebb77ee8622f6fa09277a50c372bcc02e;p=dsa-puppet.git

diff --git a/3rdparty/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb b/3rdparty/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
index 11861fc8..1dec49e0 100644
--- a/3rdparty/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
+++ b/3rdparty/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
@@ -6,7 +6,14 @@ provider_class = Puppet::Type.type(:keystone_tenant).provider(:openstack)
 
 describe provider_class do
 
-  describe 'when updating a tenant' do
+  shared_examples 'authenticated with environment variables' do
+    ENV['OS_USERNAME']     = 'test'
+    ENV['OS_PASSWORD']     = 'abc123'
+    ENV['OS_PROJECT_NAME'] = 'test'
+    ENV['OS_AUTH_URL']     = 'http://127.0.0.1:35357/v2.0'
+  end
+
+  describe 'when managing a tenant' do
 
     let(:tenant_attrs) do
       {
@@ -14,12 +21,6 @@ describe provider_class do
         :description  => 'foo',
         :ensure       => 'present',
         :enabled      => 'True',
-        :auth         => {
-          'username'    => 'test',
-          'password'    => 'abc123',
-          'tenant_name' => 'foo',
-          'auth_url'    => 'http://127.0.0.1:5000/v2.0',
-        }
       }
     end
 
@@ -31,76 +32,59 @@ describe provider_class do
       provider_class.new(resource)
     end
 
-    describe '#create' do
-      it 'creates a tenant' do
-        provider.class.stubs(:openstack)
-                      .with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-                      .returns('"ID","Name","Description","Enabled"
+    it_behaves_like 'authenticated with environment variables' do
+      describe '#create' do
+        it 'creates a tenant' do
+          provider.class.stubs(:openstack)
+                        .with('project', 'list', '--quiet', '--format', 'csv', '--long')
+                        .returns('"ID","Name","Description","Enabled"
 "1cb05cfed7c24279be884ba4f6520262","foo","foo",True
 ')
-        provider.class.stubs(:openstack)
-                      .with('project', 'create', '--format', 'shell', [['foo', '--enable', '--description', 'foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-                      .returns('description="foo"
+          provider.class.stubs(:openstack)
+                        .with('project', 'create', '--format', 'shell', ['foo', '--enable', '--description', 'foo'])
+                        .returns('description="foo"
 enabled="True"
 name="foo"
 ')
-        provider.create
-        expect(provider.exists?).to be_truthy
-      end
-    end
-
-    describe '#destroy' do
-      it 'destroys a tenant' do
-        provider.class.stubs(:openstack)
-                      .with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-                      .returns('"ID","Name","Description","Enabled"')
-        provider.class.stubs(:openstack)
-                      .with('project', 'delete', [['foo', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-        provider.destroy
-        expect(provider.exists?).to be_falsey
+          provider.create
+          expect(provider.exists?).to be_truthy
+        end
       end
 
-    end
-
-    describe '#exists' do
-      context 'when tenant exists' do
-
-        subject(:response) do
+      describe '#destroy' do
+        it 'destroys a tenant' do
           provider.class.stubs(:openstack)
-                        .with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-                        .returns('"ID","Name","Description","Enabled"
-"1cb05cfed7c24279be884ba4f6520262","foo","foo",True
-')
-          response = provider.exists?
+                        .with('project', 'list', '--quiet', '--format', 'csv', '--long')
+                        .returns('"ID","Name","Description","Enabled"')
+          provider.class.stubs(:openstack)
+                        .with('project', 'delete', [])
+          provider.destroy
+          expect(provider.exists?).to be_falsey
         end
-
-        it { is_expected.to be_truthy }
       end
 
       context 'when tenant does not exist' do
-
         subject(:response) do
           provider.class.stubs(:openstack)
-                        .with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-                      .returns('"ID","Name","Description","Enabled"')
+                        .with('project', 'list', '--quiet', '--format', 'csv', '--long')
+                        .returns('"ID","Name","Description","Enabled"')
           response = provider.exists?
         end
 
         it { is_expected.to be_falsey }
       end
-    end
 
-    describe '#instances' do
-      it 'finds every tenant' do
-        provider.class.stubs(:openstack)
-                      .with('project', 'list', '--quiet', '--format', 'csv', [['--long', '--os-username', 'test', '--os-password', 'abc123', '--os-tenant-name', 'foo', '--os-auth-url', 'http://127.0.0.1:5000/v2.0']])
-                      .returns('"ID","Name","Description","Enabled"
+      describe '#instances' do
+        it 'finds every tenant' do
+          provider.class.stubs(:openstack)
+                        .with('project', 'list', '--quiet', '--format', 'csv', '--long')
+                       .returns('"ID","Name","Description","Enabled"
 "1cb05cfed7c24279be884ba4f6520262","foo","foo",True
 ')
-        instances = provider.instances
-        expect(instances.count).to eq(1)
+          instances = Puppet::Type::Keystone_tenant::ProviderOpenstack.instances
+          expect(instances.count).to eq(1)
+        end
       end
     end
-
   end
 end