Fixes VIO collection 76/7876/1
authorbeierl <mbeierl@vmware.com>
Thu, 25 Jul 2019 17:05:58 +0000 (13:05 -0400)
committerdiazb <bdiaz@whitestack.com>
Thu, 29 Aug 2019 19:06:53 +0000 (21:06 +0200)
commitdd392d627f5246bf114628b5a9bad2f17521b33f
tree590c4d315d6aa82c5bd126f1e2416df457a66afd
parent6dc19bc180b41271c0f12c67c3b52574f260e44c
Fixes VIO collection

Extract common vROPS code from vmware and vio collectors.
Add unit test coverage.
Remove unused code.
Improved vROPS collection to ask for current values only
instead of a date range.
Reduces number of calls to vROPS by asking for all metrics
for all VDUs at once.

BUG 796

Change-Id: I00ecd70c6d25f7c8982cbc633a28ab6f1ceb8cd6
Signed-off-by: beierl <mbeierl@vmware.com>
(cherry picked from commit 7233ad262f6c5436c713784a443596c0aa919b04)
20 files changed:
osm_mon/collector/vnf_collectors/vio.py
osm_mon/collector/vnf_collectors/vmware.py
osm_mon/collector/vnf_collectors/vrops/__init__.py [new file with mode: 0644]
osm_mon/collector/vnf_collectors/vrops/metrics.py [new file with mode: 0644]
osm_mon/collector/vnf_collectors/vrops/vrops_helper.py [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/mock_http.py [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/mock_vcd.py [deleted file]
osm_mon/tests/unit/collector/vnf_collectors/vmware/osm_mocks/VNFD.json
osm_mon/tests/unit/collector/vnf_collectors/vmware/osm_mocks/VNFR.json
osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vcd_collector.py
osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vio_collector.py [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/test_vrops_helper.py [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vcd_mocks/OK.json [deleted file]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vcd_mocks/vrops_multi.json [deleted file]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vmware_mocks/404.txt [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vmware_mocks/OK.json [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vmware_mocks/malformed.json [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vmware_mocks/vcd_vapp_response.xml [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vmware_mocks/vrops_multi.json [new file with mode: 0644]
osm_mon/tests/unit/collector/vnf_collectors/vmware/vmware_mocks/vrops_resources.json [new file with mode: 0644]