Fix vROps monitoring problems related to SOL006 migration

[osm/MON.git] / osm_mon / tests / unit / collector / vnf_collectors / vmware / test_vio_collector.py

diff --git a/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vio_collector.py b/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vio_collector.py
index 81e6024..2c72ea0 100644 (file)
--- a/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vio_collector.py
+++ b/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vio_collector.py
@@ -57,9 +57,9 @@ class CollectorTest(TestCase):
         super().tearDown()
 
     def test_collect_cpu_and_memory(self):
-        self.vnfd['vdu'][0]['monitoring-param'] = [
-            {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"},
-            {"id": "ubuntu_vnfd-VM_average_memory_utilization", "nfvi-metric": "average_memory_utilization"}
+        self.vnfd['vdu'][0]['monitoring-parameter'] = [
+            {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"},
+            {"id": "ubuntu_vnf_average_memory_utilization", "performance-metric": "average_memory_utilization"}
             ]
         self.mock_db.return_value.get_vnfd.return_value = self.vnfd
         with requests_mock.Mocker() as mock_requests:
@@ -84,7 +84,7 @@ class CollectorTest(TestCase):
             self.assertEqual(metrics[3].value, 15.23439884185791, "Memory metric value")
 
     def test_collect_no_monitoring_param(self):
-        self.vnfd['vdu'][0]['monitoring-param'] = []
+        self.vnfd['vdu'][0]['monitoring-parameter'] = []
         self.mock_db.return_value.get_vnfd.return_value = self.vnfd
         with requests_mock.Mocker() as mock_requests:
             mock_http_response(mock_requests, method='POST',
@@ -100,7 +100,7 @@ class CollectorTest(TestCase):
             self.assertEqual(len(metrics), 0, "Number of metrics returned")
 
     def test_collect_empty_monitoring_param(self):
-        del self.vnfd['vdu'][0]['monitoring-param']
+        del self.vnfd['vdu'][0]['monitoring-parameter']
         self.mock_db.return_value.get_vnfd.return_value = self.vnfd
         with requests_mock.Mocker() as mock_requests:
             mock_http_response(mock_requests, method='POST',