X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftests%2Funit%2Fcollector%2Fvnf_collectors%2Fvmware%2Fosm_mocks%2FVNFD.json;h=12105a4468d85de67474d257de6f59f5057073aa;hb=eacb716a3aa21c2bb46ffeda9471428f9833fc4d;hp=ed3478908b35533fb4fcdfc73f73e353ea759e71;hpb=730dfd82ef49e2dc1f6d54bb8a1d5e877d4d50b2;p=osm%2FMON.git diff --git a/osm_mon/tests/unit/collector/vnf_collectors/vmware/osm_mocks/VNFD.json b/osm_mon/tests/unit/collector/vnf_collectors/vmware/osm_mocks/VNFD.json index ed34789..12105a4 100644 --- a/osm_mon/tests/unit/collector/vnf_collectors/vmware/osm_mocks/VNFD.json +++ b/osm_mon/tests/unit/collector/vnf_collectors/vmware/osm_mocks/VNFD.json @@ -1,63 +1,164 @@ { + "_copyright_comment": "Copyright 2016-2019 VMware Inc. This file is part of ETSI OSM All Rights Reserved. Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. For those usages not covered by the Apache License, Version 2.0 please contact: osslegalrouting@vmware.com", "_admin": { - "created": 1561567611.6193357, - "modified": 1561567611.6193357, + "created": 1562374395.5216513, + "modified": 1562374395.5216513, "onboardingState": "ONBOARDED", "operationalState": "ENABLED", "projects_read": [ - "admin" + "775be778-0f51-495a-b865-a23ab20a080f" ], "projects_write": [ - "admin" + "775be778-0f51-495a-b865-a23ab20a080f" ], "storage": { "descriptor": "cirros_vnf/cirros_vdu_alarm_vnfd.yaml", - "folder": "9d116df6-6fa7-4a5b-b284-a67f554c1261", + "folder": "cb0da948-7bce-474d-bbcb-6bfce545d397", "fs": "local", "path": "/app/storage/", "pkg-dir": "cirros_vnf", - "zipfile": "cirros_vdu_alarm_vnfd.tar.gz" + "zipfile": "package.tar.gz" }, "type": "vnfd", "usageState": "NOT_IN_USE", "userDefinedData": { } }, - "_id": "9d116df6-6fa7-4a5b-b284-a67f554c1261", + "_id": "cb0da948-7bce-474d-bbcb-6bfce545d397", "connection-point": [ { "name": "eth0", "type": "VPORT" } ], - "description": "Simple VNF example with a cirros and a VNF alarm", - "id": "cirros_vdu_alarm_vnf", - "logo": "cirros-64.png", + "description": "Simple Ubuntu VNF with metric collectors and scaling group", + "id": "ubuntu_vdu_alarm_vnf", + "logo": "ubuntu-64.png", "mgmt-interface": { "cp": "eth0" }, "monitoring-param": [ { "aggregation-type": "AVERAGE", - "id": "cirros_vnf_cpu_util", - "name": "cirros_vnf_cpu_util", + "id": "ubuntu_vnf_cpu_util", + "name": "ubuntu_vnf_cpu_util", "vdu-monitoring-param": { - "vdu-monitoring-param-ref": "cirros_vnfd-VM_cpu_util", - "vdu-ref": "cirros_vnfd-VM" + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_cpu_util", + "vdu-ref": "ubuntu_vnfd-VM" } }, { "aggregation-type": "AVERAGE", - "id": "cirros_vnf_average_memory_utilization", - "name": "cirros_vnf_average_memory_utilization", + "id": "ubuntu_vnf_average_memory_utilization", + "name": "ubuntu_vnf_average_memory_utilization", "vdu-monitoring-param": { - "vdu-monitoring-param-ref": "cirros_vnfd-VM_average_memory_utilization", - "vdu-ref": "cirros_vnfd-VM" + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_average_memory_utilization", + "vdu-ref": "ubuntu_vnfd-VM" } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_disk_read_ops", + "name": "ubuntu_vnf_disk_read_ops", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_disk_read_ops", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_disk_write_ops", + "name": "ubuntu_vnf_disk_write_ops", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_disk_write_ops", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_disk_read_bytes", + "name": "ubuntu_vnf_disk_read_bytes", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_disk_read_bytes", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_disk_write_bytes", + "name": "ubuntu_vnf_disk_write_bytes", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_disk_write_bytes", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_packets_in_dropped", + "name": "ubuntu_vnf_packets_in_dropped", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_packets_in_dropped", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_packets_out_dropped", + "name": "ubuntu_vnf_packets_out_dropped", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_packets_out_dropped", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_packets_received", + "name": "ubuntu_vnf_packets_received", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_packets_received", + "vdu-ref": "ubuntu_vnfd-VM" + } + }, + { + "aggregation-type": "AVERAGE", + "id": "ubuntu_vnf_packets_sent", + "name": "ubuntu_vnf_packets_sent", + "vdu-monitoring-param": { + "vdu-monitoring-param-ref": "ubuntu_vnfd-VM_packets_sent", + "vdu-ref": "ubuntu_vnfd-VM" + } + } + ], + "name": "ubuntu_vdu_alarm_vnf", + "scaling-group-descriptor": [ + { + "min-instance-count": 0, + "name": "cpu_autoscaling_descriptor", + "scaling-policy": [ + { + "cooldown-time": 120, + "name": "cpu_scaling_policy", + "scaling-criteria": [ + { + "name": "cpu_autoscaling_criteria", + "scale-in-relational-operation": "LT", + "scale-in-threshold": "20.0000000000", + "scale-out-relational-operation": "GT", + "scale-out-threshold": "80.0000000000", + "vnf-monitoring-param-ref": "ubuntu_vnf_cpu_util" + } + ], + "scaling-type": "automatic" + } + ], + "vdu": [ + { + "vdu-id-ref": "ubuntu_vnfd-VM" + } + ] } ], - "name": "cirros_vdu_alarm_vnf", - "short-name": "cirros_vdu_alarm_vnf", + "short-name": "ubuntu_vdu_alarm_vnf", "vdu": [ { "alarm": [ @@ -82,12 +183,12 @@ "alarm-id": "alarm-1", "operation": "LT", "value": "20.0000", - "vnf-monitoring-param-ref": "cirros_vnf_cpu_util" + "vnf-monitoring-param-ref": "ubuntu_vnf_cpu_util" } ], "count": "1", - "description": "cirros_vnfd-VM", - "id": "cirros_vnfd-VM", + "description": "ubuntu_vnfd-VM", + "id": "ubuntu_vnfd-VM", "image": "ubuntu", "interface": [ { @@ -102,19 +203,51 @@ ], "monitoring-param": [ { - "id": "cirros_vnfd-VM_cpu_util", + "id": "ubuntu_vnfd-VM_cpu_util", "nfvi-metric": "cpu_utilization" }, { - "id": "cirros_vnfd-VM_average_memory_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_in_dropped", + "nfvi-metric": "packets_in_dropped" + }, + { + "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" } ], - "name": "cirros_vnfd-VM", + "name": "ubuntu_vnfd-VM", "vm-flavor": { - "memory-mb": "256", - "storage-gb": "2", - "vcpu-count": 1 + "memory-mb": "4096", + "storage-gb": "20", + "vcpu-count": 4 } } ],