Refactors code in OpenStack plugin

[osm/MON.git] / osm_mon / test / OpenStack / unit / test_metric_req.py

diff --git a/osm_mon/test/OpenStack/unit/test_metric_req.py b/osm_mon/test/OpenStack/unit/test_metric_req.py
index 7bb81c9..f66be72 100644 (file)
--- a/osm_mon/test/OpenStack/unit/test_metric_req.py
+++ b/osm_mon/test/OpenStack/unit/test_metric_req.py
@@ -35,6 +35,15 @@ 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."""
 
@@ -99,19 +108,14 @@ class TestMetricReq(unittest.TestCase):
 
     @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")
     @mock.patch.object(AuthManager, "get_credentials")
     @mock.patch.object(Common, "perform_request")
-    def test_update_metric_key(self, perf_req, get_creds, config_metric, delete_metric, list_metrics,
-                               read_data):
+    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({"metric_create_request":
+        message.value = json.dumps({"metric_update_request":
                                         {"correlation_id": 1,
                                          "metric_name": "my_metric",
                                          "resource_uuid": "my_r_id"}})
@@ -120,15 +124,13 @@ class TestMetricReq(unittest.TestCase):
             'config': '{"insecure":true}'
         })
 
-        perf_req.return_value = type('obj', (object,), {'text': '{"metric_id":"1"}'})
+        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, 'test_id')
-        config_metric.assert_not_called()
-        list_metrics.assert_not_called()
-        delete_metric.assert_not_called()
-        read_data.assert_not_called()
 
     @mock.patch.object(Common, "get_auth_token", mock.Mock())
     @mock.patch.object(Common, 'get_endpoint', mock.Mock())
@@ -142,7 +144,7 @@ class TestMetricReq(unittest.TestCase):
         message.value = json.dumps({"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
+        config_metric.return_value = "metric_id", "resource_id"
         self.metrics.metric_calls(message, 'test_id')
         config_metric.assert_called_with(mock.ANY, mock.ANY, {"correlation_id": 123}, False)
 
@@ -150,17 +152,22 @@ class TestMetricReq(unittest.TestCase):
     @mock.patch.object(Common, 'get_endpoint', mock.Mock())
     @mock.patch.object(metric_req.Metrics, "read_metric_data")
     @mock.patch.object(AuthManager, "get_credentials")
-    def test_read_data_key(self, get_creds, read_data):
+    @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({"alarm_uuid": "alarm_id"})
+        message.value = json.dumps({"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, 'test_id')