aviator 0.0.3 → 0.0.4

data/test/cassettes/openstack/identity/v2/public/create_token/leads_to_a_valid_response_when_provided_with_a_token.yml

@@ -2,10 +2,10 @@
 http_interactions:
 - request:
     method: post
-    uri: <HOST_URI>:5000/v2.0/tokens
+    uri: <OPENSTACK_ADMIN_HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"}}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<OPENSTACK_ADMIN_USERNAME>","password":"<OPENSTACK_ADMIN_PASSWORD>"}}}'
     headers:
       Content-Type:
       - application/json
@@ -21,26 +21,26 @@ http_interactions:
       content-type:
       - application/json
       content-length:
-      - '329'
+      - '339'
       date:
-      - Wed, 28 Aug 2013 23:50:40 GMT
+      - Wed, 04 Sep 2013 21:37:03 GMT
       connection:
       - close
     body:
       encoding: US-ASCII
-      string: ! '{"access": {"token": {"issued_at": "2013-08-28T23:50:40.142756",
-        "expires": "2013-08-29T23:50:40Z", "id": "7936a6fa365a47e5b165a5d15f667a32"},
-        "serviceCatalog": [], "user": {"username": "admin", "roles_links": [], "id":
-        "cbbcc4f7aef6435fa2da7e5f0b2f1e97", "roles": [], "name": "admin"}, "metadata":
-        {"is_admin": 0, "roles": []}}}'
+      string: ! '{"access": {"token": {"issued_at": "2013-09-04T21:37:03.750401",
+        "expires": "2013-09-05T21:37:03Z", "id": "ec6a1a5bde59439186250d2db4cbe045"},
+        "serviceCatalog": [], "user": {"username": "<OPENSTACK_ADMIN_USERNAME>", "roles_links":
+        [], "id": "b4217edff9a14c3888439386a726ada9", "roles": [], "name": "<OPENSTACK_ADMIN_USERNAME>"},
+        "metadata": {"is_admin": 0, "roles": []}}}'
     http_version: 
-  recorded_at: Wed, 28 Aug 2013 23:48:15 GMT
+  recorded_at: Wed, 04 Sep 2013 21:36:55 GMT
 - request:
     method: post
-    uri: <HOST_URI>:5000/v2.0/tokens
+    uri: <OPENSTACK_ADMIN_HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"token":{"id":"7936a6fa365a47e5b165a5d15f667a32"},"tenantName":"<TENANT>"}}'
+      string: ! '{"auth":{"token":{"id":"ec6a1a5bde59439186250d2db4cbe045"},"tenantName":"<OPENSTACK_ADMIN_TENANTNAME>"}}'
     headers:
       Content-Type:
       - application/json
@@ -56,19 +56,20 @@ http_interactions:
       content-type:
       - application/json
       content-length:
-      - '2648'
+      - '2657'
       date:
-      - Wed, 28 Aug 2013 23:50:40 GMT
+      - Wed, 04 Sep 2013 21:37:03 GMT
       connection:
       - close
     body:
       encoding: US-ASCII
-      string: ! '{"access": {"token": {"issued_at": "2013-08-28T23:50:40.615438",
-        "expires": "2013-08-29T23:50:40Z", "id": "ebdd1c61693546208a273fc891e65c4b",
-        "tenant": {"description": null, "enabled": true, "id": "3cab25130620477b8b03f1bfa8741603",
-        "name": "admin"}}, "serviceCatalog": [{"endpoints": [{"adminURL": "http://192.168.56.11:8774/v2/3cab25130620477b8b03f1bfa8741603",
-        "region": "RegionOne", "internalURL": "http://192.168.56.11:8774/v2/3cab25130620477b8b03f1bfa8741603",
-        "id": "3b72a66bf2f0491bb8dba827cade0d48", "publicURL": "http://192.168.56.11:8774/v2/3cab25130620477b8b03f1bfa8741603"}],
+      string: ! '{"access": {"token": {"issued_at": "2013-09-04T21:37:03.834608",
+        "expires": "2013-09-05T21:37:03Z", "id": "063efc2080b545bfb3201a7f20e50ce4",
+        "tenant": {"description": null, "enabled": true, "id": "99ac3327702a4da09fd2513fe7d8e5bf",
+        "name": "<OPENSTACK_ADMIN_TENANTNAME>"}}, "serviceCatalog": [{"endpoints":
+        [{"adminURL": "http://192.168.56.11:8774/v2/99ac3327702a4da09fd2513fe7d8e5bf",
+        "region": "RegionOne", "internalURL": "http://192.168.56.11:8774/v2/99ac3327702a4da09fd2513fe7d8e5bf",
+        "id": "3b72a66bf2f0491bb8dba827cade0d48", "publicURL": "http://192.168.56.11:8774/v2/99ac3327702a4da09fd2513fe7d8e5bf"}],
         "endpoints_links": [], "type": "compute", "name": "nova"}, {"endpoints": [{"adminURL":
         "http://192.168.56.11:3333", "region": "RegionOne", "internalURL": "http://192.168.56.11:3333",
         "id": "482f749b370c40eab8788d6d0bc47f48", "publicURL": "http://192.168.56.11:3333"}],
@@ -79,9 +80,9 @@ http_interactions:
         "http://192.168.56.11:8777", "region": "RegionOne", "internalURL": "http://192.168.56.11:8777",
         "id": "4eb4edec1d2647bfb8ba4f9a5757169d", "publicURL": "http://192.168.56.11:8777"}],
         "endpoints_links": [], "type": "metering", "name": "ceilometer"}, {"endpoints":
-        [{"adminURL": "http://192.168.56.11:8776/v1/3cab25130620477b8b03f1bfa8741603",
-        "region": "RegionOne", "internalURL": "http://192.168.56.11:8776/v1/3cab25130620477b8b03f1bfa8741603",
-        "id": "009e8a41953d439f845b2a0c0dc28b73", "publicURL": "http://192.168.56.11:8776/v1/3cab25130620477b8b03f1bfa8741603"}],
+        [{"adminURL": "http://192.168.56.11:8776/v1/99ac3327702a4da09fd2513fe7d8e5bf",
+        "region": "RegionOne", "internalURL": "http://192.168.56.11:8776/v1/99ac3327702a4da09fd2513fe7d8e5bf",
+        "id": "009e8a41953d439f845b2a0c0dc28b73", "publicURL": "http://192.168.56.11:8776/v1/99ac3327702a4da09fd2513fe7d8e5bf"}],
         "endpoints_links": [], "type": "volume", "name": "cinder"}, {"endpoints":
         [{"adminURL": "http://192.168.56.11:8773/services/Admin", "region": "RegionOne",
         "internalURL": "http://192.168.56.11:8773/services/Cloud", "id": "6820836ec6834548bf7b54da0271dded",
@@ -90,9 +91,9 @@ http_interactions:
         "region": "RegionOne", "internalURL": "http://192.168.56.11:5000/v2.0", "id":
         "24a95f51f67949e784971e97463ee4d8", "publicURL": "http://192.168.56.11:5000/v2.0"}],
         "endpoints_links": [], "type": "identity", "name": "keystone"}], "user": {"username":
-        "admin", "roles_links": [], "id": "cbbcc4f7aef6435fa2da7e5f0b2f1e97", "roles":
-        [{"name": "admin"}], "name": "admin"}, "metadata": {"is_admin": 0, "roles":
-        ["01a81f2dbb3441f1aaa8fe68a7c6f546"]}}}'
+        "<OPENSTACK_ADMIN_USERNAME>", "roles_links": [], "id": "b4217edff9a14c3888439386a726ada9",
+        "roles": [{"name": "admin"}], "name": "<OPENSTACK_ADMIN_USERNAME>"}, "metadata":
+        {"is_admin": 0, "roles": ["01a81f2dbb3441f1aaa8fe68a7c6f546"]}}}'
     http_version: 
-  recorded_at: Wed, 28 Aug 2013 23:48:15 GMT
+  recorded_at: Wed, 04 Sep 2013 21:36:55 GMT
 recorded_with: VCR 2.5.0

data/test/environment.yml.example

@@ -1,4 +1,4 @@
-openstack: &openstack
+common: &common
   provider:      openstack
   auth_service:
     name:        identity
@@ -7,16 +7,23 @@ openstack: &openstack
     validator:   list_tenants
     api_version: v2
   
+  
+# This is expected by the test suite. You may change its values freely
+# as long as the name 'openstack_admin' doesn't change and the user's
+# role in the tenant is that of 'admin'
 openstack_admin:
-  <<: *openstack
+  <<: *common
   auth_credentials:
-    username:   admin
-    password:   mypassword
-    tenantName: admin
+    username:   aviatortest_admin
+    password:   aviatortest_password_admin
+    tenantName: aviatortest_project_admin
 
+# This is expected by the test suite. You may change its values freely
+# as long as the name 'openstack_member' doesn't change and the user's
+# role in the tenant is that of 'member'
 openstack_member:
-  <<: *openstack
+  <<: *common
   auth_credentials:
-    username:   nonadmin
-    password:   mypassword
-    tenantName: nonadminproject
+    username:   aviatortest_member
+    password:   aviatortest_password_member
+    tenantName: aviatortest_project_member

data/test/environment.yml.travis-ci

@@ -1,24 +1,29 @@
-openstack: &openstack
+common: &common
   provider:      openstack
   auth_service:
     name:        identity
-    host_uri:    http://example.org:5000
+    host_uri:    http://www.openstack.com:5000
     request:     create_token
     validator:   list_tenants
     api_version: v2
   
-openstack_admin: &openstack_admin
-  <<: *openstack
+  
+# This is expected by the test suite. You may change its values freely
+# as long as the name 'openstack_admin' doesn't change and the user's
+# role in the tenant is that of 'admin'
+openstack_admin:
+  <<: *common
   auth_credentials:
-    username:   admin
-    password:   mypassword
-    tenantName: admin
+    username:   aviatortest_admin
+    password:   aviatortest_password_admin
+    tenantName: aviatortest_project_admin
 
-openstack_member: &openstack_member
-  <<: *openstack
+# This is expected by the test suite. You may change its values freely
+# as long as the name 'openstack_member' doesn't change and the user's
+# role in the tenant is that of 'member'
+openstack_member:
+  <<: *common
   auth_credentials:
-    username:   nonadmin
-    password:   mypassword
-    tenantName: nonadminproject
-
-test: *openstack_admin
+    username:   aviatortest_member
+    password:   aviatortest_password_member
+    tenantName: aviatortest_project_member

data/test/support/vcr_setup.rb

@@ -14,17 +14,42 @@ VCR.configure do |c|
     end
     @vcr_port_matcher_registered = true
   end
+  
+  #=========== BEGIN FILTERS FOR SENSITIVE DATA ===========
 
-  c.filter_sensitive_data('"username":"<USERNAME>"') { %Q{"username":"#{ Aviator::Test::Environment.openstack_admin[:auth_credentials][:username] }"} }
-  c.filter_sensitive_data('"username":"<USERNAME>"') { %Q{"username":"#{ Aviator::Test::Environment.openstack_member[:auth_credentials][:username] }"} }
-  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('"tenantName":"<TENANT>"') { %Q{"tenantName":"#{ Aviator::Test::Environment.openstack_admin[:auth_credentials][:tenantName] }"} }
-  c.filter_sensitive_data('"tenantName":"<TENANT>"') { %Q{"tenantName":"#{ Aviator::Test::Environment.openstack_member[:auth_credentials][:tenantName] }"} }
-  c.filter_sensitive_data('<HOST_URI>') do
-    auth_url = URI(Aviator::Test::Environment.openstack[:auth_service][:host_uri])
-    auth_url.scheme + '://' + auth_url.host
-   end
+  configs = [:openstack_admin, :openstack_member]
+  env     = Aviator::Test::Environment
+
+  [:username, :password, :tenantName].each do |key|
+    configs.each do |config|
+      c.filter_sensitive_data("<#{ config.to_s.upcase }_#{key.to_s.upcase}>") { env.send(config)[:auth_credentials][key]  }
+    end
+  end
+
+  configs.each do |config|
+
+    c.filter_sensitive_data("<#{ config.to_s.upcase }_HOST_URI>") do
+      auth_url = URI(env.send(config)[:auth_service][:host_uri])
+      auth_url.scheme + '://' + auth_url.host
+     end
+  
+    # In a multi-host environment, this will come in handy since HOST_URI wont match the
+    # URI of services or resources available in a different host but same domain.
+    c.filter_sensitive_data("<#{ config.to_s.upcase }_ENV_DOMAIN>") do
+      domain_patterns = Regexp.union([
+        /\.[\w-]+\.[^\.]+\.\w{2,3}$/,
+        /\.[^\.]+\.\w{2,3}$/,
+        /\.[^\.]+\.\w{2,3}.\w+$/,
+        /^\w+$/
+      ])
+    
+      auth_url = URI(env.send(config)[:auth_service][:host_uri])
+      auth_url.host.match(domain_patterns)
+    end
+
+  end
+
+  #=========== END FILTERS FOR SENSITIVE DATA ===========
 
   c.default_cassette_options = {
     # If no cassette exists for a spec, VCR will record. Afterwards, VCR will

data/test/test_helper.rb

@@ -27,8 +27,10 @@ end
 # Clean the tmp dir of log files
 Dir[Pathname.new(__FILE__).expand_path.join('..', '..', 'tmp', '*.log')].each { |f| File.delete(f) }
 
-# Make sure this loads first
+# Make sure these files are loaded before the others since there are some CI workers
+# in Travis CI that seem to load files in the iterator below in a random way.
 require Pathname.new(__FILE__).join('..', 'support', 'test_base_class.rb').expand_path
+require Pathname.new(__FILE__).join('..', 'support', 'test_environment.rb').expand_path
 
 # Load all helpers in test/support
 Dir[Pathname.new(__FILE__).join('..', 'support', '*.rb')].each do |f|