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:
parent
2675a8c3d8
commit
b52984db6c
|
@ -29,6 +29,24 @@ class TestQueryController(test_middleware.TestMiddleware):
|
||||||
self.assertExpectedResult(fakes.fake_query_results(), result)
|
self.assertExpectedResult(fakes.fake_query_results(), result)
|
||||||
self.assertEqual(200, result.status_code)
|
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,
|
class QueryControllerTextPlain(test_middleware.TestMiddlewareTextPlain,
|
||||||
TestQueryController):
|
TestQueryController):
|
||||||
|
|
|
@ -136,6 +136,10 @@ class OCCIMiddleware(object):
|
||||||
self.mapper.connect("query", "/-/",
|
self.mapper.connect("query", "/-/",
|
||||||
controller=self.resources["query"],
|
controller=self.resources["query"],
|
||||||
action="index")
|
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(
|
self.resources["compute"] = self._create_resource(
|
||||||
ooi.api.compute.Controller)
|
ooi.api.compute.Controller)
|
||||||
|
|
Loading…
Reference in New Issue