Filter out the username to allow for differences between dev envs

test/cassettes/core/service/i_default_session_data_/sets_the_service_s_default_session_data.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/service/i_request/accepts_an_endpoint_type_option_for_selecting_a_specific_request.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/service/i_request/can_find_the_correct_request_based_on_bootstrapped_session_data.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/service/i_request/can_find_the_correct_request_based_on_non-bootstrapped_session_data.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/service/i_request/can_find_the_correct_request_if_api_version_is_not_defined_but_can_be_inferred_from_host_uri.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/service/i_request/uses_the_default_session_data_if_session_data_is_not_provided.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/c_load/creates_a_new_instance_from_the_given_session_dump.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/c_load/uses_the_loaded_auth_info_for_its_services.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/c_new/directs_log_entries_to_the_given_log_file.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_authenticate/authenticates_against_the_auth_service_indicated_in_the_config_file.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_authenticate/authenticates_against_the_auth_service_using_the_credentials_in_the_given_block.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"}}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"}}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_authenticate/updates_the_session_data_of_its_service_objects.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json
@@ -65,7 +65,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_dump/serializes_the_session_data_for_caching.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_load/returns_itself.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_load/updates_the_session_data_of_its_service_objects.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json
@@ -65,7 +65,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_validate/returns_false_if_session_is_no_longer_valid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_validate/returns_true_if_session_is_still_valid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/core/session/i_xxx_service/returns_an_instance_of_the_indicated_service.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/leads_to_a_valid_response_when_no_parameters_are_provided.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/leads_to_a_valid_response_when_parameters_are_invalid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/leads_to_a_valid_response_when_parameters_are_valid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_body.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_body_.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_headers.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_headers_.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_http_method_.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_url.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/compute/v2/public/list_images/returns_the_correct_value_for_url_.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/identity/v2/admin/create_tenant/leads_to_a_valid_response_when_params_are_invalid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/identity/v2/admin/create_tenant/leads_to_a_valid_response_when_params_are_valid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/identity/v2/admin/create_tenant/leads_to_a_valid_response_when_provided_with_invalid_params.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"},"tenantName":"admin"}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"},"tenantName":"admin"}}'
     headers:
       Content-Type:
       - application/json

test/cassettes/openstack/identity/v2/public/create_token/leads_to_a_valid_response_when_parameters_are_valid.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"}}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"}}}'
     headers:
       Content-Type:
       - application/json

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

@@ -5,7 +5,7 @@ http_interactions:
     uri: <HOST_URI>:5000/v2.0/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"passwordCredentials":{"username":"admin","password":"<PASSWORD>"}}}'
+      string: ! '{"auth":{"passwordCredentials":{"username":"<USERNAME>","password":"<PASSWORD>"}}}'
     headers:
       Content-Type:
       - application/json

test/support/vcr_setup.rb

@@ -15,6 +15,8 @@ VCR.configure do |c|
     @vcr_port_matcher_registered = true
   end
 
+  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('<HOST_URI>') do