X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Ftest_pkg_descriptors.py;h=4552e24c3a39af0bcf7d6ef11ac22c40a56c9d5a;hp=80fe8d3b5956f0e6f864da55179562f964e8990c;hb=7cbd03c5c21202fff473ae943e75dd49a18f2516;hpb=7ddb0732d05743a56ee3376446f76be8fa73d3ad diff --git a/osm_nbi/tests/test_pkg_descriptors.py b/osm_nbi/tests/test_pkg_descriptors.py index 80fe8d3..4552e24 100644 --- a/osm_nbi/tests/test_pkg_descriptors.py +++ b/osm_nbi/tests/test_pkg_descriptors.py @@ -42,143 +42,167 @@ db_vnfds_text = """ usageState: NOT_IN_USE userDefinedData: {} _id: 7637bcf8-cf14-42dc-ad70-c66fcf1e6e77 - connection-point: - - id: vnf-mgmt - name: vnf-mgmt - short-name: vnf-mgmt - type: VPORT - - id: vnf-data - name: vnf-data - short-name: vnf-data - type: VPORT - description: A VNF consisting of 2 VDUs connected to an internal VL, and one VDU - with cloud-init id: hackfest3charmed-vnf - internal-vld: - - id: internal - internal-connection-point: - - id-ref: mgmtVM-internal - - id-ref: dataVM-internal - name: internal - short-name: internal - type: ELAN - logo: osm.png - mgmt-interface: - cp: vnf-mgmt - monitoring-param: - - aggregation-type: AVERAGE - id: monitor1 - name: monitor1 - vdu-monitoring-param: - vdu-monitoring-param-ref: dataVM_cpu_util - vdu-ref: dataVM - name: hackfest3charmed-vnf - scaling-group-descriptor: - - max-instance-count: 10 - name: scale_dataVM - scaling-config-action: - - trigger: post-scale-out - vnf-config-primitive-name-ref: touch - - trigger: pre-scale-in - vnf-config-primitive-name-ref: touch - scaling-policy: - - cooldown-time: 60 - name: auto_cpu_util_above_threshold - scaling-criteria: - - name: cpu_util_above_threshold - scale-in-relational-operation: LE - scale-in-threshold: '15.0000000000' - scale-out-relational-operation: GE - scale-out-threshold: '60.0000000000' - vnf-monitoring-param-ref: monitor1 - scaling-type: automatic - threshold-time: 0 - vdu: - - count: 1 - vdu-id-ref: dataVM - short-name: hackfest3charmed-vnf + description: >- + A VNF consisting of 2 VDUs connected to an internal VL, and one VDU with + cloud-init + product-name: hackfest3charmed-vnf + version: '1.0' + mgmt-cp: vnf-mgmt-ext + + virtual-compute-desc: + - id: mgmt-compute + virtual-cpu: + num-virtual-cpu: 2 + virtual-memory: + size: '2' + - id: data-compute + virtual-cpu: + num-virtual-cpu: 2 + virtual-memory: + size: '2' + + virtual-storage-desc: + - id: mgmt-storage + size-of-storage: '20' + - id: data-storage + size-of-storage: '20' + + sw-image-desc: + - id: hackfest3-mgmt + name: hackfest3-mgmt + vdu: - - count: '1' - cloud-init-file: cloud-config.txt - id: mgmtVM - image: hackfest3-mgmt - interface: - - external-connection-point-ref: vnf-mgmt - name: mgmtVM-eth0 - position: 1 - type: EXTERNAL - virtual-interface: - type: VIRTIO - - internal-connection-point-ref: mgmtVM-internal - name: mgmtVM-eth1 - position: 2 - type: INTERNAL - virtual-interface: - type: VIRTIO - internal-connection-point: - - id: mgmtVM-internal - name: mgmtVM-internal - short-name: mgmtVM-internal - type: VPORT + - id: mgmtVM name: mgmtVM - vm-flavor: - memory-mb: '1024' - storage-gb: '10' - vcpu-count: 1 - - count: '1' - id: dataVM - image: hackfest3-mgmt - interface: - - internal-connection-point-ref: dataVM-internal - name: dataVM-eth0 - position: 1 - type: INTERNAL - virtual-interface: - type: VIRTIO - - external-connection-point-ref: vnf-data - name: dataVM-xe0 - position: 2 - type: EXTERNAL - virtual-interface: - type: VIRTIO - internal-connection-point: - - id: dataVM-internal - name: dataVM-internal - short-name: dataVM-internal - type: VPORT - monitoring-param: - - id: dataVM_cpu_util - nfvi-metric: cpu_utilization + cloud-init-file: cloud-config.txt + sw-image-desc: hackfest3-mgmt + virtual-compute-desc: mgmt-compute + virtual-storage-desc: + - mgmt-storage + int-cpd: + - id: vnf-mgmt + virtual-network-interface-requirement: + - name: mgmtVM-eth0 + position: 1 + virtual-interface: + type: VIRTIO + - id: mgmtVM-internal + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: mgmtVM-eth1 + position: 2 + virtual-interface: + type: VIRTIO + - id: dataVM name: dataVM - vm-flavor: - memory-mb: '1024' - storage-gb: '10' - vcpu-count: 1 - version: '1.0' + sw-image-desc: hackfest3-mgmt + virtual-compute-desc: data-compute + virtual-storage-desc: + - data-storage + int-cpd: + - id: dataVM-internal + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: dataVM-eth1 + position: 1 + virtual-interface: + type: VIRTIO + - id: vnf-data + virtual-network-interface-requirement: + - name: dataVM-eth0 + position: 2 + virtual-interface: + type: VIRTIO + monitoring-parameter: + - id: dataVM_cpu_util + name: dataVM_cpu_util + performance-metric: cpu_utilization + + int-virtual-link-desc: + - id: internal + + ext-cpd: + - id: vnf-mgmt-ext + int-cpd: # Connection to int-cpd + vdu-id: mgmtVM + cpd: vnf-mgmt + - id: vnf-data-ext + int-cpd: # Connection to int-cpd + vdu-id: dataVM + cpd: vnf-data + + df: + - id: hackfest_default + vnf-configuration-id: vnf-configuration-example + vdu-profile: + - id: mgmtVM + min-number-of-instances: 1 + - id: dataVM + min-number-of-instances: 1 + max-number-of-instances: 10 + vdu-configuration-id: vdu-configuration-example + instantiation-level: + - id: default + vdu-level: + - vdu-id: mgmtVM + number-of-instances: 1 + - vdu-id: dataVM + number-of-instances: 1 + scaling-aspect: + - id: scale_dataVM + name: scale_dataVM + max-scale-level: 10 + aspect-delta-details: + deltas: + - id: delta1 + vdu-delta: + - id: vdudelta1 + number-of-instances: 1 + scaling-policy: + - name: auto_cpu_util_above_threshold + scaling-type: automatic + enabled: true + threshold-time: 0 + cooldown-time: 60 + scaling-criteria: + - name: cpu_util_above_threshold + scale-in-relational-operation: LE + scale-in-threshold: '15.0000000000' + scale-out-relational-operation: GE + scale-out-threshold: '60.0000000000' + vnf-monitoring-param-ref: dataVM_cpu_util + scaling-config-action: + - trigger: post-scale-out + vnf-config-primitive-name-ref: touch + - trigger: pre-scale-in + vnf-config-primitive-name-ref: touch + vnf-configuration: - config-primitive: - - name: touch - parameter: - - data-type: STRING - default-value: - name: filename + - id: vnf-configuration-example initial-config-primitive: - - name: config + - seq: "1" + name: config parameter: - - name: ssh-hostname + - name: ssh-hostname value: - - name: ssh-username + - name: ssh-username value: ubuntu - - name: ssh-password + - name: ssh-password value: osm4u - seq: '1' - - name: touch + - seq: "2" + name: touch parameter: - - name: filename + - name: filename value: - seq: '2' + config-primitive: + - name: touch + parameter: + - data-type: STRING + default-value: + name: filename juju: - charm: simple + charm: simple """ db_nsds_text = """ @@ -202,41 +226,44 @@ db_nsds_text = """ usageState: NOT_IN_USE userDefinedData: {} _id: 8c2f8b95-bb1b-47ee-8001-36dc090678da - constituent-vnfd: - - member-vnf-index: '1' - vnfd-id-ref: hackfest3charmed-vnf - - member-vnf-index: '2' - vnfd-id-ref: hackfest3charmed-vnf - description: NS with 2 VNFs hackfest3charmed-vnf connected by datanet and mgmtnet - VLs id: hackfest3charmed-ns - logo: osm.png name: hackfest3charmed-ns - short-name: hackfest3charmed-ns + description: NS with 2 VNFs hackfest3charmed-vnf connected by datanet and mgmtnet VLs + designer: OSM version: '1.0' - vld: - - id: mgmt + + vnfd-id: + - hackfest3charmed-vnf + + virtual-link-desc: + - id: mgmt mgmt-network: true - name: mgmt - short-name: mgmt - type: ELAN - vim-network-name: mgmt - vnfd-connection-point-ref: - - member-vnf-index-ref: '1' - vnfd-connection-point-ref: vnf-mgmt - vnfd-id-ref: hackfest3charmed-vnf - - member-vnf-index-ref: '2' - vnfd-connection-point-ref: vnf-mgmt - vnfd-id-ref: hackfest3charmed-vnf - - id: datanet - name: datanet - short-name: datanet - type: ELAN - vnfd-connection-point-ref: - - member-vnf-index-ref: '1' - vnfd-connection-point-ref: vnf-data - vnfd-id-ref: hackfest3charmed-vnf - - member-vnf-index-ref: '2' - vnfd-connection-point-ref: vnf-data - vnfd-id-ref: hackfest3charmed-vnf + - id: datanet + mgmt-network: false + + df: + - id: hackfest_charmed_DF + vnf-profile: + - id: hackfest_vnf1 # member-vnf-index-ref: 1 + vnfd-id: hackfest3charmed-vnf + virtual-link-connectivity: + - virtual-link-profile-id: mgmt + constituent-cpd-id: + - constituent-base-element-id: hackfest_vnf1 + constituent-cpd-id: vnf-mgmt-ext + - virtual-link-profile-id: datanet + constituent-cpd-id: + - constituent-base-element-id: hackfest_vnf1 + constituent-cpd-id: vnf-data-ext + - id: hackfest_vnf2 # member-vnf-index-ref: 2 + vnfd-id: hackfest3charmed-vnf + virtual-link-connectivity: + - virtual-link-profile-id: mgmt + constituent-cpd-id: + - constituent-base-element-id: hackfest_vnf2 + constituent-cpd-id: vnf-mgmt-ext + - virtual-link-profile-id: datanet + constituent-cpd-id: + - constituent-base-element-id: hackfest_vnf2 + constituent-cpd-id: vnf-data-ext """