From: Tomás Villaseca Date: Sat, 16 May 2020 20:45:38 +0000 (-0400) Subject: Add new example descriptors and update previous ones X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=720dbb3c67291051a56bf56057ce4df5ba58cde6;p=osm%2FIM.git Add new example descriptors and update previous ones Change-Id: Ibba2514d805b7023599b7fa000b1111eb252ce2e Signed-off-by: Tomás Villaseca --- diff --git a/augments/examples/alternative_image_new.yaml b/augments/examples/alternative_image_new.yaml new file mode 100644 index 0000000..e3b6b01 --- /dev/null +++ b/augments/examples/alternative_image_new.yaml @@ -0,0 +1,76 @@ +# Copyright 2020 Whitestack LLC +# +# 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: + - id: hackfest_basic-vnf + product-name: hackfest_basic-vnf + description: A basic VNF descriptor w/ one VDU + version: "1.0" + mgmt-cp: vnf-cp0 + + virtual-compute-desc: + - id: cirros-compute + virtual-cpu: + num-virtual-cpu: 1 + virtual-memory: + size: 1 # Memory size in GB + + virtual-storage-desc: + - id: cirros-storage + size-of-storage: 10 + + sw-image-desc: + - id: ubuntu1604 + name: ubuntu1604 + checksum: + hash: # Mandatory? + - id: ubuntu1604-aws + name: ubuntu1604-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + checksum: + hash: # Mandatory? + + vdu: + - id: hackfest_basic-VM + name: hackfest_basic-VM + virtual-compute-desc: cirros-compute + virtual-storage-desc: cirros-storage + sw-image-desc: ubuntu1604 + alternative-images: ubuntu1604-aws + int-cpd: + - id: eth0-int + virtual-network-interface-requirement: + - name: vdu-eth0 + type: EXTERNAL # Remove (redundant) + virtual-interface: + type: PARAVIRT + + df: + - id: cirros_default + vdu-profile: + - id: hackfest_basic-VM + min-number-of-instance: 1 + instantiation-level: + - id: default + vdu-level: + - id: hackfest_basic-VM + number-of-instances: 1 + + exp-cpd: + - id: vnf-cp0 + int-cpd: # Connection to int-cpd + vdu-id: hackfest_basic-VM + cpd: eth0-int diff --git a/augments/examples/alternative_image_old.yaml b/augments/examples/alternative_image_old.yaml new file mode 100644 index 0000000..db06e75 --- /dev/null +++ b/augments/examples/alternative_image_old.yaml @@ -0,0 +1,46 @@ +# Copyright 2020 Whitestack LLC +# +# 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:vnfd-catalog: + vnfd: + - id: hackfest_basic-vnf + name: hackfest_basic-vnf + short-name: hackfest_basic-vnf + version: "1.0" + description: A basic VNF descriptor w/ one VDU + logo: osm.png + connection-point: + - name: vnf-cp0 + + vdu: + - id: hackfest_basic-VM + name: hackfest_basic-VM + image: ubuntu1604 + alternative-images: + - vim-type: aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + count: "1" + vm-flavor: + vcpu-count: "1" + memory-mb: "1024" + storage-gb: "10" + interface: + - name: vdu-eth0 + type: EXTERNAL + virtual-interface: + type: PARAVIRT + external-connection-point-ref: vnf-cp0 + mgmt-interface: + cp: vnf-cp0 diff --git a/augments/examples/cirros_nsd_new.yaml b/augments/examples/cirros_nsd_new.yaml new file mode 100644 index 0000000..5c75b5e --- /dev/null +++ b/augments/examples/cirros_nsd_new.yaml @@ -0,0 +1,43 @@ +# Copyright 2020 Whitestack LLC +# +# 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:nsd: + - id: cirros_2vnf_nsd + name: cirros_2vnf_nsd + description: Generated by OSM package generator + designer: OSM + version: "1.0" + vnfd-id: + - cirros_vnfd + + virtual-link-desc: + - id: cirros_2vnf_nsd_vld1 + mgmt-network: "true" + + df: + - id: cirros_DF + vnf-profile: + - id: cirros_vnf1 # member-vnf-index-ref: 1 + vnfd-id: cirros_vnfd + virtual-link-connectivity: + - virtual-link-profile-id: cirros_2vnf_nsd_vld1 + constituent-cpd-id: + - constituent-base-element-id: cirros_vnf1 + constituent-cpd-id: eth0-ext + - constituent-base-element-id: cirros_vnf2 + constituent-cpd-id: eth0-ext + - id: cirros_vnf2 # member-vnf-index-ref: 2 + vnfd-id: cirros_vnfd + diff --git a/augments/examples/cirros_nsd_old.yaml b/augments/examples/cirros_nsd_old.yaml new file mode 100644 index 0000000..dcc832b --- /dev/null +++ b/augments/examples/cirros_nsd_old.yaml @@ -0,0 +1,59 @@ +# Copyright 2020 Whitestack LLC +# +# 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:nsd-catalog: + nsd: + - id: cirros_2vnf_nsd + name: cirros_2vnf_ns + short-name: cirros_2vnf_ns + description: Generated by OSM pacakage generator + vendor: OSM + version: "1.0" + + # Place the logo as png in icons directory and provide the name here + logo: osm_2x.png + + # Specify the VNFDs that are part of this NSD + constituent-vnfd: + # The member-vnf-index needs to be unique, starting from 1 + # vnfd-id-ref is the id of the VNFD + # Multiple constituent VNFDs can be specified + - member-vnf-index: 1 + vnfd-id-ref: cirros_vnfd + - member-vnf-index: 2 + vnfd-id-ref: cirros_vnfd + + vld: + # Networks for the VNFs + - id: cirros_2vnf_nsd_vld1 + name: cirros_2vnf_nsd_vld1 + short-name: cirros_2vnf_nsd_vld1 + type: ELAN + mgmt-network: "true" + # vim-network-name: + # provider-network: + # overlay-type: VLAN + # segmentation_id: + vnfd-connection-point-ref: + # Specify the constituent VNFs + # member-vnf-index-ref - entry from constituent vnf + # vnfd-id-ref - VNFD id + # vnfd-connection-point-ref - connection point name in the VNFD + - member-vnf-index-ref: 1 + vnfd-id-ref: cirros_vnfd + vnfd-connection-point-ref: eth0 + - member-vnf-index-ref: 2 + vnfd-id-ref: cirros_vnfd + vnfd-connection-point-ref: eth0 diff --git a/augments/examples/cirros_vnfd_new.yaml b/augments/examples/cirros_vnfd_new.yaml new file mode 100644 index 0000000..21a6149 --- /dev/null +++ b/augments/examples/cirros_vnfd_new.yaml @@ -0,0 +1,72 @@ +# Copyright 2020 Whitestack LLC +# +# 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: + - id: cirros_vnfd + product-name: cirros_vnf + description: Simple VNF example with a cirros + provider: OSM + version: "1.0" + mgmt-cp: eth0-int + + virtual-compute-desc: + - id: cirros-compute + virtual-cpu: + num-virtual-cpu: 1 + virtual-memory: + size: 0.256 # Memory size in GB + + virtual-storage-desc: + - id: cirros-storage + size-of-storage: 2 + + sw-image-desc: + - id: cirros034 + name: cirros034 + checksum: + hash: # Mandatory? + + vdu: + - id: cirros_vnfd-VM + name: cirros_vnfd-VM + description: cirros_vnfd-VM + virtual-compute-desc: cirros-compute + virtual-storage-desc: cirros-storage + sw-image-desc: cirros034 + int-cpd: + - id: eth0-int + virtual-network-interface-requirement: + - name: eth0 + virtual-interface: + type: VIRTIO + bandwidth: "0" + vpci: 0000:00:0a.0 + + df: + - id: cirros_default + vdu-profile: + - id: cirros_vnfd-VM + min-number-of-instance: 1 + instantiation-level: + - id: default + vdu-level: + - id: cirros_vnfd-VM + number-of-instances: 1 + + exp-cpd: + - id: eth0-ext + int-cpd: # Connection to int-cpd + vdu-id: cirros_vnfd-VM + cpd: eth0-int diff --git a/augments/examples/cirros_vnfd_old.yaml b/augments/examples/cirros_vnfd_old.yaml new file mode 100644 index 0000000..fbfd5ee --- /dev/null +++ b/augments/examples/cirros_vnfd_old.yaml @@ -0,0 +1,63 @@ +# Copyright 2020 Whitestack LLC +# +# 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:vnfd-catalog: + vnfd: + - id: cirros_vnfd + name: cirros_vnf + short-name: cirros_vnf + description: Simple VNF example with a cirros + vendor: OSM + version: "1.0" + + # Place the logo as png in icons directory and provide the name here + logo: cirros-64.png + + # Management interface + mgmt-interface: + cp: eth0 + + # Atleast one VDU need to be specified + vdu: + - id: cirros_vnfd-VM + name: cirros_vnfd-VM + description: cirros_vnfd-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: 256 + storage-gb: 2 + + # Image/checksum or image including the full path + image: cirros034 + #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 + + connection-point: + - name: eth0 + type: VPORT diff --git a/augments/examples/epa_advanced_new.yaml b/augments/examples/epa_advanced_new.yaml new file mode 100644 index 0000000..e96575c --- /dev/null +++ b/augments/examples/epa_advanced_new.yaml @@ -0,0 +1,42 @@ +# Copyright 2020 Whitestack LLC +# +# 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: + - id: epa-advanced-vnfd + ... + + virtual-compute-desc: + - id: epa-compute + virtual-cpu: + ... + pinning: # Generic key/value pairs + policy: static + thread-policy: PREFER + virtual-memory: + ... + mempage-size: LARGE + numa-enabled: true # Replaces NUMA aware/unaware choice + numa-node-policy: + mem-policy: STRICT + node: + - id: "1" + paired-threads: + num-paired-threads: "17" + node-cnt: "1" + + vdu: + - id: epa-vdu + virtual-compute-desc: epa-compute + ... diff --git a/augments/examples/epa_advanced_old.yaml b/augments/examples/epa_advanced_old.yaml new file mode 100644 index 0000000..5faa686 --- /dev/null +++ b/augments/examples/epa_advanced_old.yaml @@ -0,0 +1,161 @@ +# Copyright 2020 Whitestack LLC +# +# 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: + - connection-point: + - name: eth0 + type: VPORT + - name: xe0 + type: VPORT + - name: xe1 + type: VPORT + - name: xe2 + type: VPORT + - name: xe3 + type: VPORT + - name: xe4 + type: VPORT + - name: xe5 + type: VPORT + - name: xe6 + type: VPORT + - name: xe7 + type: VPORT + description: vBNG VNF for performance tests, with 34 HTs + id: vbng34 + logo: intel.png + mgmt-interface: + cp: eth0 + name: vbng34 + service-function-chain: UNAWARE + short-name: vbng34 + vdu: + - count: "1" + description: vbng34-VM + +# Elemento de interés + + guest-epa: + cpu-pinning-policy: DEDICATED + cpu-thread-pinning-policy: PREFER + mempage-size: LARGE + numa-node-policy: + mem-policy: STRICT + node: + - id: "0" + paired-threads: + num-paired-threads: "17" + node-cnt: "1" + +##################### + + + host-epa: + om-cpu-feature: + - feature: 64b + - feature: iommu + - feature: lps + - feature: tlbps + - feature: hwsv + - feature: dioc + - feature: ht + om-cpu-model-string: Intel(R) Xeon(R) CPU E5-4620 0 @ 2.20GHz + hypervisor-epa: + type: REQUIRE_KVM + version: 10002|12001|2.6.32-358.el6.x86_64 + id: vbng34-VM + image: intel_vbng34 + interface: + - external-connection-point-ref: eth0 + name: eth0 + position: "1" + type: EXTERNAL + virtual-interface: + bandwidth: "1000000" + type: PARAVIRT + vpci: 0000:00:0a.0 + - external-connection-point-ref: xe0 + name: xe0 + position: "2" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:10.0" + - external-connection-point-ref: xe1 + name: xe1 + position: "3" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:11.0" + - external-connection-point-ref: xe2 + name: xe2 + position: "4" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:12.0" + - external-connection-point-ref: xe3 + name: xe3 + position: "5" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:13.0" + - external-connection-point-ref: xe4 + name: xe4 + position: "6" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:14.0" + - external-connection-point-ref: xe5 + name: xe5 + position: "7" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:15.0" + - external-connection-point-ref: xe6 + name: xe6 + position: "8" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:16.0" + - external-connection-point-ref: xe7 + name: xe7 + position: "9" + type: EXTERNAL + virtual-interface: + bandwidth: "10000000000" + type: PCI-PASSTHROUGH + vpci: "0000:00:17.0" + name: vbng34-VM + supplemental-boot-data: + boot-data-drive: "false" + vm-flavor: + memory-mb: "32768" + storage-gb: "15" + vendor: Intel + version: "1.0" diff --git a/augments/examples/epa_new.yaml b/augments/examples/epa_new.yaml index fe3b9f3..9449395 100644 --- a/augments/examples/epa_new.yaml +++ b/augments/examples/epa_new.yaml @@ -21,13 +21,12 @@ vnfd: - id: epa-compute virtual-cpu: ... - vdu-cpu-requirements: # Generic key/value pairs - cpu-pinning-policy: DEDICATED - cpu-thread-pinning-policy: PREFER + pinning: # Generic key/value pairs + policy: static + thread-policy: PREFER virtual-memory: ... - vdu-mem-requirements: # Generic key/value pairs - mempage-size: LARGE + mempage-size: LARGE numa-enabled: true # Replaces NUMA aware/unaware choice numa-node-policy: mem-policy: STRICT diff --git a/augments/examples/magma_knf_new.yaml b/augments/examples/magma_knf_new.yaml new file mode 100644 index 0000000..f4ed191 --- /dev/null +++ b/augments/examples/magma_knf_new.yaml @@ -0,0 +1,43 @@ +# Copyright 2020 Whitestack LLC +# +# 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: + - id: fb_magma_knf + product-name: fb_magma_knf + description: KNF with KDU using a helm-chart for Facebook magma orc8r + provider: ATOS + version: "1.0" + mgmt-cp: mgmt + + ext-cpd: + - id: mgmt-ext + k8s-cluster-net: mgmtnet + + k8s-cluster: + nets: + - id: mgmtnet + + kdu: + - name: orc8r + + kdu-model: + - id: orc8r-model + kdu-model-type: helm-chart + kdu-model-locator: magma/orc8r + + df: + kdu-profile: + name: orc8r + kdu-model-id: orc8r-model \ No newline at end of file diff --git a/augments/examples/magma_knf_old.yaml b/augments/examples/magma_knf_old.yaml new file mode 100644 index 0000000..feefeba --- /dev/null +++ b/augments/examples/magma_knf_old.yaml @@ -0,0 +1,35 @@ +# Copyright 2020 Whitestack LLC +# +# 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: + schema-version: "3.0" + vnfd: + - id: fb_magma_knf + name: fb_magma_knf + short-name: fb_magma_knf + description: KNF with KDU using a helm-chart for Facebook magma orc8r + vendor: ATOS + version: "1.0" + mgmt-interface: + cp: mgmt + connection-point: + - name: mgmt + k8s-cluster: + nets: + - id: mgmtnet + external-connection-point-ref: mgmt + kdu: + - name: orc8r + helm-chart: magma/orc8r diff --git a/augments/examples/vepc_new.yaml b/augments/examples/vepc_new.yaml index c38b9f5..4d1c863 100644 --- a/augments/examples/vepc_new.yaml +++ b/augments/examples/vepc_new.yaml @@ -61,36 +61,24 @@ vnfd: - id: spgwmme-mgmt-int virtual-network-interface-requirement: - name: eth0 - type: EXTERNAL # Remove (redundant) virtual-interface: type: PARAVIRT - network-interface-requirements: - # ? - id: spgwmme-s1-int virtual-network-interface-requirement: - name: eth1 - type: EXTERNAL # Remove (redundant) virtual-interface: type: PARAVIRT - network-interface-requirements: - # ? - id: spgwmme-sgi-int virtual-network-interface-requirement: - name: eth2 - type: EXTERNAL # Remove (redundant) virtual-interface: type: PARAVIRT - network-interface-requirements: - # ? - id: spgwmme-s6a-int int-virtual-link-desc: s6a # Connection to VLD! virtual-network-interface-requirement: - id: eth3 - type: INTERNAL # Remove (redundant) virtual-interface: type: PARAVIRT - network-interface-requirements: - # ? - id: hss name: hss @@ -103,52 +91,24 @@ vnfd: - id: hss-mgmt-int virtual-network-interface-requirement: - name: eth0 - type: EXTERNAL virtual-interface: type: PARAVIRT - network-interface-requirements: - # ? - id: hss-s6a-int int-virtual-link-desc: s6a # Connection to VLD! virtual-network-interface-requirement: - id: eth1 - type: INTERNAL virtual-interface: type: PARAVIRT - network-interface-requirements: - #? - vdu-configuration: - initial-config-primitive: - - seq: "1" - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: - - seq: "2" - name: configure-hss - parameter: - - name: spgw-ip - data-type: STRING - value: - - name: hss-ip - data-type: STRING - value: - - seq: "3" - name: restart-hss - juju: - charm: hsscharm df: - id: vepc_default + vnf-configuration-id: vnf-configuration-example vdu-profile: - id: spgwmme min-number-of-instance: 1 - id: hss min-number-of-instance: 1 + vdu-configuration-id: vdu-configuration-example instantiation-level: - id: default vdu-level: @@ -184,39 +144,66 @@ vnfd: vdu-ref: "spgwmme" # Not included in augments vdu-monitoring-param-ref: "spgw_memory_util" # Not included in augments + vdu-configuration: + - id: vdu-configuration-example + initial-config-primitive: + - seq: "1" + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: + - seq: "2" + name: configure-hss + parameter: + - name: spgw-ip + data-type: STRING + value: + - name: hss-ip + data-type: STRING + value: + - seq: "3" + name: restart-hss + juju: + charm: hsscharm + vnf-configuration: - initial-config-primitive: - - seq: "1" - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: - - seq: "2" - name: configure-spgw - parameter: - - name: spgw-ip - data-type: STRING - value: - - name: hss-ip - data-type: STRING - value: - - seq: "3" - name: restart-spgw - config-primitive: - - name: add-route - parameter: - - name: external-prefix - data-type: STRING - default-value: "8.8.8.8/32" - - name: next-hop - data-type: STRING - default-value: "192.168.2.1" - juju: - charm: spgwcharm + - id: vnf-configuration-example + initial-config-primitive: + - seq: "1" + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: + - seq: "2" + name: configure-spgw + parameter: + - name: spgw-ip + data-type: STRING + value: + - name: hss-ip + data-type: STRING + value: + - seq: "3" + name: restart-spgw + config-primitive: + - name: add-route + parameter: + - name: external-prefix + data-type: STRING + default-value: "8.8.8.8/32" + - name: next-hop + data-type: STRING + default-value: "192.168.2.1" + juju: + charm: spgwcharm int-virtual-link-desc: - id: s6a diff --git a/augments/examples/vepc_nsd_new.yaml b/augments/examples/vepc_nsd_new.yaml index 414c3e7..8ea1fe1 100644 --- a/augments/examples/vepc_nsd_new.yaml +++ b/augments/examples/vepc_nsd_new.yaml @@ -25,7 +25,6 @@ nsd: virtual-link-desc: - id: management mgmt-network: "true" # Needed? - vim-network-name: osm-ext # Instantiation? - id: s1 vim-network-name: s1 - id: sgi @@ -47,9 +46,7 @@ nsd: constituent-cpd-id: - constituent-base-element-id: vEPC_vnfd constituent-cpd-id: spgwmme-s1 - ip-address: 192.168.0.11 # Augmenting. Instantiation? - virtual-link-profile-id: sgi constituent-cpd-id: - constituent-base-element-id: vEPC_vnfd constituent-cpd-id: spgwmme-sgi - ip-address: 192.168.2.11 # Augmenting. Instantiation? \ No newline at end of file diff --git a/augments/examples/vnfd_new.yaml b/augments/examples/vnfd_new.yaml index 3673bed..f4e82a9 100644 --- a/augments/examples/vnfd_new.yaml +++ b/augments/examples/vnfd_new.yaml @@ -17,64 +17,50 @@ vnfd: id: vnfd - - mgmt-interface: - cp: vnf-mgmt + mgmt-cp: vnf-mgmt ext-cpd: - - id: vnf-mgmt # Name and id are redundant. Merged into id. - short-name: vnf-mgmt - type: VPORT - - id: vnf-data - short-name: vnf-data - type: VPORT + - id: vnf-mgmt-ext + int-cpd: + vdu-id: mgmtVM + cpd: vnf-mgmt-int + - id: vnf-data-ext + int-cpd: + vdu-id: dataVM + cpd: vnf-data-int int-virtual-link-desc: - - id: internal # Name and id are redundant. Merged into id. - short-name: internal - type: ELAN # Is this used? If it is I'll include it in an augment. + - id: internal vdu: - id: mgmtVM - - 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 - int-cpd: + - id: vnf-mgmt-int + virtual-network-interface-requirement: + - name: mgmtVM-eth0 + position: "1" + virtual-interface: + type: VIRTIO - id: mgmtVM-internal - short-name: mgmtVM-internal - type: VPORT - int-virtual-link-desc: internal # In SOL006 the reference is from CPD to VLD + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: mgmtVM-eth1 + position: "2" + virtual-interface: + type: VIRTIO - id: dataVM - - 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 - int-cpd: - - id: dataVM-eth0 - short-name: dataVM-internal - type: VPORT - int-virtual-link-desc: internal # In SOL006 the reference is from CPD to VLD + - id: dataVM-internal + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: dataVM-eth0 + position: "1" + virtual-interface: + type: VIRTIO + - id: vnf-data-int + virtual-network-interface-requirement: + - name: dataVM-xe0 + position: "2" + virtual-interface: + type: VIRTIO