Syncing API version

Python implementation should have the same API
version as Java implementation.

Change-Id: I2ea33eb37076ec662c883e7afaf8617fb3dcf857

etc/monasca/log-api-config.conf

@@ -7,8 +7,8 @@ debug=True
 
 # Dispatchers to be loaded to serve restful APIs
 [dispatcher]
-logs = monasca_log_api.v1.reference.logs:Logs
+logs = monasca_log_api.v2.reference.logs:Logs
-versions = monasca_log_api.v1.reference.versions:Versions
+versions = monasca_log_api.v2.reference.versions:Versions
 
 [service]
 region = 'pl'
@@ -26,4 +26,4 @@ admin_tenant_name = admin
 cafile =
 certfile =
 keyfile =
-insecure = false
+insecure = false

monasca_log_api/server.py

@@ -61,7 +61,7 @@ def launch(conf, config_file='/etc/monasca/log-api-config.conf'):
 
 def load_logs_resource(app):
     logs = simport.load(CONF.dispatcher.logs)()
-    app.add_route('/v1.0/log/single', logs)
+    app.add_route('/v2.0/log/single', logs)
 
 
 def load_versions_resource(app):

monasca_log_api/tests/test_log_publisher.py

@@ -22,7 +22,7 @@ import mock
 import simplejson
 
 from monasca_log_api.tests import base
-from monasca_log_api.v1.common import log_publisher
+from monasca_log_api.v2.common import log_publisher
 
 
 EPOCH_START = datetime.datetime(1970, 1, 1)
@@ -108,7 +108,7 @@ class TestSendMessage(testing.TestBase):
         self.conf = base.mock_config(self)
         return super(TestSendMessage, self).setUp()
 
-    @mock.patch('monasca_log_api.v1.common.log_publisher.producer'
+    @mock.patch('monasca_log_api.v2.common.log_publisher.producer'
                 '.KafkaProducer')
     def test_should_not_send_empty_message(self, _):
         instance = log_publisher.LogPublisher()
@@ -168,7 +168,7 @@ class TestSendMessage(testing.TestBase):
                               instance.send_message,
                               tmp_message)
 
-    @mock.patch('monasca_log_api.v1.common.log_publisher.producer'
+    @mock.patch('monasca_log_api.v2.common.log_publisher.producer'
                 '.KafkaProducer')
     def test_should_send_message(self, _):
         instance = log_publisher.LogPublisher()
@@ -206,7 +206,7 @@ class TestSendMessage(testing.TestBase):
             # 'some_key',  # TODO(feature) next version of monasca-common
             simplejson.dumps(msg))
 
-    @mock.patch('monasca_log_api.v1.common.log_publisher.producer'
+    @mock.patch('monasca_log_api.v2.common.log_publisher.producer'
                 '.KafkaProducer')
     def test_should_send_message_multiple_topics(self, _):
         topics = ['logs', 'analyzer', 'tester']

monasca_log_api/tests/test_logs.py

@@ -21,7 +21,7 @@ from monasca_log_api.api import exceptions as log_api_exceptions
 from monasca_log_api.api import headers
 from monasca_log_api.api import logs_api
 from monasca_log_api.tests import base
-from monasca_log_api.v1.reference import logs
+from monasca_log_api.v2.reference import logs
 
 
 class TestLogs(testing.TestBase):
@@ -44,8 +44,8 @@ class TestLogs(testing.TestBase):
         )
         self.assertEqual(falcon.HTTP_403, self.srmock.status)
 
-    @mock.patch('monasca_log_api.v1.common.service.LogCreator')
+    @mock.patch('monasca_log_api.v2.common.service.LogCreator')
-    @mock.patch('monasca_log_api.v1.common.log_publisher.LogPublisher')
+    @mock.patch('monasca_log_api.v2.common.log_publisher.LogPublisher')
     def test_should_pass_empty_cross_tenant_id_wrong_role(self,
                                                           log_creator,
                                                           kafka_publisher):
@@ -67,8 +67,8 @@ class TestLogs(testing.TestBase):
         self.assertEqual(1, log_creator.new_log.call_count)
         self.assertEqual(1, log_creator.new_log_envelope.call_count)
 
-    @mock.patch('monasca_log_api.v1.common.service.LogCreator')
+    @mock.patch('monasca_log_api.v2.common.service.LogCreator')
-    @mock.patch('monasca_log_api.v1.common.log_publisher.LogPublisher')
+    @mock.patch('monasca_log_api.v2.common.log_publisher.LogPublisher')
     def test_should_pass_empty_cross_tenant_id_ok_role(self,
                                                        log_creator,
                                                        kafka_publisher):
@@ -90,8 +90,8 @@ class TestLogs(testing.TestBase):
         self.assertEqual(1, log_creator.new_log.call_count)
         self.assertEqual(1, log_creator.new_log_envelope.call_count)
 
-    @mock.patch('monasca_log_api.v1.common.service.LogCreator')
+    @mock.patch('monasca_log_api.v2.common.service.LogCreator')
-    @mock.patch('monasca_log_api.v1.common.log_publisher.LogPublisher')
+    @mock.patch('monasca_log_api.v2.common.log_publisher.LogPublisher')
     def test_should_pass_delegate_cross_tenant_id_ok_role(self,
                                                           log_creator,
                                                           log_publisher):
@@ -114,7 +114,7 @@ class TestLogs(testing.TestBase):
         self.assertEqual(1, log_creator.new_log.call_count)
         self.assertEqual(1, log_creator.new_log_envelope.call_count)
 
-    @mock.patch('monasca_log_api.v1.common.service.rest_utils')
+    @mock.patch('monasca_log_api.v2.common.service.rest_utils')
     def test_should_fail_empty_dimensions_delegate(self, rest_utils):
         rest_utils.read_body.return_value = True
 

monasca_log_api/tests/test_service.py

@@ -21,7 +21,7 @@ import mock
 
 from monasca_log_api.api import exceptions
 from monasca_log_api.api import logs_api
-from monasca_log_api.v1.common import service as common_service
+from monasca_log_api.v2.common import service as common_service
 
 
 class IsDelegate(unittest.TestCase):

monasca_log_api/v2/reference/logs.py

@@ -17,8 +17,8 @@ import falcon
 
 from monasca_log_api.api import headers
 from monasca_log_api.api import logs_api
-from monasca_log_api.v1.common import log_publisher
+from monasca_log_api.v2.common import log_publisher
-from monasca_log_api.v1.common import service
+from monasca_log_api.v2.common import service
 
 
 # TODO(idea) perhaps add it as pipeline call right before API, seems generic

monasca_log_api/v2/reference/versions.py

@@ -21,8 +21,8 @@ from monasca_log_api.api import versions_api
 
 LOG = log.getLogger(__name__)
 VERSIONS = {
-    'v1.0': {
+    'v2.0': {
-        'id': 'v1.0',
+        'id': 'v2.0',
         'links': [
             {
                 'rel': 'self',
@@ -30,7 +30,7 @@ VERSIONS = {
             },
             {
                 'rel': 'links',
-                'href': '/logs'
+                'href': '/log'
             }
         ],
         'status': 'CURRENT',