Optimization of "list_metrics" function

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

diff --git a/osm_mon/test/OpenStack/unit/test_metric_calls.py b/osm_mon/test/OpenStack/unit/test_metric_calls.py
index 51282b1..5014133 100644 (file)
--- a/osm_mon/test/OpenStack/unit/test_metric_calls.py
+++ b/osm_mon/test/OpenStack/unit/test_metric_calls.py
@@ -131,11 +131,13 @@ class TestMetricCalls(unittest.TestCase):
                                     "name": "metric_name",
                                     "unit": "units"}}}
 
+        perf_req.return_value = type('obj', (object,), {'text': '{"id":"1"}'})
+
         self.metrics.configure_metric(endpoint, auth_token, values)
 
         perf_req.assert_called_with(
             "<ANY>/v1/resource/generic", auth_token, req_type="post",
-            payload=json.dumps(payload))
+            payload=json.dumps(payload, sort_keys=True))
 
     @mock.patch.object(Common, "perform_request")
     def test_delete_metric_req(self, perf_req):
@@ -148,7 +150,7 @@ class TestMetricCalls(unittest.TestCase):
     @mock.patch.object(Common, "perform_request")
     def test_delete_metric_invalid_status(self, perf_req):
         """Test invalid response for delete request."""
-        perf_req.return_value = "404"
+        perf_req.return_value = type('obj', (object,), {"status_code": "404"})
 
         status = self.metrics.delete_metric(endpoint, auth_token, "metric_id")
 
@@ -177,9 +179,7 @@ class TestMetricCalls(unittest.TestCase):
         self.metrics.list_metrics(endpoint, auth_token, values)
 
         perf_req.assert_any_call(
-            "<ANY>/v1/metric?sort=name:asc", auth_token, req_type="get")
-        resp_list.assert_called_with(
-            [{u'id': u'test_id'}], resource="resource_id")
+            "<ANY>/v1/resource/generic/resource_id", auth_token, req_type="get")
 
     @mock.patch.object(metric_req.Metrics, "response_list")
     @mock.patch.object(Common, "perform_request")
@@ -207,10 +207,7 @@ class TestMetricCalls(unittest.TestCase):
         self.metrics.list_metrics(endpoint, auth_token, values)
 
         perf_req.assert_any_call(
-            "<ANY>/v1/metric?sort=name:asc", auth_token, req_type="get")
-        resp_list.assert_called_with(
-            [{u'id': u'test_id'}], resource="resource_id",
-            metric_name="packets_sent")
+            "<ANY>/v1/resource/generic/resource_id", auth_token, req_type="get")
 
     @mock.patch.object(Common, "perform_request")
     def test_get_metric_id(self, perf_req):
@@ -247,6 +244,8 @@ class TestMetricCalls(unittest.TestCase):
                   "collection_unit": "DAY",
                   "collection_period": 1}
 
+        perf_req.return_value = type('obj', (object,), {'text': '{"metric_data":"[]"}'})
+
         get_metric.return_value = "metric_id"
         self.metrics.read_metric_data(endpoint, auth_token, values)