X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftests%2Funit%2Fcollector%2Fvnf_collectors%2Fvmware%2Ftest_vio_collector.py;h=2c72ea09277b52fbe7493e5ff4c62afdb4afbff5;hb=09bcf03e83c5863c3c0bcf47a457e70162fca94e;hp=215bd53237648c1bdb67d3b42017ac441a6f4fa8;hpb=7233ad262f6c5436c713784a443596c0aa919b04;p=osm%2FMON.git

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 215bd53..2c72ea0 100644
--- 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,12 +57,15 @@ 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:
+            mock_http_response(mock_requests, method='POST',
+                               url_pattern='/suite-api/api/auth/token/acquire',
+                               response_file='vrops_token.json')
             mock_http_response(mock_requests,
                                url_pattern='/suite-api/api/resources\\?resourceKind=VirtualMachine',
                                response_file='vrops_resources.json')
@@ -81,9 +84,12 @@ 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',
+                               url_pattern='/suite-api/api/auth/token/acquire',
+                               response_file='vrops_token.json')
             mock_http_response(mock_requests,
                                url_pattern='/suite-api/api/resources\\?resourceKind=VirtualMachine',
                                response_file='vrops_resources.json')
@@ -94,9 +100,12 @@ 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',
+                               url_pattern='/suite-api/api/auth/token/acquire',
+                               response_file='vrops_token.json')
             mock_http_response(mock_requests,
                                url_pattern='/suite-api/api/resources\\?resourceKind=VirtualMachine',
                                response_file='vrops_resources.json')
@@ -111,6 +120,9 @@ class CollectorTest(TestCase):
         del self.vnfr['vdur'][1]['name']
         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',
+                               url_pattern='/suite-api/api/auth/token/acquire',
+                               response_file='vrops_token.json')
             mock_http_response(mock_requests,
                                url_pattern='/suite-api/api/resources\\?resourceKind=VirtualMachine',
                                response_file='vrops_resources.json')