From a436f76013382a1667745dabee47cbaadf993c38 Mon Sep 17 00:00:00 2001 From: chamarty Date: Fri, 3 Mar 2017 19:11:28 +0000 Subject: [PATCH] OSM Reference descriptors Signed-off-by: chamarty --- Makefile | 4 +- src/nsd/ref1_ns/ref1_nsd.yaml | 39 ++++++++++++++++ src/nsd/ref2_ns/ref2_nsd.yaml | 40 ++++++++++++++++ src/vnfd/ref11_vnf/ref11_vnfd.yaml | 66 +++++++++++++++++++++++++++ src/vnfd/ref12_vnf/ref12_vnfd.yaml | 73 ++++++++++++++++++++++++++++++ src/vnfd/ref21_vnf/ref21_vnfd.yaml | 30 ++++++++++++ src/vnfd/ref22_vnf/ref22_vnfd.yaml | 39 ++++++++++++++++ 7 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 src/nsd/ref1_ns/ref1_nsd.yaml create mode 100644 src/nsd/ref2_ns/ref2_nsd.yaml create mode 100644 src/vnfd/ref11_vnf/ref11_vnfd.yaml create mode 100644 src/vnfd/ref12_vnf/ref12_vnfd.yaml create mode 100644 src/vnfd/ref21_vnf/ref21_vnfd.yaml create mode 100644 src/vnfd/ref22_vnf/ref22_vnfd.yaml diff --git a/Makefile b/Makefile index cea5e223..73cd1b9c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # BUILD_DIR = build -NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns ubuntu_xenial_ns ping_pong_ns knt_flownac_ns knt_flownac-us_ns sandvine_pts_ns +NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns ubuntu_xenial_ns ping_pong_ns knt_flownac_ns knt_flownac-us_ns sandvine_pts_ns ref1_ns ref2_ns NSD_SRC_DIR := src/nsd NSD_BUILD_DIR := $(BUILD_DIR)/nsd @@ -27,7 +27,7 @@ NSD_BUILD_DIRS := $(addprefix $(NSD_BUILD_DIR)/, $(NSDS)) NSD_PKGS := $(addsuffix .tar.gz, $(NSDS)) NSD_BUILD_PKGS := $(addprefix $(NSD_BUILD_DIR)_pkgs/, $(NSD_PKGS)) -VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf ubuntu_xenial_vnf ping_vnf pong_vnf knt_fnc_vnf knt_fne_vnf knt_fnu_vnf knt_fnd_vnf sandvine_pts_vnf +VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf ubuntu_xenial_vnf ping_vnf pong_vnf knt_fnc_vnf knt_fne_vnf knt_fnu_vnf knt_fnd_vnf sandvine_pts_vnf ref11_vnf ref21_vnf ref12_vnf ref22_vnf VNFD_SRC_DIR := src/vnfd VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd diff --git a/src/nsd/ref1_ns/ref1_nsd.yaml b/src/nsd/ref1_ns/ref1_nsd.yaml new file mode 100644 index 00000000..465537ca --- /dev/null +++ b/src/nsd/ref1_ns/ref1_nsd.yaml @@ -0,0 +1,39 @@ +nsd:nsd-catalog: + nsd: + - constituent-vnfd: + - member-vnf-index: '1' + start-by-default: 'true' + vnfd-id-ref: Ref_Vnf_11 + - member-vnf-index: '2' + vnfd-id-ref: Ref_Vnf_21 + description: Reference NS 1 + id: Ref_NS_1 + name: Ref_NS_1 + vendor: ETSI + vld: + - description: Mgmt VL + id: 54c04 + name: VL1 + short-name: VL1 + type: ELAN + vendor: ETSI + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-id-ref: Ref_Vnf_11 + vnfd-connection-point-ref: mgmt0 + - member-vnf-index-ref: '2' + vnfd-id-ref: Ref_Vnf_21 + vnfd-connection-point-ref: mgmt + - description: Data VL + id: 54c03 + name: VL2 + short-name: VL2 + type: ELAN + vendor: ETSI + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: west + vnfd-id-ref: Ref_Vnf_11 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: data + vnfd-id-ref: Ref_Vnf_21 diff --git a/src/nsd/ref2_ns/ref2_nsd.yaml b/src/nsd/ref2_ns/ref2_nsd.yaml new file mode 100644 index 00000000..281fdee2 --- /dev/null +++ b/src/nsd/ref2_ns/ref2_nsd.yaml @@ -0,0 +1,40 @@ +nsd:nsd-catalog: + nsd: + - constituent-vnfd: + - member-vnf-index: '1' + vnfd-id-ref: Ref_Vnf_12 + - member-vnf-index: '2' + vnfd-id-ref: Ref_Vnf_22 + description: Reference NS2 + id: Ref_NS_2 + name: Ref_NS_2 + vendor: ETSI + vld: + - id: '97465' + name: VL1 + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: mgmt0 + vnfd-id-ref: Ref_Vnf_12 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: mgmt + vnfd-id-ref: Ref_Vnf_22 + - id: f66e6 + name: VL2 + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: east + vnfd-id-ref: Ref_Vnf_12 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: east + vnfd-id-ref: Ref_Vnf_22 + - id: b72e9 + name: VL3 + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: west + vnfd-id-ref: Ref_Vnf_12 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: west + vnfd-id-ref: Ref_Vnf_22 + diff --git a/src/vnfd/ref11_vnf/ref11_vnfd.yaml b/src/vnfd/ref11_vnf/ref11_vnfd.yaml new file mode 100644 index 00000000..00b3394f --- /dev/null +++ b/src/vnfd/ref11_vnf/ref11_vnfd.yaml @@ -0,0 +1,66 @@ +vnfd:vnfd-catalog: + vnfd: + - connection-point: + - name: mgmt0 + type: VPORT + - name: west + type: VPORT + description: A simple VNF descriptor w/ VM1 and VM2 + id: Ref_Vnf_11 + name: Ref_VNF_11 + short-name: Ref_VNF_11 + internal-vld: + - description: Internal VL + id: VL12 + name: VL12 + short-name: VL12 + type: ELAN + vendor: ETSI + internal-connection-point: + - id-ref: 'iface11' + id-ref: 'iface21' + vdu: + - external-interface: + - name: iface10 + virtual-interface: + type: OM-MGMT + vnfd-connection-point-ref: mgmt0 + internal-interface: + - name: iface11 + virtual-interface: + type: VIRTIO + vdu-internal-connection-point-ref: iface11 + internal-connection-point: + - name: iface11 + id: iface11 + type: VPORT + id: Ref_VM1 + image: ref_vm1.qcow2 + name: Ref_VM1 + vm-flavor: + memory-mb: '2048' + storage-gb: '8' + vcpu-count: '2' + - external-interface: + - name: iface22 + virtual-interface: + type: VIRTIO + vnfd-connection-point-ref: west + internal-interface: + - name: iface21 + virtual-interface: + type: VIRTIO + vdu-internal-connection-point-ref: iface21 + internal-connection-point: + - name: iface21 + id: iface21 + type: VPORT + id: Ref_VM2 + image: ref_vm2.qcow2 + name: Ref_VM2 + vm-flavor: + memory-mb: '4096' + storage-gb: '16' + vcpu-count: '2' + vendor: ETSI + version: '1.0' diff --git a/src/vnfd/ref12_vnf/ref12_vnfd.yaml b/src/vnfd/ref12_vnf/ref12_vnfd.yaml new file mode 100644 index 00000000..590d4e47 --- /dev/null +++ b/src/vnfd/ref12_vnf/ref12_vnfd.yaml @@ -0,0 +1,73 @@ +vnfd:vnfd-catalog: + vnfd: + - connection-point: + - name: mgmt0 + type: VPORT + - name: west + type: VPORT + - name: east + type: VPORT + description: A simple VNF descriptor w/ two VDU + id: Ref_Vnf_12 + name: Ref_Vnf_12 + short-name: Ref_Vnf_12 + internal-vld: + - description: Internal VL + id: VL34 + name: VL34 + short-name: VL34 + type: ELAN + vendor: ETSI + internal-connection-point: + - id-ref: 'iface31' + id-ref: 'iface41' + vdu: + - description: Middlepoint + external-interface: + - name: iface30 + virtual-interface: + type: OM-MGMT + vnfd-connection-point-ref: mgmt0 + guest-epa: + cpu-pinning-policy: DEDICATED + mempage-size: "LARGE" + id: a3a2f + image: ref_vm3.qcow2 + internal-connection-point: + - id: iface31 + name: iface31 + type: VPORT + internal-interface: + - name: iface31 + vdu-internal-connection-point-ref: iface31 + virtual-interface: + type: VIRTIO + name: Ref_VM3 + vm-flavor: + memory-mb: '2048' + storage-gb: '8' + vcpu-count: '2' + - external-interface: + - name: iface42 + virtual-interface: + type: PCI-PASSTHROUGH + vnfd-connection-point-ref: west + - name: iface43 + virtual-interface: + type: SR-IOV + vnfd-connection-point-ref: east + guest-epa: + cpu-pinning-policy: DEDICATED + id: e526e + internal-connection-point: + - id: iface41 + name: iface41 + type: VPORT + name: Ref_VM4 + internal-interface: + - name: iface41 + vdu-internal-connection-point-ref: iface41 + virtual-interface: + type: VIRTIO + vendor: ETSI + version: '1.0' diff --git a/src/vnfd/ref21_vnf/ref21_vnfd.yaml b/src/vnfd/ref21_vnf/ref21_vnfd.yaml new file mode 100644 index 00000000..390ab9d3 --- /dev/null +++ b/src/vnfd/ref21_vnf/ref21_vnfd.yaml @@ -0,0 +1,30 @@ +vnfd:vnfd-catalog: + vnfd: + - connection-point: + - name: mgmt + type: VPORT + - name: data + type: VPORT + description: A simple VNF descriptor w/ one VDU + id: Ref_Vnf_21 + name: Ref_Vnf_21 + short-name: Ref_Vnf_21 + vdu: + - external-interface: + - name: iface50 + virtual-interface: + type: OM-MGMT + vnfd-connection-point-ref: mgmt + - name: iface51 + virtual-interface: + type: VIRTIO + vnfd-connection-point-ref: data + id: ref_vm21 + image: ref_vm21.qcow2 + name: Ref_VM_5 + vm-flavor: + memory-mb: '1024' + storage-gb: '16' + vcpu-count: '1' + vendor: ETSI + version: '1.0' diff --git a/src/vnfd/ref22_vnf/ref22_vnfd.yaml b/src/vnfd/ref22_vnf/ref22_vnfd.yaml new file mode 100644 index 00000000..7dddc6f0 --- /dev/null +++ b/src/vnfd/ref22_vnf/ref22_vnfd.yaml @@ -0,0 +1,39 @@ +vnfd:vnfd-catalog: + vnfd: + - connection-point: + - name: mgmt + type: VPORT + - name: west + type: VPORT + - name: east + type: VPORT + description: A simple VNF descriptor w/ one VDU + id: Ref_Vnf_22 + name: Ref_VNF_22 + short-name: Ref_VNF_22 + vdu: + - external-interface: + - name: iface60 + virtual-interface: + type: OM-MGMT + vnfd-connection-point-ref: mgmt + - name: iface61 + virtual-interface: + type: PCI-PASSTHROUGH + vnfd-connection-point-ref: west + - name: iface62 + virtual-interface: + type: SR-IOV + vnfd-connection-point-ref: east + id: abd6831e-f811-4580-9aad-1de9c6424180 + image: ref_vm22.qcow2 + name: Ref_VM6 + guest-epa: + cpu-pinning-policy: DEDICATED + mempage-size: "LARGE" + vm-flavor: + memory-mb: '1024' + storage-gb: '16' + vcpu-count: '1' + vendor: ETSI + version: '1.0' -- 2.25.1