x
/
ooi
Code Issues Proposed changes

Comply with RFC5785 

According to section 3.6.7, to comply with the RFC5785 we should
implement the query interface functionality under the authrority
path "/.well-known/org/ogf/occi/-/".
This commit is contained in:
Alvaro Lopez Garcia 2015-04-17 13:21:17 +02:00
parent 2675a8c3d8
commit b52984db6c
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ooi/tests/middleware/test_query_controller.py
View File

@ -29,6 +29,24 @@ class TestQueryController(test_middleware.TestMiddleware):
self.assertExpectedResult(fakes.fake_query_results(), result)
self.assertEqual(200, result.status_code)
def test_query_rfc(self):
tenant_id = fakes.tenants["bar"]["id"]
result = self._build_req("/.well-known/org/ogf/occi/-/",
tenant_id).get_response(self.get_app())
self.assertDefaults(result)
self.assertExpectedResult(fakes.fake_query_results(), result)
self.assertEqual(200, result.status_code)
def test_query_rfc_equal(self):
tenant_id = fakes.tenants["bar"]["id"]
result_rfc = self._build_req("/.well-known/org/ogf/occi/-/",
tenant_id).get_response(self.get_app())
result_query = self._build_req("/-/",
tenant_id).get_response(self.get_app())
self.assertDefaults(result_rfc)
self.assertDefaults(result_query)
self.assertEqual(result_rfc.text, result_query.text)
class QueryControllerTextPlain(test_middleware.TestMiddlewareTextPlain,
TestQueryController):

4
ooi/wsgi/__init__.py
View File

@ -136,6 +136,10 @@ class OCCIMiddleware(object):
self.mapper.connect("query", "/-/",
controller=self.resources["query"],
action="index")
# RFC5785, OCCI section 3.6.7
self.mapper.connect("query", "/.well-known/org/ogf/occi/-/",
controller=self.resources["query"],
action="index")
self.resources["compute"] = self._create_resource(
ooi.api.compute.Controller)