projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix vROps monitoring problems related to SOL006 migration
[osm/MON.git]
/
osm_mon
/
tests
/
unit
/
evaluator
/
test_evaluator_service.py
diff --git
a/osm_mon/tests/unit/evaluator/test_evaluator_service.py
b/osm_mon/tests/unit/evaluator/test_evaluator_service.py
index
bc93046
..
a72dcaf
100644
(file)
--- a/
osm_mon/tests/unit/evaluator/test_evaluator_service.py
+++ b/
osm_mon/tests/unit/evaluator/test_evaluator_service.py
@@
-77,66
+77,93
@@
vnfr_record_mock = {
vnfd_record_mock = {
"_id": "63f44c41-45ee-456b-b10d-5f08fb1796e0",
vnfd_record_mock = {
"_id": "63f44c41-45ee-456b-b10d-5f08fb1796e0",
- "name": "cirros_vdu_scaling_vnf",
- "vendor": "OSM",
+ "id": "cirros_vdu_scaling_vnf",
+ "_admin": {},
+ "product-name": "cirros_vdu_scaling_vnf",
+ "version": "1.0",
"vdu": [
{
"vdu": [
{
+ "id": "cirros_vnfd-VM",
"name": "cirros_vnfd-VM",
"name": "cirros_vnfd-VM",
- "
monitoring-param
": [
+ "
int-cpd
": [
{
{
- "id": "cirros_vnfd-VM_memory_util",
- "nfvi-metric": "average_memory_utilization"
+ "virtual-network-interface-requirement": [
+ {
+ "name": "vdu-eth0"
+ }
+ ],
+ "id": "vdu-eth0-int"
}
],
}
],
- "vm-flavor": {
- "vcpu-count": 1,
- "memory-mb": 256,
- "storage-gb": 2
- },
- "description": "cirros_vnfd-VM",
- "count": 1,
- "id": "cirros_vnfd-VM",
- "interface": [
+ "virtual-compute-desc": "cirros_vnfd-VM-compute",
+ "virtual-storage-desc": [
+ "cirros_vnfd-VM-storage"
+ ],
+ "sw-image-desc": "cirros034",
+ "monitoring-parameter": [
{
{
- "name": "eth0",
- "external-connection-point-ref": "eth0",
- "type": "EXTERNAL",
- "virtual-interface": {
- "bandwidth": "0",
- "type": "VIRTIO",
- "vpci": "0000:00:0a.0"
- }
+ "id": "cirros_vnfd-VM_memory_util",
+ "name": "cirros_vnfd-VM_memory_util",
+ "performance-metric": "average_memory_utilization"
}
}
- ],
- "image": "cirros034"
+ ]
}
],
}
],
- "
monitoring-param
": [
+ "
virtual-compute-desc
": [
{
{
- "id": "cirros_vnf
_memory_util
",
- "
name": "cirros_vnf_memory_util",
- "aggregation-type": "AVERAGE",
- "vdu-monitoring-param": {
- "vdu-monitoring-param-ref": "cirros_vnfd-VM_memory_util",
- "
vdu-ref": "cirros_vnfd-VM"
+ "id": "cirros_vnf
d-VM-compute
",
+ "
virtual-cpu": {
+ "num-virtual-cpu": 1
+ },
+ "virtual-memory": {
+ "
size": 1
}
}
],
}
}
],
- "description": "Simple VNF example with a cirros and a scaling group descriptor",
- "id": "cirros_vdu_scaling_vnf",
- "logo": "cirros-64.png",
- "version": "1.0",
- "connection-point": [
+ "virtual-storage-desc": [
{
{
- "
name": "eth0
",
- "
type": "VPORT"
+ "
id": "cirros_vnfd-VM-storage
",
+ "
size-of-storage": 2
}
],
}
],
- "mgmt-interface": {
- "cp": "eth0"
- },
- "short-name": "cirros_vdu_scaling_vnf",
- "_admin": {}
+ "sw-image-desc": [
+ {
+ "id": "cirros034",
+ "name": "cirros034",
+ "image": "cirros034"
+ }
+ ],
+ "ext-cpd": [
+ {
+ "int-cpd": {
+ "vdu-id": "cirros_vnfd-VM",
+ "cpd": "vdu-eth0-int"
+ },
+ "id": "vnf-cp0-ext"
+ }
+ ],
+ "df": [
+ {
+ "id": "default-df",
+ "vdu-profile": [
+ {
+ "id": "cirros_vnfd-VM"
+ }
+ ],
+ "instantiation-level": [
+ {
+ "id": "default-instantiation-level",
+ "vdu-level": [
+ {
+ "vdu-id": "cirros_vnfd-VM"
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "description": "Simple VNF example with a cirros and a scaling group descriptor",
+ "mgmt-cp": "vnf-cp0-ext"
}
}