From fbd048f4c0041532b81aa6bdbed5d2400b64fc99 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 23 Jun 2017 16:32:03 +0200
Subject: [PATCH] Fix default service project to "service"

Both devstack and TripleO uses "service" by default.
Nothing uses "services".

Change-Id: I6723dd0db66f57572ee53eecd89c93137e69e63b
---
 ceilometermiddleware/swift.py                    |  4 ++--
 .../tests/data/list_projects.yaml                | 16 ++++++++--------
 ceilometermiddleware/tests/test_swift.py         |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py
index f267d2c..0d19546 100644
--- a/ceilometermiddleware/swift.py
+++ b/ceilometermiddleware/swift.py
@@ -49,7 +49,7 @@ before "proxy-server" and add the following filter in the file:
     # ignore_projects option, here is just a example:
     auth_type = password
     auth_url = https://[::1]:5000
-    project_name = services
+    project_name = service
     project_domain_name = Default
     username = user
     user_domain_name = Default
@@ -150,7 +150,7 @@ class Swift(object):
     event_queue = None
     threadLock = threading.Lock()
 
-    DEFAULT_IGNORE_PROJECT_NAMES = ['services']
+    DEFAULT_IGNORE_PROJECT_NAMES = ['service']
 
     def __init__(self, app, conf):
         self._app = app
diff --git a/ceilometermiddleware/tests/data/list_projects.yaml b/ceilometermiddleware/tests/data/list_projects.yaml
index be365c4..c6f9d9b 100644
--- a/ceilometermiddleware/tests/data/list_projects.yaml
+++ b/ceilometermiddleware/tests/data/list_projects.yaml
@@ -297,7 +297,7 @@ http_interactions:
       X-Auth-Token:
       - gAAAAABZGV2gZwV0SlycA_OIohX7kRAmTp84SnzsAYD5Uhey7RTzCf0NvxNRxLk5RsjRSMncSdro7eWgtMrSblZJCPl485IvHANL3E3gsxFJP9TjebqDiF4DtGhQmc4mHPB3kOBNzg3v2FrHB2hK77Cc4M7V1Pm_-nWBHxYxVNopVhrd80Y4-2c
     method: GET
-    uri: https://[::1]:35357/v3/projects/services
+    uri: https://[::1]:35357/v3/projects/service
   response:
     body:
       encoding: null
@@ -306,7 +306,7 @@ http_interactions:
           "error": {
             "code": 404,
             "title": "Not Found",
-            "message": "Could not find project: services"
+            "message": "Could not find project: service"
           }
         }
     headers:
@@ -333,7 +333,7 @@ http_interactions:
     status:
       code: 404
       message: Not Found
-    url: https://[::1]:35357/v3/projects/services
+    url: https://[::1]:35357/v3/projects/service
 - recorded_at: '2017-05-15T07:49:53'
   request:
     body:
@@ -351,7 +351,7 @@ http_interactions:
       X-Auth-Token:
       - gAAAAABZGV2gZwV0SlycA_OIohX7kRAmTp84SnzsAYD5Uhey7RTzCf0NvxNRxLk5RsjRSMncSdro7eWgtMrSblZJCPl485IvHANL3E3gsxFJP9TjebqDiF4DtGhQmc4mHPB3kOBNzg3v2FrHB2hK77Cc4M7V1Pm_-nWBHxYxVNopVhrd80Y4-2c
     method: GET
-    uri: https://[::1]:35357/v3/projects?name=services
+    uri: https://[::1]:35357/v3/projects?name=service
   response:
     body:
       encoding: null
@@ -364,15 +364,15 @@ http_interactions:
               "domain_id": "default",
               "parent_id": "default",
               "is_domain": false,
-              "name": "services",
+              "name": "service",
               "links": {
                 "self": "https://[::1]:5000/v3/projects/147cc0a9263c4964926f3ee7b6ba3685"
               },
-              "description": "Tenant for the openstack services"
+              "description": "Tenant for the openstack service"
             }
           ],
           "links": {
-            "self": "https://[::1]:5000/v3/projects?name=services",
+            "self": "https://[::1]:5000/v3/projects?name=service",
             "next": null,
             "previous": null
           }
@@ -401,7 +401,7 @@ http_interactions:
     status:
       code: 200
       message: OK
-    url: https://[::1]:35357/v3/projects?name=services
+    url: https://[::1]:35357/v3/projects?name=service
 - recorded_at: '2017-05-15T07:49:53'
   request:
     body:
diff --git a/ceilometermiddleware/tests/test_swift.py b/ceilometermiddleware/tests/test_swift.py
index 9b788b4..b30c6f8 100644
--- a/ceilometermiddleware/tests/test_swift.py
+++ b/ceilometermiddleware/tests/test_swift.py
@@ -453,7 +453,7 @@ class TestSwift(tests_base.TestCase):
             'username': 'admin',
             'tenant_name': 'admin',
             'password': 'secret',
-            'ignore_projects': 'services,gnocchi',
+            'ignore_projects': 'service,gnocchi',
         })
         self.assertEqual(["147cc0a9263c4964926f3ee7b6ba3685"],
                          app.ignore_projects)