X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftests%2Funit%2Fcollector%2Fvnf_collectors%2Fvmware%2Ftest_vcd_collector.py;h=ccab0d2f552d3bc99c771709e57257364e2748fc;hb=09bcf03e83c5863c3c0bcf47a457e70162fca94e;hp=60c22a37be13714f2edb1e6e0590be7bd50f98f9;hpb=eacb716a3aa21c2bb46ffeda9471428f9833fc4d;p=osm%2FMON.git

diff --git a/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vcd_collector.py b/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vcd_collector.py
index 60c22a3..ccab0d2 100644
--- a/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vcd_collector.py
+++ b/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vcd_collector.py
@@ -61,9 +61,9 @@ class CollectorTest(TestCase):
     def test_collect_cpu_and_memory(self, mock_vm_moref_id):
 
         mock_vm_moref_id.return_value = "VMWARE-OID-VM-1"
-        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
 
@@ -98,7 +98,7 @@ class CollectorTest(TestCase):
         self.assertEqual(len(metrics), 0, "Number of metrics returned")
 
     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',
@@ -114,7 +114,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',