Remove gabbi tests that check content-location

The content-location header is an artifact of using httplib2
and not something that ceilometer itself returns. Gabbi is going
to stop using httplib2 (and so is much of OpenStack) so to prepare
for that these tests need to stop testing something that doesn't
really mean anything.

Change-Id: If5aacaf108402146d66fee474793dde1c0a59a7c
(cherry picked from commit 639b9476bd8554bee93512a81ae24605c766f080)

3 files changed, 0 insertions, 37 deletions

diff --git a/ceilometer/tests/functional/gabbi/gabbits/api_events_no_data.yaml b/ceilometer/tests/functional/gabbi/gabbits/api_events_no_data.yaml
index c6faeb20..d18aad60 100644
--- a/ceilometer/tests/functional/gabbi/gabbits/api_events_no_data.yaml
+++ b/ceilometer/tests/functional/gabbi/gabbits/api_events_no_data.yaml
@@ -15,7 +15,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -70,7 +69,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=event_type&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_strings:
       - "[]"
 
@@ -91,7 +89,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -105,7 +102,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=bad_field&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_strings:
       - "[]"
 
@@ -126,7 +122,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -178,7 +173,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types
   response_strings:
       - "[]"
 
@@ -200,7 +194,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits
   response_strings:
       - "[]"
 
@@ -213,6 +206,5 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits/ate
   response_strings:
       - "[]"
diff --git a/ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml b/ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml
index 67a0dc37..01082ff9 100644
--- a/ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml
+++ b/ceilometer/tests/functional/gabbi/gabbits/api_events_with_data.yaml
@@ -14,7 +14,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_json_paths:
       $.[0].event_type: cookies_chocolate.chip
       $.[0].traits.[0].value: chocolate.chip
@@ -48,7 +47,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=event_type&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_json_paths:
       $.[0].event_type: cookies_chocolate.chip
       $.[0].traits.[0].value: chocolate.chip
@@ -70,7 +68,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_json_paths:
       $.[0].event_type: cookies_chocolate.chip
       $.[0].traits.[0].value: chocolate.chip
@@ -85,7 +82,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=bad_field&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_strings:
       - "[]"
 
@@ -106,7 +102,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -135,7 +130,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events/fea1b15a-1d47-4175-85a5-a4bb2c729240
   response_json_paths:
       $.event_type: cookies_chocolate.chip
       $.traits.[0].value: chocolate.chip
@@ -159,7 +153,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types
   response_strings:
       - cookies_chocolate.chip
       - cookies_peanut.butter
@@ -192,7 +185,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits
   response_json_paths:
       $.[0].type: string
       $.[1].name: ate
@@ -206,7 +198,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/bad_event_type/traits
   response_strings:
       - "[]"
 
@@ -220,7 +211,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits/ate
   response_json_paths:
       $.[0].name: ate
       $.[0].value: '0'
@@ -235,7 +225,6 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/bad_event_type/traits/ate
   response_strings:
       - "[]"
 
@@ -249,6 +238,5 @@ tests:
       X-Project-Id: project1
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits/bad_trait_name
   response_strings:
       - "[]"
diff --git a/ceilometer/tests/functional/gabbi/gabbits_prefix/api_events_with_data.yaml b/ceilometer/tests/functional/gabbi/gabbits_prefix/api_events_with_data.yaml
deleted file mode 100644
index 30bb0d37..00000000
--- a/ceilometer/tests/functional/gabbi/gabbits_prefix/api_events_with_data.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# This test runs against the Events API and confirms the
-# content-location header includes a prefix.
-fixtures:
-- ConfigFixture
-- EventDataFixture
-
-tests:
-
-- name: get all events
-  url: /v2/events
-  request_headers:
-      X-Roles: admin
-      X-User-Id: user1
-      X-Project-Id: project1
-  response_headers:
-      content-type: application/json; charset=UTF-8
-      content-location: /$SCHEME://.*/telemetry/v2/events/