From 658dd58087d4458f102edad356bedbdb89676bb2 Mon Sep 17 00:00:00 2001 From: melian Date: Mon, 25 May 2020 17:04:53 +0000 Subject: [PATCH 1/2] Packages for slicing test Signed-off-by: melian --- .../slice_basic_middle_nsd.yaml | 63 +++++++++++++++ .../slice_basic_middle_vnfd.yaml | 76 +++++++++++++++++++ slice_basic_ns/README.md | 3 + slice_basic_ns/checksum.txt | 2 + slice_basic_ns/slice_basic_nsd.yaml | 52 +++++++++++++ slice_basic_nst.yaml | 65 ++++++++++++++++ slice_basic_nst2.yaml | 51 +++++++++++++ slice_basic_vnf/README.md | 3 + slice_basic_vnf/checksum.txt | 3 + slice_basic_vnf/cloud_init/cloud-config.txt | 2 + slice_basic_vnf/slice_basic_vnfd.yaml | 67 ++++++++++++++++ 11 files changed, 387 insertions(+) create mode 100755 slice_basic_middle_nsd/slice_basic_middle_nsd.yaml create mode 100755 slice_basic_middle_vnfd/slice_basic_middle_vnfd.yaml create mode 100644 slice_basic_ns/README.md create mode 100644 slice_basic_ns/checksum.txt create mode 100644 slice_basic_ns/slice_basic_nsd.yaml create mode 100644 slice_basic_nst.yaml create mode 100644 slice_basic_nst2.yaml create mode 100644 slice_basic_vnf/README.md create mode 100644 slice_basic_vnf/checksum.txt create mode 100644 slice_basic_vnf/cloud_init/cloud-config.txt create mode 100644 slice_basic_vnf/slice_basic_vnfd.yaml diff --git a/slice_basic_middle_nsd/slice_basic_middle_nsd.yaml b/slice_basic_middle_nsd/slice_basic_middle_nsd.yaml new file mode 100755 index 00000000..6e4480c0 --- /dev/null +++ b/slice_basic_middle_nsd/slice_basic_middle_nsd.yaml @@ -0,0 +1,63 @@ +# 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. + +nsd-catalog: + nsd: + - id: slice_basic_middle_nsd + name: slice_basic_middle_nsd + short-name: slice_basic_middle_ns + description: NSD to be used on Slice Testing + vendor: OSM + version: '1.0' + logo: osm_2x.png + + constituent-vnfd: + - member-vnf-index: 1 + vnfd-id-ref: slice_basic_middle_vnfd + + connection-point: + - name: nsd_cp_mgmt + vld-id-ref: nsd_vnfd_vld_mgmt + - name: nsd_cp_data1 + vld-id-ref: nsd_vnfd_vld_data1 + - name: nsd_cp_data2 + vld-id-ref: nsd_vnfd_vld_data2 + + vld: + - id: nsd_vnfd_vld_mgmt + name: nsd_vnfd_vld_mgmt + short-name: nsd_vnfd_vld_mgmt + type: ELAN + mgmt-network: 'true' + vnfd-connection-point-ref: + - member-vnf-index-ref: 1 + vnfd-id-ref: slice_basic_middle_vnfd + vnfd-connection-point-ref: eth0 + - id: nsd_vnfd_vld_data1 + name: nsd_vnfd_vld_data1 + short-name: nsd_vnfd_vld_data1 + type: ELAN + mgmt-network: 'false' + vnfd-connection-point-ref: + - member-vnf-index-ref: 1 + vnfd-id-ref: slice_basic_middle_vnfd + vnfd-connection-point-ref: eth1 + - id: nsd_vnfd_vld_data2 + name: nsd_vnfd_vld_data2 + short-name: nsd_vnfd_vld_data2 + type: ELAN + mgmt-network: 'false' + vnfd-connection-point-ref: + - member-vnf-index-ref: 1 + vnfd-id-ref: slice_basic_middle_vnfd + vnfd-connection-point-ref: eth2 diff --git a/slice_basic_middle_vnfd/slice_basic_middle_vnfd.yaml b/slice_basic_middle_vnfd/slice_basic_middle_vnfd.yaml new file mode 100755 index 00000000..0c0dddc2 --- /dev/null +++ b/slice_basic_middle_vnfd/slice_basic_middle_vnfd.yaml @@ -0,0 +1,76 @@ +# 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. + +vnfd-catalog: + vnfd: + - id: slice_basic_middle_vnfd + name: slice_basic_middle_vnfd + short-name: slice_basic_middle_vnfd + description: VNFD with 3 CPs to be used on Slice Testing + vendor: OSM + version: '1.0' + + # Management interface + mgmt-interface: + cp: eth0 + + # Atleast one VDU need to be specified + vdu: + - id: ubuntu_slice-VM + name: ubuntu_slice-VM + description: ubuntu_slice-VM + count: 1 + + # Flavour of the VM to be instantiated for the VDU + # flavor below can fit into m1.micro + vm-flavor: + vcpu-count: 1 + memory-mb: 1024 + storage-gb: 10 + + # Image/checksum or image including the full path + image: 'US1604' + #checksum: + + interface: + # Specify the external interfaces + # There can be multiple interfaces defined + - name: eth0 + type: EXTERNAL + virtual-interface: + type: VIRTIO + bandwidth: '0' + vpci: 0000:00:0a.0 + external-connection-point-ref: eth0 + - name: eth1 + type: EXTERNAL + virtual-interface: + type: VIRTIO + bandwidth: '0' + vpci: 0000:00:0a.0 + external-connection-point-ref: eth1 + - name: eth2 + type: EXTERNAL + virtual-interface: + type: VIRTIO + bandwidth: '0' + vpci: 0000:00:0a.0 + external-connection-point-ref: eth2 + + connection-point: + - name: eth0 + type: VPORT + - name: eth1 + type: VPORT + - name: eth2 + type: VPORT diff --git a/slice_basic_ns/README.md b/slice_basic_ns/README.md new file mode 100644 index 00000000..4f499fb4 --- /dev/null +++ b/slice_basic_ns/README.md @@ -0,0 +1,3 @@ +# Descriptor created by OSM descriptor package generated + +**Created on 11/16/2019, 21:57:41 ** \ No newline at end of file diff --git a/slice_basic_ns/checksum.txt b/slice_basic_ns/checksum.txt new file mode 100644 index 00000000..9a624070 --- /dev/null +++ b/slice_basic_ns/checksum.txt @@ -0,0 +1,2 @@ +795fae75abfafb4c8d26d76b535c0b97 slice_hackfest_ns/slice_hackfest_nsd.yaml +5c407322d4361b1594e897cffc9c6977 slice_hackfest_ns/README.md diff --git a/slice_basic_ns/slice_basic_nsd.yaml b/slice_basic_ns/slice_basic_nsd.yaml new file mode 100644 index 00000000..9918bb7c --- /dev/null +++ b/slice_basic_ns/slice_basic_nsd.yaml @@ -0,0 +1,52 @@ +# 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. + +nsd-catalog: + nsd: + - id: slice_basic_nsd + name: slice_basic_nsd + short-name: slice_basic_ns + description: NSD to be used on Slice Testing + vendor: OSM + version: '1.0' + logo: osm_2x.png + + constituent-vnfd: + - member-vnf-index: "1" + vnfd-id-ref: slice_basic_vnfd + + connection-point: + - name: nsd_cp_mgmt + vld-id-ref: nsd_vnfd_vld_mgmt + - name: nsd_cp_data + vld-id-ref: nsd_vnfd_vld_data + + vld: + - id: nsd_vnfd_vld_mgmt + name: nsd_vnfd_vld_mgmt + short-name: nsd_vnfd_vld_mgmt + type: ELAN + mgmt-network: true + vnfd-connection-point-ref: + - member-vnf-index-ref: "1" + vnfd-id-ref: slice_basic_vnfd + vnfd-connection-point-ref: eth0 + - id: nsd_vnfd_vld_data + name: nsd_vnfd_vld_data + short-name: nsd_vnfd_vld_data + type: ELAN + mgmt-network: false + vnfd-connection-point-ref: + - member-vnf-index-ref: "1" + vnfd-id-ref: slice_basic_vnfd + vnfd-connection-point-ref: eth1 diff --git a/slice_basic_nst.yaml b/slice_basic_nst.yaml new file mode 100644 index 00000000..44a61e72 --- /dev/null +++ b/slice_basic_nst.yaml @@ -0,0 +1,65 @@ +# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] +# +# 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. + +#NST to test VLD connection between Network Services within the same VIM +nst: +- id: slice_basic_nst + name: slice_basic_nst + SNSSAI-identifier: + slice-service-type: eMBB + quality-of-service: + id: 1 + + netslice-subnet: + - id: slice_basic_nsd_1 + is-shared-nss: false + description: NetSlice Subnet (service) composed by 1 vnf with 2 cp + nsd-ref: slice_basic_nsd + - id: slice_basic_nsd_2 + is-shared-nss: true + description: NetSlice Subnet (service) composed by 1 vnf with 3 cp + nsd-ref: slice_basic_middle_nsd + - id: slice_basic_nsd_3 + is-shared-nss: false + description: NetSlice Subnet (service) composed by 1 vnf with 2 cp + nsd-ref: slice_basic_nsd + + netslice-vld: + - id: slice_vld_mgmt + name: slice_vld_mgmt + type: ELAN + mgmt-network: true + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_1 + nsd-connection-point-ref: nsd_cp_mgmt + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_mgmt + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_mgmt + - id: slice_vld_data1 + name: slice_vld_data1 + type: ELAN + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_1 + nsd-connection-point-ref: nsd_cp_data + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_data1 + - id: slice_vld_data2 + name: slice_vld_data2 + type: ELAN + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_data2 + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_data diff --git a/slice_basic_nst2.yaml b/slice_basic_nst2.yaml new file mode 100644 index 00000000..1eb881eb --- /dev/null +++ b/slice_basic_nst2.yaml @@ -0,0 +1,51 @@ +# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] +# +# 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. + +#NST to test VLD connection between Network Services within the same VIM +nst: +- id: slice_basic_nst2 + name: slice_basic_nst2 + SNSSAI-identifier: + slice-service-type: eMBB + quality-of-service: + id: 1 + + netslice-subnet: + - id: slice_basic_nsd_2 + is-shared-nss: true + description: NetSlice Subnet (service) composed by 1 vnf with 3 cp + nsd-ref: slice_basic_middle_nsd + - id: slice_basic_nsd_3 + is-shared-nss: false + description: NetSlice Subnet (service) composed by 1 vnf with 2 cp + nsd-ref: slice_basic_nsd + + netslice-vld: + - id: slice_vld_mgmt + name: slice_vld_mgmt + type: ELAN + mgmt-network: true + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_mgmt + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_mgmt + - id: slice_vld_data2 + name: slice_vld_data2 + type: ELAN + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_data2 + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_data diff --git a/slice_basic_vnf/README.md b/slice_basic_vnf/README.md new file mode 100644 index 00000000..c838736f --- /dev/null +++ b/slice_basic_vnf/README.md @@ -0,0 +1,3 @@ +# Descriptor created by OSM descriptor package generated + +**Created on 11/16/2019, 21:57:47 ** \ No newline at end of file diff --git a/slice_basic_vnf/checksum.txt b/slice_basic_vnf/checksum.txt new file mode 100644 index 00000000..90b1d514 --- /dev/null +++ b/slice_basic_vnf/checksum.txt @@ -0,0 +1,3 @@ +6e520d5ea4d901d93b3d867b359a3f01 slice_hackfest_vnf/README.md +d61c2ce4cb9e19e774d08a1b60596247 slice_hackfest_vnf/slice_hackfest_vnfd.yaml +3a4799d01502c86f56b0412dc33cf647 slice_hackfest_vnf/cloud_init/cloud-config.txt diff --git a/slice_basic_vnf/cloud_init/cloud-config.txt b/slice_basic_vnf/cloud_init/cloud-config.txt new file mode 100644 index 00000000..61f1422c --- /dev/null +++ b/slice_basic_vnf/cloud_init/cloud-config.txt @@ -0,0 +1,2 @@ +--- +#cloud-config \ No newline at end of file diff --git a/slice_basic_vnf/slice_basic_vnfd.yaml b/slice_basic_vnf/slice_basic_vnfd.yaml new file mode 100644 index 00000000..a55bf748 --- /dev/null +++ b/slice_basic_vnf/slice_basic_vnfd.yaml @@ -0,0 +1,67 @@ +# 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. + +vnfd-catalog: + vnfd: + - id: slice_basic_vnfd + name: slice_basic_vnfd + short-name: slice_basic_vnfd + description: VNFD with 2 CPs to be used on Slice Testing + vendor: OSM + version: '1.0' + + # Management interface + mgmt-interface: + cp: eth0 + + # Atleast one VDU need to be specified + vdu: + - id: ubuntu_slice-VM + name: ubuntu_slice-VM + description: ubuntu_slice-VM + count: 1 + + # Flavour of the VM to be instantiated for the VDU + # flavor below can fit into m1.micro + vm-flavor: + vcpu-count: 1 + memory-mb: 1024 + storage-gb: 10 + + # Image/checksum or image including the full path + image: 'US1604' + #checksum: + + interface: + # Specify the external interfaces + # There can be multiple interfaces defined + - name: eth0 + type: EXTERNAL + virtual-interface: + type: VIRTIO + bandwidth: 0 + vpci: 0000:00:0a.0 + external-connection-point-ref: eth0 + - name: eth1 + type: EXTERNAL + virtual-interface: + type: VIRTIO + bandwidth: 0 + vpci: 0000:00:0a.0 + external-connection-point-ref: eth1 + + connection-point: + - name: eth0 + type: VPORT + - name: eth1 + type: VPORT -- GitLab From f5b182ddc4c974827bbc33937d12671af0ea287d Mon Sep 17 00:00:00 2001 From: melian Date: Mon, 25 May 2020 17:11:14 +0000 Subject: [PATCH 2/2] Change slice templates location Signed-off-by: melian --- slice_basic_nst2.yaml => slice_basic_nst/slice_basic_2nd_nst.yaml | 0 slice_basic_nst.yaml => slice_basic_nst/slice_basic_nst.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename slice_basic_nst2.yaml => slice_basic_nst/slice_basic_2nd_nst.yaml (100%) rename slice_basic_nst.yaml => slice_basic_nst/slice_basic_nst.yaml (100%) diff --git a/slice_basic_nst2.yaml b/slice_basic_nst/slice_basic_2nd_nst.yaml similarity index 100% rename from slice_basic_nst2.yaml rename to slice_basic_nst/slice_basic_2nd_nst.yaml diff --git a/slice_basic_nst.yaml b/slice_basic_nst/slice_basic_nst.yaml similarity index 100% rename from slice_basic_nst.yaml rename to slice_basic_nst/slice_basic_nst.yaml -- GitLab