X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftests%2Funit%2Fcollector%2Fvnf_collectors%2Fvmware%2Ftest_vrops_helper.py;h=3589d7dc81ada576e1f57af24dfaf338dfefbaf0;hb=09bcf03e83c5863c3c0bcf47a457e70162fca94e;hp=846f98b9b57a5b98f1d7337f9cf72db963dad9be;hpb=eacb716a3aa21c2bb46ffeda9471428f9833fc4d;p=osm%2FMON.git diff --git a/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vrops_helper.py b/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vrops_helper.py index 846f98b..3589d7d 100644 --- a/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vrops_helper.py +++ b/osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vrops_helper.py @@ -88,7 +88,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"}, + {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"}, ] with requests_mock.Mocker() as mock_requests: @@ -109,8 +109,8 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"}, - {"id": "ubuntu_vnfd-VM_average_memory_utilization", "nfvi-metric": "average_memory_utilization"} + {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"}, + {"id": "ubuntu_vnf_average_memory_utilization", "performance-metric": "average_memory_utilization"} ] with requests_mock.Mocker() as mock_requests: @@ -134,7 +134,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {'id': 'ubuntu_vnfd-VM_cpu_util', 'nfvi-metric': 'disk_read_bytes'} + {'id': 'ubuntu_vnf_cpu_util', 'performance-metric': 'disk_read_bytes'} ] with requests_mock.Mocker() as mock_requests: @@ -156,7 +156,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {'id': 'cirros_vnfd-VM_packets_sent', 'nfvi-metric': 'packets_in_dropped'}, + {'id': 'cirros_vnf_packets_sent', 'performance-metric': 'packets_in_dropped'}, ] with requests_mock.Mocker() as mock_requests: @@ -176,7 +176,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {'id': 'cirros_vnfd-Unknown_Metric', 'nfvi-metric': 'unknown'}, + {'id': 'cirros_vnf-Unknown_Metric', 'performance-metric': 'unknown'}, ] with requests_mock.Mocker() as mock_requests: @@ -196,7 +196,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"}, + {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"}, ] with requests_mock.Mocker() as mock_requests: @@ -215,7 +215,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): vdu_mappings = {'VMWARE-OID-VM-1': {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2'}} monitoring_params = [ - {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"}, + {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"}, ] with requests_mock.Mocker() as mock_requests: @@ -235,7 +235,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"}, + {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"}, ] with requests_mock.Mocker() as mock_requests: @@ -255,7 +255,7 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-1'}} monitoring_params = [ - {"id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization"}, + {"id": "ubuntu_vnf_cpu_util", "performance-metric": "cpu_utilization"}, ] with requests_mock.Mocker() as mock_requests: @@ -279,15 +279,15 @@ class vROPS_Helper_Get_Metrics_Test(TestCase): {'name': 'vmware-scaling-1-ubuntu_vnfd-VM-2', 'vrops_id': 'VROPS-UUID-3'} } monitoring_params = [ - {'id': 'ubuntu_vnfd-VM_cpu_util', 'nfvi-metric': 'cpu_utilization'}, - {'id': 'ubuntu_vnfd-VM_average_memory_utilization', 'nfvi-metric': 'average_memory_utilization'}, - {'id': 'ubuntu_vnfd-VM_disk_read_ops', 'nfvi-metric': 'disk_read_ops'}, - {'id': 'ubuntu_vnfd-VM_disk_write_ops', 'nfvi-metric': 'disk_write_ops'}, - {'id': 'ubuntu_vnfd-VM_disk_read_bytes', 'nfvi-metric': 'disk_read_bytes'}, - {'id': 'ubuntu_vnfd-VM_disk_write_bytes', 'nfvi-metric': 'disk_write_bytes'}, - {'id': 'ubuntu_vnfd-VM_packets_out_dropped', 'nfvi-metric': 'packets_out_dropped'}, - {'id': 'ubuntu_vnfd-VM_packets_received', 'nfvi-metric': 'packets_received'}, - {'id': 'ubuntu_vnfd-VM_packets_sent', 'nfvi-metric': 'packets_sent'} + {'id': 'ubuntu_vnf_cpu_util', 'performance-metric': 'cpu_utilization'}, + {'id': 'ubuntu_vnf_average_memory_utilization', 'performance-metric': 'average_memory_utilization'}, + {'id': 'ubuntu_vnf_disk_read_ops', 'performance-metric': 'disk_read_ops'}, + {'id': 'ubuntu_vnf_disk_write_ops', 'performance-metric': 'disk_write_ops'}, + {'id': 'ubuntu_vnf_disk_read_bytes', 'performance-metric': 'disk_read_bytes'}, + {'id': 'ubuntu_vnf_disk_write_bytes', 'performance-metric': 'disk_write_bytes'}, + {'id': 'ubuntu_vnf_packets_out_dropped', 'performance-metric': 'packets_out_dropped'}, + {'id': 'ubuntu_vnf_packets_received', 'performance-metric': 'packets_received'}, + {'id': 'ubuntu_vnf_packets_sent', 'performance-metric': 'packets_sent'} ] with requests_mock.Mocker() as mock_requests: