projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
8785534
..
5014133
100644
(file)
--- a/
osm_mon/test/OpenStack/unit/test_metric_calls.py
+++ b/
osm_mon/test/OpenStack/unit/test_metric_calls.py
@@
-179,9
+179,7
@@
class TestMetricCalls(unittest.TestCase):
self.metrics.list_metrics(endpoint, auth_token, values)
perf_req.assert_any_call(
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")
@mock.patch.object(metric_req.Metrics, "response_list")
@mock.patch.object(Common, "perform_request")
@@
-209,10
+207,7
@@
class TestMetricCalls(unittest.TestCase):
self.metrics.list_metrics(endpoint, auth_token, values)
perf_req.assert_any_call(
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):
@mock.patch.object(Common, "perform_request")
def test_get_metric_id(self, perf_req):