"""Tests for all metric request message keys."""
import json
-
import logging
-
import unittest
import mock
from osm_mon.core.auth import AuthManager
-from osm_mon.plugins.OpenStack.Gnocchi import metrics as metric_req
-
+from osm_mon.plugins.OpenStack.Gnocchi import metric_handler as metric_req
from osm_mon.plugins.OpenStack.common import Common
log = logging.getLogger(__name__)
def setUp(self):
"""Setup the tests for metric request keys."""
super(TestMetricCalls, self).setUp()
- self.metrics = metric_req.Metrics()
+ self.metrics = metric_req.OpenstackMetricHandler()
self.metrics._common = Common()
- @mock.patch.object(metric_req.Metrics, "get_metric_id")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "get_metric_id")
@mock.patch.object(Common, "perform_request")
def test_invalid_config_metric_req(
self, perf_req, get_metric):
# Test invalid configuration for creating a metric
values = {"metric_details": "invalid_metric"}
- m_id, r_id, status = self.metrics.configure_metric(
- endpoint, auth_token, values, verify_ssl=False)
+ with self.assertRaises(ValueError):
+ self.metrics.configure_metric(endpoint, auth_token, values, verify_ssl=False)
perf_req.assert_not_called()
- self.assertEqual(status, False)
# Test with an invalid metric name, will not perform request
values = {"resource_uuid": "r_id"}
- m_id, r_id, status = self.metrics.configure_metric(
- endpoint, auth_token, values, verify_ssl=False)
+ with self.assertRaises(ValueError):
+ self.metrics.configure_metric(endpoint, auth_token, values, verify_ssl=False)
perf_req.assert_not_called()
- self.assertEqual(status, False)
# If metric exists, it won't be recreated
get_metric.return_value = "metric_id"
- m_id, r_id, status = self.metrics.configure_metric(
- endpoint, auth_token, values, verify_ssl=False)
+ with self.assertRaises(ValueError):
+ self.metrics.configure_metric(endpoint, auth_token, values, verify_ssl=False)
perf_req.assert_not_called()
- self.assertEqual(status, False)
- @mock.patch.object(metric_req.Metrics, "get_metric_id")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "get_metric_id")
@mock.patch.object(Common, "perform_request")
@mock.patch.object(AuthManager, "get_credentials")
def test_valid_config_metric_req(
@mock.patch.object(Common, "perform_request")
def test_delete_metric_req(self, perf_req):
"""Test the delete metric function."""
+ mock_response = Response()
+ mock_response.status_code = 200
+ perf_req.return_value = mock_response
+
self.metrics.delete_metric(endpoint, auth_token, "metric_id", verify_ssl=False)
perf_req.assert_called_with(
"""Test invalid response for delete request."""
perf_req.return_value = type('obj', (object,), {"status_code": "404"})
- status = self.metrics.delete_metric(endpoint, auth_token, "metric_id", verify_ssl=False)
-
- self.assertEqual(status, False)
+ with self.assertRaises(ValueError):
+ self.metrics.delete_metric(endpoint, auth_token, "metric_id", verify_ssl=False)
- @mock.patch.object(metric_req.Metrics, "response_list")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "response_list")
@mock.patch.object(Common, "perform_request")
def test_complete_list_metric_req(self, perf_req, resp_list):
"""Test the complete list metric function."""
"<ANY>/v1/metric?sort=name:asc", auth_token, req_type="get", verify_ssl=False)
resp_list.assert_called_with([{u'id': u'test_id'}])
- @mock.patch.object(metric_req.Metrics, "response_list")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "response_list")
@mock.patch.object(Common, "perform_request")
def test_resource_list_metric_req(self, perf_req, resp_list):
"""Test the resource list metric function."""
perf_req.assert_any_call(
"<ANY>/v1/metric/test_id", auth_token, req_type="get", verify_ssl=False)
- @mock.patch.object(metric_req.Metrics, "response_list")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "response_list")
@mock.patch.object(Common, "perform_request")
def test_name_list_metric_req(self, perf_req, resp_list):
"""Test the metric_name list metric function."""
resp_list.assert_called_with(
[{u'id': u'test_id'}], metric_name="disk_write_bytes")
- @mock.patch.object(metric_req.Metrics, "response_list")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "response_list")
@mock.patch.object(Common, "perform_request")
def test_combined_list_metric_req(self, perf_req, resp_list):
"""Test the combined resource and metric list metric function."""
@mock.patch.object(Common, "perform_request")
def test_get_metric_id(self, perf_req):
"""Test get_metric_id function."""
- perf_req.return_value = type('obj', (object,), {'text': '{"alarm_id":"1"}'})
+ mock_response = Response()
+ mock_response.text = json.dumps({'metrics': {'my_metric': 'id'}})
+ perf_req.return_value = mock_response
self.metrics.get_metric_id(endpoint, auth_token, "my_metric", "r_id", verify_ssl=False)
perf_req.assert_called_with(
"<ANY>/v1/resource/generic/r_id", auth_token, req_type="get", verify_ssl=False)
- @mock.patch.object(metric_req.Metrics, "get_metric_id")
+ @mock.patch.object(metric_req.OpenstackMetricHandler, "get_metric_id")
@mock.patch.object(Common, "perform_request")
def test_valid_read_data_req(self, perf_req, get_metric):
"""Test the read metric data function, for a valid call."""
@mock.patch.object(Common, "perform_request")
def test_invalid_read_data_req(self, perf_req):
- """Test the read metric data function, for an invalid call."""
- # Teo empty lists wil be returned because the values are invalid
+ """Test the read metric data function for an invalid call."""
values = {}
- times, data = self.metrics.read_metric_data(
- endpoint, auth_token, values, verify_ssl=False)
-
- self.assertEqual(times, [])
- self.assertEqual(data, [])
+ with self.assertRaises(KeyError):
+ self.metrics.read_metric_data(endpoint, auth_token, values, verify_ssl=False)
def test_complete_response_list(self):
"""Test the response list function for formatting metric lists."""
projects / osm / MON.git / blobdiff