diff options
5 files changed, 90 insertions, 4 deletions
diff --git a/multivimbroker/multivimbroker/api_v2/service.py b/multivimbroker/multivimbroker/api_v2/service.py index 228cc63..d080068 100644 --- a/multivimbroker/multivimbroker/api_v2/service.py +++ b/multivimbroker/multivimbroker/api_v2/service.py @@ -16,6 +16,7 @@ from oslo_service import service from oslo_service import wsgi from multivimbroker.api_v2 import app +from multivimbroker.pub.config import config as mc_cfg CONF = cfg.CONF @@ -33,9 +34,8 @@ class WSGIService(service.ServiceBase): CONF, "multivimbroker", self.app, - # TODO(xiaohhui): these should be configurable. host="0.0.0.0", - port="9002", + port=mc_cfg.API_SERVER_PORT, use_ssl=False ) diff --git a/multivimbroker/multivimbroker/pub/config/config.py b/multivimbroker/multivimbroker/pub/config/config.py index 192c743..e0385e2 100644 --- a/multivimbroker/multivimbroker/pub/config/config.py +++ b/multivimbroker/multivimbroker/pub/config/config.py @@ -13,7 +13,7 @@ import os # [MSB] -MSB_SERVICE_IP = '127.0.0.1' +MSB_SERVICE_IP = 'msb.onap.org' MSB_SERVICE_PORT = '10080' @@ -36,3 +36,6 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST", # [IMAGE LOCAL PATH] ROOT_PATH = os.path.dirname( os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +# [Local Config] +API_SERVER_PORT = 9001 diff --git a/multivimbroker/multivimbroker/scripts/api.py b/multivimbroker/multivimbroker/scripts/api.py index 01b69a2..b9526d7 100644 --- a/multivimbroker/multivimbroker/scripts/api.py +++ b/multivimbroker/multivimbroker/scripts/api.py @@ -12,9 +12,13 @@ import eventlet eventlet.monkey_patch() +import os # noqa from oslo_config import cfg # noqa from oslo_service import service # noqa import sys # noqa +# FIXME: Since there is no explicitly setup process for the project. Hack the +# python here. +sys.path.append(os.path.abspath('.')) from multivimbroker.api_v2 import service as api_service # noqa diff --git a/multivimbroker/multivimbroker/tests/test_fileutil.py b/multivimbroker/multivimbroker/tests/test_fileutil.py new file mode 100644 index 0000000..9840bde --- /dev/null +++ b/multivimbroker/multivimbroker/tests/test_fileutil.py @@ -0,0 +1,79 @@ +# Copyright (c) 2017-2018 VMware, Inc. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + +import mock +import os +import unittest + +from multivimbroker.pub.utils import fileutil + + +class TestFileutil(unittest.TestCase): + + @mock.patch.object(os.path, "exists") + @mock.patch("os.makedirs") + def test_make_dirs_path_exists(self, mock_mkdir, mock_exists): + new_path = "/tmp/test" + mock_exists.return_value = True + fileutil.make_dirs(new_path) + mock_mkdir.assert_not_called() + + @mock.patch.object(os.path, "exists") + @mock.patch("os.makedirs") + def test_make_dirs_path_not_exists(self, mock_mkdir, mock_exists): + new_path = "/tmp/test" + mock_exists.return_value = False + fileutil.make_dirs(new_path) + mock_mkdir.assert_called_once_with(new_path, 0777) + + @mock.patch.object(os.path, "exists") + @mock.patch("shutil.rmtree") + def test_delete_dirs_success(self, mock_rmtree, mock_exists): + mock_exists.return_value = True + new_path = "/tmp/tests" + fileutil.delete_dirs(new_path) + mock_rmtree.assert_called_once_with(new_path) + + @mock.patch.object(os.path, "exists") + @mock.patch("shutil.rmtree") + def test_delete_dirs_failed(self, mock_rmtree, mock_exists): + mock_exists.return_value = True + mock_rmtree.side_effect = [Exception("Fake exception")] + new_path = "/tmp/tests" + fileutil.delete_dirs(new_path) + mock_rmtree.assert_called_once_with(new_path) + + @mock.patch.object(fileutil, "make_dirs") + @mock.patch("urllib2.urlopen") + def test_download_file_from_http_success(self, mock_urlopen, mock_mkdir): + url = "http://www.example.org/test.dat" + local_dir = "/tmp/" + file_name = "test.dat" + mock_req = mock.Mock() + mock_req.read.return_value = "hello world" + mock_urlopen.return_value = mock_req + m = mock.mock_open() + expect_ret = (True, "/tmp/test.dat") + with mock.patch('{}.open'.format(__name__), m, create=True): + ret = fileutil.download_file_from_http(url, local_dir, file_name) + self.assertEqual(expect_ret, ret) + + @mock.patch.object(fileutil, "make_dirs") + @mock.patch("urllib2.urlopen") + def test_download_file_from_http_fail(self, mock_urlopen, mock_mkdir): + url = "http://www.example.org/test.dat" + local_dir = "/tmp/" + file_name = "test.dat" + mock_req = mock.Mock() + mock_req.read.return_value = "hello world" + mock_urlopen.side_effect = [Exception("fake exception")] + expect_ret = (False, "/tmp/test.dat") + ret = fileutil.download_file_from_http(url, local_dir, file_name) + self.assertEqual(expect_ret, ret) diff --git a/multivimbroker/multivimbroker/tests/test_restcall.py b/multivimbroker/multivimbroker/tests/test_restcall.py index 8ac1948..ea70dff 100644 --- a/multivimbroker/multivimbroker/tests/test_restcall.py +++ b/multivimbroker/multivimbroker/tests/test_restcall.py @@ -49,7 +49,7 @@ class TestRestCall(unittest.TestCase): content = "no content" headers = None restcall.req_by_msb(res, method, content=content, headers=headers) - expect_url = "http://127.0.0.1:10080/" + expect_url = "http://msb.onap.org:10080/" mock_call.assert_called_once_with( expect_url, "", "", restcall.rest_no_auth, res, method, content, headers) |