openstack
/
deb-ceilometermiddleware
Code Issues Proposed changes

Fix default service project to "service" 

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

Change-Id: I6723dd0db66f57572ee53eecd89c93137e69e63b
This commit is contained in:
Julien Danjou 2017-06-23 16:32:03 +02:00
parent e2bf485044
commit fbd048f4c0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometermiddleware/swift.py
View File

@ -49,7 +49,7 @@ before "proxy-server" and add the following filter in the file:
# ignore_projects option, here is just a example: # ignore_projects option, here is just a example:
auth_type = password auth_type = password
auth_url = https://[::1]:5000 auth_url = https://[::1]:5000
project_name = services project_name = service
project_domain_name = Default project_domain_name = Default
username = user username = user
user_domain_name = Default user_domain_name = Default
@ -150,7 +150,7 @@ class Swift(object):
event_queue = None event_queue = None
threadLock = threading.Lock() threadLock = threading.Lock()
DEFAULT_IGNORE_PROJECT_NAMES = ['services'] DEFAULT_IGNORE_PROJECT_NAMES = ['service']
def __init__(self, app, conf): def __init__(self, app, conf):
self._app = app self._app = app

16
ceilometermiddleware/tests/data/list_projects.yaml
View File

@ -297,7 +297,7 @@ http_interactions:
X-Auth-Token: X-Auth-Token:
- gAAAAABZGV2gZwV0SlycA_OIohX7kRAmTp84SnzsAYD5Uhey7RTzCf0NvxNRxLk5RsjRSMncSdro7eWgtMrSblZJCPl485IvHANL3E3gsxFJP9TjebqDiF4DtGhQmc4mHPB3kOBNzg3v2FrHB2hK77Cc4M7V1Pm_-nWBHxYxVNopVhrd80Y4-2c - gAAAAABZGV2gZwV0SlycA_OIohX7kRAmTp84SnzsAYD5Uhey7RTzCf0NvxNRxLk5RsjRSMncSdro7eWgtMrSblZJCPl485IvHANL3E3gsxFJP9TjebqDiF4DtGhQmc4mHPB3kOBNzg3v2FrHB2hK77Cc4M7V1Pm_-nWBHxYxVNopVhrd80Y4-2c
method: GET method: GET
uri: https://[::1]:35357/v3/projects/services uri: https://[::1]:35357/v3/projects/service
response: response:
body: body:
encoding: null encoding: null
@ -306,7 +306,7 @@ http_interactions:
"error": { "error": {
"code": 404, "code": 404,
"title": "Not Found", "title": "Not Found",
"message": "Could not find project: services" "message": "Could not find project: service"
} }
} }
headers: headers:
@ -333,7 +333,7 @@ http_interactions:
status: status:
code: 404 code: 404
message: Not Found message: Not Found
url: https://[::1]:35357/v3/projects/services url: https://[::1]:35357/v3/projects/service
- recorded_at: '2017-05-15T07:49:53' - recorded_at: '2017-05-15T07:49:53'
request: request:
body: body:
@ -351,7 +351,7 @@ http_interactions:
X-Auth-Token: X-Auth-Token:
- gAAAAABZGV2gZwV0SlycA_OIohX7kRAmTp84SnzsAYD5Uhey7RTzCf0NvxNRxLk5RsjRSMncSdro7eWgtMrSblZJCPl485IvHANL3E3gsxFJP9TjebqDiF4DtGhQmc4mHPB3kOBNzg3v2FrHB2hK77Cc4M7V1Pm_-nWBHxYxVNopVhrd80Y4-2c - gAAAAABZGV2gZwV0SlycA_OIohX7kRAmTp84SnzsAYD5Uhey7RTzCf0NvxNRxLk5RsjRSMncSdro7eWgtMrSblZJCPl485IvHANL3E3gsxFJP9TjebqDiF4DtGhQmc4mHPB3kOBNzg3v2FrHB2hK77Cc4M7V1Pm_-nWBHxYxVNopVhrd80Y4-2c
method: GET method: GET
uri: https://[::1]:35357/v3/projects?name=services uri: https://[::1]:35357/v3/projects?name=service
response: response:
body: body:
encoding: null encoding: null
@ -364,15 +364,15 @@ http_interactions:
"domain_id": "default", "domain_id": "default",
"parent_id": "default", "parent_id": "default",
"is_domain": false, "is_domain": false,
"name": "services", "name": "service",
"links": { "links": {
"self": "https://[::1]:5000/v3/projects/147cc0a9263c4964926f3ee7b6ba3685" "self": "https://[::1]:5000/v3/projects/147cc0a9263c4964926f3ee7b6ba3685"
}, },
"description": "Tenant for the openstack services" "description": "Tenant for the openstack service"
} }
], ],
"links": { "links": {
"self": "https://[::1]:5000/v3/projects?name=services", "self": "https://[::1]:5000/v3/projects?name=service",
"next": null, "next": null,
"previous": null "previous": null
} }
@ -401,7 +401,7 @@ http_interactions:
status: status:
code: 200 code: 200
message: OK 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' - recorded_at: '2017-05-15T07:49:53'
request: request:
body: body:

2
ceilometermiddleware/tests/test_swift.py
View File

@ -453,7 +453,7 @@ class TestSwift(tests_base.TestCase):
'username': 'admin', 'username': 'admin',
'tenant_name': 'admin', 'tenant_name': 'admin',
'password': 'secret', 'password': 'secret',
'ignore_projects': 'services,gnocchi', 'ignore_projects': 'service,gnocchi',
}) })
self.assertEqual(["147cc0a9263c4964926f3ee7b6ba3685"], self.assertEqual(["147cc0a9263c4964926f3ee7b6ba3685"],
app.ignore_projects) app.ignore_projects)