X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftest%2FOpenStack%2Funit%2Ftest_metric_req.py;h=2fa31a68df1eee2bcc246de635dbebeae3f7b8d8;hb=93699898c51364cde193d8d441f4aed45670e7bf;hp=0869b56ee1611362deba4df4875650a61ffc7dd5;hpb=b85fc8cdf840080b10d01c33b4a57a2a39bcc0f1;p=osm%2FMON.git diff --git a/osm_mon/test/OpenStack/unit/test_metric_req.py b/osm_mon/test/OpenStack/unit/test_metric_req.py index 0869b56..2fa31a6 100644 --- a/osm_mon/test/OpenStack/unit/test_metric_req.py +++ b/osm_mon/test/OpenStack/unit/test_metric_req.py @@ -22,20 +22,28 @@ """Tests for all metric request message keys.""" import json - import logging - import unittest import mock -from osm_mon.plugins.OpenStack.Gnocchi import metrics as metric_req - +from osm_mon.core.auth import AuthManager +from osm_mon.plugins.OpenStack.Gnocchi import metric_handler as metric_req +from osm_mon.plugins.OpenStack.Gnocchi.metric_handler import OpenstackMetricHandler from osm_mon.plugins.OpenStack.common import Common log = logging.getLogger(__name__) +class Response(object): + """Mock a response object for requests.""" + + def __init__(self): + """Initialise test and status code values.""" + self.text = json.dumps([{"id": "test_id"}]) + self.status_code = "STATUS_CODE" + + class Message(object): """A class to mock a message object value for metric requests.""" @@ -43,7 +51,7 @@ class Message(object): """Initialize a mocked message instance.""" self.topic = "metric_request" self.key = None - self.value = json.dumps({"vim_uuid": "test_id", "mock_message": "message_details"}) + self.value = json.dumps({"mock_message": "message_details"}) class TestMetricReq(unittest.TestCase): @@ -52,101 +60,100 @@ class TestMetricReq(unittest.TestCase): def setUp(self): """Setup the tests for metric request keys.""" super(TestMetricReq, self).setUp() - self.metrics = metric_req.Metrics() - - @mock.patch.object(Common, 'get_endpoint') - @mock.patch.object(Common, "get_auth_token") - def test_access_cred_metric_auth(self, get_token, get_endpoint): - """Test authentication with access credentials.""" - message = Message() - - self.metrics.metric_calls(message) - - get_token.assert_called_with('test_id') - get_endpoint.assert_any_call('metric', 'test_id') + self.metrics = metric_req.OpenstackMetricHandler() @mock.patch.object(Common, "get_auth_token", mock.Mock()) - @mock.patch.object(Common, 'get_endpoint', mock.Mock()) - @mock.patch.object(metric_req.Metrics, "delete_metric") - @mock.patch.object(metric_req.Metrics, "get_metric_id") - def test_delete_metric_key(self, get_metric_id, del_metric): + @mock.patch.object(Common, "get_endpoint", mock.Mock()) + @mock.patch.object(metric_req.OpenstackMetricHandler, "delete_metric") + @mock.patch.object(metric_req.OpenstackMetricHandler, "get_metric_id") + @mock.patch.object(AuthManager, "get_credentials") + def test_delete_metric_key(self, get_creds, get_metric_id, del_metric): """Test the functionality for a delete metric request.""" - # Mock a message value and key - message = Message() - message.key = "delete_metric_request" - message.value = json.dumps({"vim_uuid": "test_id", "metric_name": "disk_write_ops", "resource_uuid": "my_r_id"}) + value = {"metric_name": "disk_write_ops", "resource_uuid": "my_r_id", "correlation_id": 1} + + get_creds.return_value = type('obj', (object,), { + 'config': '{"insecure":true}' + }) + del_metric.return_value = True # Call the metric functionality and check delete request get_metric_id.return_value = "my_metric_id" - self.metrics.metric_calls(message) - del_metric.assert_called_with(mock.ANY, mock.ANY, "my_metric_id") + self.metrics.handle_request('delete_metric_request', value, 'test_id') + del_metric.assert_called_with(mock.ANY, mock.ANY, "my_metric_id", False) @mock.patch.object(Common, "get_auth_token", mock.Mock()) @mock.patch.object(Common, 'get_endpoint', mock.Mock()) - @mock.patch.object(metric_req.Metrics, "list_metrics") - def test_list_metric_key(self, list_metrics): + @mock.patch.object(metric_req.OpenstackMetricHandler, "list_metrics") + @mock.patch.object(AuthManager, "get_credentials") + def test_list_metric_key(self, get_creds, list_metrics): """Test the functionality for a list metric request.""" - # Mock a message with list metric key and value - message = Message() - message.key = "list_metric_request" - message.value = json.dumps({"vim_uuid": "test_id", "metrics_list_request": "metric_details"}) + value = {"metrics_list_request": {"correlation_id": 1}} + + get_creds.return_value = type('obj', (object,), { + 'config': '{"insecure":true}' + }) + + list_metrics.return_value = [] # Call the metric functionality and check list functionality - self.metrics.metric_calls(message) - list_metrics.assert_called_with(mock.ANY, mock.ANY, "metric_details") + self.metrics.handle_request('list_metric_request', value, 'test_id') + list_metrics.assert_called_with(mock.ANY, mock.ANY, {"correlation_id": 1}, False) @mock.patch.object(Common, "get_auth_token", mock.Mock()) @mock.patch.object(Common, 'get_endpoint', mock.Mock()) - @mock.patch.object(metric_req.Metrics, "read_metric_data") - @mock.patch.object(metric_req.Metrics, "list_metrics") - @mock.patch.object(metric_req.Metrics, "delete_metric") - @mock.patch.object(metric_req.Metrics, "configure_metric") - def test_update_metric_key(self, config_metric, delete_metric, list_metrics, - read_data): + @mock.patch.object(AuthManager, "get_credentials") + @mock.patch.object(Common, "perform_request") + def test_update_metric_key(self, perf_req, get_creds): """Test the functionality for an update metric request.""" - # Mock a message with update metric key and value - message = Message() - message.key = "update_metric_request" - message.value = json.dumps({"vim_uuid": "test_id", - "metric_create": - {"metric_name": "my_metric", - "resource_uuid": "my_r_id"}}) + value = {"metric_update_request": + {"correlation_id": 1, + "metric_name": "my_metric", + "resource_uuid": "my_r_id"}} + + get_creds.return_value = type('obj', (object,), { + 'config': '{"insecure":true}' + }) + + mock_response = Response() + mock_response.text = json.dumps({'metrics': {'my_metric': 'id'}}) + perf_req.return_value = mock_response # Call metric functionality and confirm no function is called # Gnocchi does not support updating a metric configuration - self.metrics.metric_calls(message) - config_metric.assert_not_called() - list_metrics.assert_not_called() - delete_metric.assert_not_called() - read_data.assert_not_called() + self.metrics.handle_request('update_metric_request', value, 'test_id') @mock.patch.object(Common, "get_auth_token", mock.Mock()) @mock.patch.object(Common, 'get_endpoint', mock.Mock()) - @mock.patch.object(metric_req.Metrics, "configure_metric") - def test_config_metric_key(self, config_metric): + @mock.patch.object(OpenstackMetricHandler, "configure_metric") + @mock.patch.object(AuthManager, "get_credentials") + def test_config_metric_key(self, get_credentials, config_metric): """Test the functionality for a create metric request.""" - # Mock a message with create metric key and value - message = Message() - message.key = "create_metric_request" - message.value = json.dumps({"vim_uuid": "test_id", "metric_create": "metric_details"}) - + value = {"metric_create_request": {"correlation_id": 123}} + get_credentials.return_value = type('obj', (object,), {'config': '{"insecure":true}'}) # Call metric functionality and check config metric - config_metric.return_value = "metric_id", "resource_id", True - self.metrics.metric_calls(message) - config_metric.assert_called_with(mock.ANY, mock.ANY, "metric_details") + config_metric.return_value = "metric_id", "resource_id" + self.metrics.handle_request('create_metric_request', value, 'test_id') + config_metric.assert_called_with(mock.ANY, mock.ANY, {"correlation_id": 123}, False) @mock.patch.object(Common, "get_auth_token", mock.Mock()) @mock.patch.object(Common, 'get_endpoint', mock.Mock()) - @mock.patch.object(metric_req.Metrics, "read_metric_data") - def test_read_data_key(self, read_data): + @mock.patch.object(OpenstackMetricHandler, "read_metric_data") + @mock.patch.object(AuthManager, "get_credentials") + @mock.patch.object(Common, "perform_request") + def test_read_data_key(self, perf_req, get_creds, read_data): """Test the functionality for a read metric data request.""" - # Mock a message with a read data key and value - message = Message() - message.key = "read_metric_data_request" - message.value = json.dumps({"vim_uuid": "test_id", "alarm_uuid": "alarm_id"}) + value = {"correlation_id": 123, "metric_name": "cpu_utilization", "resource_uuid": "uuid"} + + get_creds.return_value = type('obj', (object,), { + 'config': '{"insecure":true}' + }) + + mock_response = Response() + mock_response.text = json.dumps({'metrics': {'cpu_util': 'id'}}) + perf_req.return_value = mock_response # Call metric functionality and check read data metrics read_data.return_value = "time_stamps", "data_values" - self.metrics.metric_calls(message) + self.metrics.handle_request('read_metric_data_request', value, 'test_id') read_data.assert_called_with( - mock.ANY, mock.ANY, json.loads(message.value)) + mock.ANY, mock.ANY, value, False)