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=1c3b669e8a6030de17712758f9a81aa323d7a6d5;hp=956a19fb347137c78ce47f77a4c507d8d7ade86b;hpb=7233ad262f6c5436c713784a443596c0aa919b04;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 956a19f..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 @@ -40,6 +40,9 @@ class vROPS_Helper_Resource_List_Test(TestCase): def test_get_vm_resource_list_from_vrops(self): 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') @@ -48,6 +51,9 @@ class vROPS_Helper_Resource_List_Test(TestCase): def test_get_vm_resource_list_from_vrops_http_404(self): 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='404.txt', status_code=404) @@ -56,6 +62,9 @@ class vROPS_Helper_Resource_List_Test(TestCase): def test_get_vm_resource_list_from_vrops_bad_json(self): 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='malformed.json') @@ -79,10 +88,13 @@ 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: + 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/stats.*', response_file='vrops_multi.json') @@ -97,11 +109,14 @@ 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: + 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/stats.*', response_file='vrops_multi.json') @@ -119,10 +134,13 @@ 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: + 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/stats.*', response_file='vrops_multi.json') @@ -138,10 +156,13 @@ 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: + 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/stats.*', response_file='vrops_multi.json') @@ -155,10 +176,13 @@ 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: + 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/stats.*', response_file='vrops_multi.json') @@ -172,10 +196,13 @@ 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: + 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/stats.*', response_file='OK.json') @@ -188,10 +215,13 @@ 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: + 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/stats.*', response_file='vrops_multi.json') @@ -205,10 +235,13 @@ 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: + 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/stats.*', response_file='404.txt', status_code=404) @@ -222,10 +255,13 @@ 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: + 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/stats.*', response_file='404.txt') @@ -243,18 +279,21 @@ 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: + 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/stats.*', response_file='vrops_multi.json')