From c6e72ff66d09117bc1ca659143296c009515bb60 Mon Sep 17 00:00:00 2001
From: Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com>
Date: Mon, 9 Apr 2018 13:21:17 +0200
Subject: [PATCH] Add py3 support for versions endpoint/unit test

Story: 2000975
Task: 12578

Change-Id: Id40c574c1e6ab8a88a9cd4f640fc66d426e15ac0
---
 monasca_api/tests/test_versions.py   | 4 ++--
 monasca_api/v2/reference/versions.py | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/monasca_api/tests/test_versions.py b/monasca_api/tests/test_versions.py
index 953bbe12c..f4aed3de0 100644
--- a/monasca_api/tests/test_versions.py
+++ b/monasca_api/tests/test_versions.py
@@ -32,7 +32,7 @@ class TestVersions(base.BaseApiTestCase):
     def test_list_versions(self):
         result = self.simulate_request('/versions')
         self.assertEqual(self.srmock.status, falcon.HTTP_200)
-        response = json.loads(result[0])
+        response = json.loads(result[0].decode('utf-8'))
         self.assertIsInstance(response, dict)
         self.assertTrue(set(['links', 'elements']) ==
                         set(response))
@@ -47,7 +47,7 @@ class TestVersions(base.BaseApiTestCase):
     def test_valid_version_id(self):
         result = self.simulate_request('/versions/v2.0')
         self.assertEqual(self.srmock.status, falcon.HTTP_200)
-        response = json.loads(result[0])
+        response = json.loads(result[0].decode('utf-8'))
         self.assertIsInstance(response, dict)
         version = response
         self.assertTrue(set(['id', 'links', 'status', 'updated']) ==
diff --git a/monasca_api/v2/reference/versions.py b/monasca_api/v2/reference/versions.py
index 85961da57..c43f1138a 100644
--- a/monasca_api/v2/reference/versions.py
+++ b/monasca_api/v2/reference/versions.py
@@ -13,6 +13,7 @@
 # under the License.
 
 import falcon
+import six
 
 from monasca_api.api import versions_api
 from monasca_api.v2.common.exceptions import HTTPUnprocessableEntityError
@@ -36,24 +37,24 @@ class Versions(versions_api.VersionsAPI):
         super(Versions, self).__init__()
 
     def on_get(self, req, res, version_id=None):
+        req_uri = req.uri.decode('utf8') if six.PY2 else req.uri
         result = {
             'links': [{
                 'rel': 'self',
-                'href': req.uri.decode('utf8')
+                'href': req_uri
             }],
             'elements': []
         }
         if version_id is None:
             for version in VERSIONS:
                 VERSIONS[version]['links'][0]['href'] = (
-                    req.uri.decode('utf8') + version)
+                    req_uri + version)
                 result['elements'].append(VERSIONS[version])
             res.body = helpers.to_json(result)
             res.status = falcon.HTTP_200
         else:
             if version_id in VERSIONS:
-                VERSIONS[version_id]['links'][0]['href'] = (
-                    req.uri.decode('utf8'))
+                VERSIONS[version_id]['links'][0]['href'] = req_uri
                 res.body = helpers.to_json(VERSIONS[version_id])
                 res.status = falcon.HTTP_200
             else: