From d5ad90a7c651e8fbfe5960318897b7263f290226 Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Wed, 12 Apr 2017 11:21:16 +0200 Subject: [PATCH] Use the correct OCCI version We were still publishing OCCI 1.1 as the version, instead of OCCI 1.2 Closes-bug: #1679049 Change-Id: I7b76ef24b7a296f19980a63c6472b47ded96b4eb --- ooi/tests/functional/middleware/test_middleware.py | 6 +++--- ooi/wsgi/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ooi/tests/functional/middleware/test_middleware.py b/ooi/tests/functional/middleware/test_middleware.py index 100b7b3..bb810f5 100644 --- a/ooi/tests/functional/middleware/test_middleware.py +++ b/ooi/tests/functional/middleware/test_middleware.py @@ -34,7 +34,7 @@ class TestMiddleware(base.TestCase): self.accept = self.content_type = None self.application_url = fakes.application_url - self.occi_string = "OCCI/1.1" + self.occi_string = "OCCI/1.2" def get_app(self, resp=None): return wsgi.OCCIMiddleware(fakes.FakeApp()) @@ -109,7 +109,7 @@ class TestMiddleware(base.TestCase): def test_good_user_agent(self): req = self._build_req("/", "tenant") - req.user_agent = "foo OCCI/1.1 bar" + req.user_agent = "foo OCCI/1.2 bar" result = req.get_response(self.get_app()) self.assertEqual(404, result.status_code) self.assertDefaults(result) @@ -123,7 +123,7 @@ class TestMiddleware(base.TestCase): def test_ugly_user_agent(self): req = self._build_req("/", "tenant") - req.user_agent = "fooOCCI/1.1bar" + req.user_agent = "fooOCCI/1.2bar" result = req.get_response(self.get_app()) self.assertEqual(404, result.status_code) self.assertDefaults(result) diff --git a/ooi/wsgi/__init__.py b/ooi/wsgi/__init__.py index dd93e8d..c9559ac 100644 --- a/ooi/wsgi/__init__.py +++ b/ooi/wsgi/__init__.py @@ -110,7 +110,7 @@ class Request(webob.Request): class OCCIMiddleware(object): - occi_version = "1.1" + occi_version = "1.2" occi_string = "OCCI/%s" % occi_version @classmethod