From: peusterm Date: Tue, 24 Apr 2018 12:15:53 +0000 (+0200) Subject: Added emulator-compatible services and VNFs for R4 integration tests. X-Git-Tag: v4.0.0~4 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F6022%2F1;p=osm%2Fvim-emu.git Added emulator-compatible services and VNFs for R4 integration tests. The emulator needs slightly modified test NSDs and VNFDs to work with. This commit adds such examples based on the official hackfest_1 and hackfest_2 services. These example descriptors/packages are also used for the R4 integration tests with vim-emu. Change-Id: Ief26dbdbb15dc973e7563923394d7e7e90579fab Signed-off-by: peusterm --- diff --git a/src/emuvim/examples/services/hackfest_1_nsd.tar.gz b/src/emuvim/examples/services/hackfest_1_nsd.tar.gz new file mode 100644 index 0000000..ca13889 Binary files /dev/null and b/src/emuvim/examples/services/hackfest_1_nsd.tar.gz differ diff --git a/src/emuvim/examples/services/hackfest_1_nsd/hackfest_1_nsd.yaml b/src/emuvim/examples/services/hackfest_1_nsd/hackfest_1_nsd.yaml new file mode 100644 index 0000000..457475f --- /dev/null +++ b/src/emuvim/examples/services/hackfest_1_nsd/hackfest_1_nsd.yaml @@ -0,0 +1,44 @@ +--- +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. + +nsd:nsd-catalog: + nsd: + - id: hackfest1-ns + name: hackfest1-ns + short-name: hackfest1-ns + description: Simple NS with a single VNF and a single VL + version: '1.0' + logo: osm.png + constituent-vnfd: + - vnfd-id-ref: hackfest1-vnf + member-vnf-index: '1' + vld: + - id: mgmtnet + name: mgmtnet + short-name: mgmtnet + type: ELAN + mgmt-network: 'true' + vnfd-connection-point-ref: + - vnfd-id-ref: hackfest1-vnf + member-vnf-index-ref: '1' + vnfd-connection-point-ref: vnf-cp0 + diff --git a/src/emuvim/examples/services/hackfest_1_nsd/icons/osm.png b/src/emuvim/examples/services/hackfest_1_nsd/icons/osm.png new file mode 100644 index 0000000..62012d2 Binary files /dev/null and b/src/emuvim/examples/services/hackfest_1_nsd/icons/osm.png differ diff --git a/src/emuvim/examples/services/hackfest_2_nsd.tar.gz b/src/emuvim/examples/services/hackfest_2_nsd.tar.gz new file mode 100644 index 0000000..9170de9 Binary files /dev/null and b/src/emuvim/examples/services/hackfest_2_nsd.tar.gz differ diff --git a/src/emuvim/examples/services/hackfest_2_nsd/hackfest_2_nsd.yaml b/src/emuvim/examples/services/hackfest_2_nsd/hackfest_2_nsd.yaml new file mode 100755 index 0000000..868dc53 --- /dev/null +++ b/src/emuvim/examples/services/hackfest_2_nsd/hackfest_2_nsd.yaml @@ -0,0 +1,61 @@ +--- +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. + +nsd:nsd-catalog: + nsd: + - id: hackfest2-ns + name: hackfest2-ns + short-name: hackfest2-ns + description: NS with 2 VNFs connected by datanet and mgmtnet VLs + version: '1.0' + logo: osm.png + constituent-vnfd: + - vnfd-id-ref: hackfest2-vnf + member-vnf-index: '1' + - vnfd-id-ref: hackfest2-vnf + member-vnf-index: '2' + vld: + - id: mgmtnet + name: mgmtnet + short-name: mgmtnet + type: ELAN + mgmt-network: 'true' + vim-network-name: mgmt + vnfd-connection-point-ref: + - vnfd-id-ref: hackfest2-vnf + member-vnf-index-ref: '1' + vnfd-connection-point-ref: vnf-mgmt + - vnfd-id-ref: hackfest2-vnf + member-vnf-index-ref: '2' + vnfd-connection-point-ref: vnf-mgmt + - id: datanet + name: datanet + short-name: datanet + type: ELAN + vnfd-connection-point-ref: + - vnfd-id-ref: hackfest2-vnf + member-vnf-index-ref: '1' + vnfd-connection-point-ref: vnf-data + - vnfd-id-ref: hackfest2-vnf + member-vnf-index-ref: '2' + vnfd-connection-point-ref: vnf-data + diff --git a/src/emuvim/examples/services/hackfest_2_nsd/icons/osm.png b/src/emuvim/examples/services/hackfest_2_nsd/icons/osm.png new file mode 100644 index 0000000..62012d2 Binary files /dev/null and b/src/emuvim/examples/services/hackfest_2_nsd/icons/osm.png differ diff --git a/src/emuvim/examples/vnfs/hackfest_1_vnfd.tar.gz b/src/emuvim/examples/vnfs/hackfest_1_vnfd.tar.gz new file mode 100644 index 0000000..622634e Binary files /dev/null and b/src/emuvim/examples/vnfs/hackfest_1_vnfd.tar.gz differ diff --git a/src/emuvim/examples/vnfs/hackfest_1_vnfd/hackfest_1_vnfd.yaml b/src/emuvim/examples/vnfs/hackfest_1_vnfd/hackfest_1_vnfd.yaml new file mode 100644 index 0000000..98db0dc --- /dev/null +++ b/src/emuvim/examples/vnfs/hackfest_1_vnfd/hackfest_1_vnfd.yaml @@ -0,0 +1,51 @@ +--- +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. + +vnfd:vnfd-catalog: + vnfd: + - id: hackfest1-vnf + name: hackfest1-vnf + short-name: hackfest1-vnf + version: '1.0' + description: A simple VNF descriptor w/ one VDU + logo: osm.png + connection-point: + - name: vnf-cp0 + type: VPORT + vdu: + - id: hackfest1VM + name: hackfest1VM + image: "ubuntu:trusty" + count: '1' + vm-flavor: + vcpu-count: '1' + memory-mb: '1024' + storage-gb: '10' + interface: + - name: vdu-eth0 + type: EXTERNAL + virtual-interface: + type: VIRTIO + external-connection-point-ref: vnf-cp0 + mgmt-interface: + cp: vnf-cp0 + diff --git a/src/emuvim/examples/vnfs/hackfest_1_vnfd/icons/osm.png b/src/emuvim/examples/vnfs/hackfest_1_vnfd/icons/osm.png new file mode 100644 index 0000000..62012d2 Binary files /dev/null and b/src/emuvim/examples/vnfs/hackfest_1_vnfd/icons/osm.png differ diff --git a/src/emuvim/examples/vnfs/hackfest_2_vnfd.tar.gz b/src/emuvim/examples/vnfs/hackfest_2_vnfd.tar.gz new file mode 100644 index 0000000..c4d5037 Binary files /dev/null and b/src/emuvim/examples/vnfs/hackfest_2_vnfd.tar.gz differ diff --git a/src/emuvim/examples/vnfs/hackfest_2_vnfd/hackfest_2_vnfd.yaml b/src/emuvim/examples/vnfs/hackfest_2_vnfd/hackfest_2_vnfd.yaml new file mode 100644 index 0000000..fe4d08b --- /dev/null +++ b/src/emuvim/examples/vnfs/hackfest_2_vnfd/hackfest_2_vnfd.yaml @@ -0,0 +1,103 @@ +--- +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. + +vnfd:vnfd-catalog: + vnfd: + - id: hackfest2-vnf + name: hackfest2-vnf + short-name: hackfest2-vnf + version: '1.0' + description: A VNF consisting of 2 VDUs connected to an internal VL + logo: osm.png + 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 + mgmt-interface: + cp: vnf-mgmt + internal-vld: + - id: internal + name: internal + short-name: internal + type: ELAN + internal-connection-point: + - id-ref: mgmtVM-internal + - id-ref: dataVM-internal + vdu: + - id: mgmtVM + name: mgmtVM + image: "ubuntu:trusty" + count: '1' + vm-flavor: + vcpu-count: '1' + memory-mb: '1024' + storage-gb: '10' + interface: + - name: mgmtVM-eth0 + position: '1' + type: EXTERNAL + virtual-interface: + type: VIRTIO + external-connection-point-ref: vnf-mgmt + - name: mgmtVM-eth1 + position: '2' + type: INTERNAL + virtual-interface: + type: VIRTIO + internal-connection-point-ref: mgmtVM-internal + internal-connection-point: + - id: mgmtVM-internal + name: mgmtVM-internal + short-name: mgmtVM-internal + type: VPORT + - id: dataVM + name: dataVM + image: "ubuntu:trusty" + count: '1' + vm-flavor: + vcpu-count: '1' + memory-mb: '1024' + storage-gb: '10' + interface: + - name: dataVM-eth0 + position: '1' + type: INTERNAL + virtual-interface: + type: VIRTIO + internal-connection-point-ref: dataVM-internal + - name: dataVM-xe0 + position: '2' + type: EXTERNAL + virtual-interface: + type: VIRTIO + external-connection-point-ref: vnf-data + internal-connection-point: + - id: dataVM-internal + name: dataVM-internal + short-name: dataVM-internal + type: VPORT + diff --git a/src/emuvim/examples/vnfs/hackfest_2_vnfd/icons/osm.png b/src/emuvim/examples/vnfs/hackfest_2_vnfd/icons/osm.png new file mode 100644 index 0000000..62012d2 Binary files /dev/null and b/src/emuvim/examples/vnfs/hackfest_2_vnfd/icons/osm.png differ