Rename environment.yml keys to something more appropriate

lib/aviator/core.rb

@@ -6,7 +6,3 @@ require "aviator/version"
 require "aviator/core/request"
 require "aviator/core/response"
 require "aviator/core/service"
-
-module Aviator
-  # Your code goes here...
-end

test/aviator/core/service_test.rb

@@ -5,7 +5,7 @@ class Aviator::Test
   describe 'aviator/core/service' do
 
     def config
-      Environment.admin
+      Environment.openstack_admin
     end
     
     def klass

test/aviator/openstack/identity/v2/public/create_token_test.rb

@@ -6,8 +6,8 @@ class Aviator::Test
 
     def create_request
       klass.new(helper.admin_bootstrap_session_data) do |params|
-        params[:username] = Environment.admin[:auth_credentials][:username]
-        params[:password] = Environment.admin[:auth_credentials][:password]
+        params[:username] = Environment.openstack_admin[:auth_credentials][:username]
+        params[:password] = Environment.openstack_admin[:auth_credentials][:password]
       end
     end
 
@@ -66,8 +66,8 @@ class Aviator::Test
       p = {
         auth: {
           passwordCredentials: {
-            username: Environment.admin[:auth_credentials][:username],
-            password: Environment.admin[:auth_credentials][:password]
+            username: Environment.openstack_admin[:auth_credentials][:username],
+            password: Environment.openstack_admin[:auth_credentials][:password]
           }
         }
       }

test/environment.yml.example

@@ -1,20 +1,20 @@
-common: &common
-  provider:     openstack
+openstack: &openstack
+  provider:      openstack
   auth_service:
     name:        identity
     host_uri:    http://devstack:5000
     request:     create_token
     api_version: v2
   
-admin:
-  <<: *common
+openstack_admin:
+  <<: *openstack
   auth_credentials:
     username:   admin
     password:   mypassword
     tenantName: admin
 
-non_admin:
-  <<: *common
+openstack_member:
+  <<: *openstack
   auth_credentials:
     username:   nonadmin
     password:   mypassword

test/support/openstack_request_test_helper.rb

@@ -41,7 +41,7 @@ class Test
 
       def admin_bootstrap_session_data
         {
-          auth_service: Environment.admin[:auth_service]
+          auth_service: Environment.openstack_admin[:auth_service]
         }
       end
     

test/support/vcr_setup.rb

@@ -15,10 +15,10 @@ VCR.configure do |c|
     @vcr_port_matcher_registered = true
   end
 
-  c.filter_sensitive_data('"password":"<PASSWORD>"') { %Q{"password":"#{ Aviator::Test::Environment.admin[:auth_credentials][:password] }"} }
-  c.filter_sensitive_data('"password":"<PASSWORD>"') { %Q{"password":"#{ Aviator::Test::Environment.non_admin[:auth_credentials][:password] }"} }
+  c.filter_sensitive_data('"password":"<PASSWORD>"') { %Q{"password":"#{ Aviator::Test::Environment.openstack_admin[:auth_credentials][:password] }"} }
+  c.filter_sensitive_data('"password":"<PASSWORD>"') { %Q{"password":"#{ Aviator::Test::Environment.openstack_member[:auth_credentials][:password] }"} }
   c.filter_sensitive_data('<HOST_URI>') do
-    auth_url = URI(Aviator::Test::Environment.common[:auth_service][:host_uri])
+    auth_url = URI(Aviator::Test::Environment.openstack[:auth_service][:host_uri])
     auth_url.scheme + '://' + auth_url.host
    end