From 027f9172253d2a932854cc15354a818aa9765f2a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Dec 2016 18:09:10 +0000 Subject: [PATCH 1/2] updated the Makefile - cloud init directory chagnes to /template --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eca3c2c..cb86e47 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VNFD_OUTPUT:= $(addprefix build/,$(addsuffix .tar.gz, $(VNFD_DIRS))) VNFD_CHECKSUMS:= $(addsuffix /checksums.txt, $(VNFD_DIRS)) VNFD_YAML:= $(addsuffix .yaml, $(VNFD_DIRS)) VNFD_YAML_CLEAN:= $(addsuffix .clean, $(VNFD_YAML)) -VNFD_CLOUD_INIT:= $(addsuffix /cloud_init/cloud_init.cfg,$(VNFD_DIRS)) +VNFD_CLOUD_INIT:= $(addsuffix /template/cloud_init.cfg,$(VNFD_DIRS)) SSH_KEY ?= "" From d4475110430c9be2435f63fc20b5952ec63e62d4 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Dec 2016 18:37:31 +0000 Subject: [PATCH 2/2] changed the Make file --- server_vnfd/checksums.txt | 2 ++ server_vnfd/server_vnfd.yaml | 29 +++++++++++++++++++++++++ tse_vnfd/checksums.txt | 3 +++ tse_vnfd/tse_vnfd.yaml | 42 ++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 server_vnfd/checksums.txt create mode 100644 server_vnfd/server_vnfd.yaml create mode 100644 tse_vnfd/checksums.txt create mode 100644 tse_vnfd/tse_vnfd.yaml diff --git a/server_vnfd/checksums.txt b/server_vnfd/checksums.txt new file mode 100644 index 0000000..a5d6eec --- /dev/null +++ b/server_vnfd/checksums.txt @@ -0,0 +1,2 @@ +643e3f576810fdb5a924dfad436ba9d1 ./server_vnfd.yaml +c95e91a81f288dcd96e0232ff7db4022 ./checksums.txt diff --git a/server_vnfd/server_vnfd.yaml b/server_vnfd/server_vnfd.yaml new file mode 100644 index 0000000..f2e9b47 --- /dev/null +++ b/server_vnfd/server_vnfd.yaml @@ -0,0 +1,29 @@ +vnfd:vnfd-catalog: + vnfd:vnfd: + - vnfd:connection-point: + - vnfd:name: cp1 + vnfd:type: VPORT + vnfd:description: a simple server + vnfd:id: server-vnfd + vnfd:mgmt-interface: + vnfd:vdu-id: iovdu_0 + vnfd:name: server + vnfd:service-function-chain: UNAWARE + vnfd:short-name: server + vnfd:vdu: + - vnfd:external-interface: + - vnfd:name: eth0 + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: cp1 + vnfd:id: iovdu_0 + vnfd:guest-epa: + vnfd:cpu-pinning-policy: ANY + vnfd:image: "Ubuntu 16.04.1 LTS - Xenial Xerus - 64-bit - Cloud Based Image" + vnfd:name: vdu-1 + vnfd:cloud-init-file: cloud_init.cfg + vnfd:vm-flavor: + vnfd:memory-mb: '2048' + vnfd:storage-gb: '5' + vnfd:vcpu-count: '1' + vnfd:version: '1.0' diff --git a/tse_vnfd/checksums.txt b/tse_vnfd/checksums.txt new file mode 100644 index 0000000..d30f592 --- /dev/null +++ b/tse_vnfd/checksums.txt @@ -0,0 +1,3 @@ +ee6a92e0aed49fbbe7a2d9c2ec07f8af ./icons/sandvine_logo.png +c90db8f38a6995e1feb704ce88fd2f79 ./tse_vnfd.yaml +d3b4d8f5b6375e803828a46ae1fcca9d ./checksums.txt diff --git a/tse_vnfd/tse_vnfd.yaml b/tse_vnfd/tse_vnfd.yaml new file mode 100644 index 0000000..47b339b --- /dev/null +++ b/tse_vnfd/tse_vnfd.yaml @@ -0,0 +1,42 @@ +vnfd:vnfd-catalog: + vnfd:vnfd: + - vnfd:connection-point: + - vnfd:name: subscriber-cp + vnfd:type: VPORT + - vnfd:name: internet-cp + vnfd:type: VPORT + - vnfd:name: service-cp + vnfd:type: VPORT + vnfd:description: Sandvine Traffic Steering Engine + vnfd:id: id_tse_vnf + vnfd:logo: sandvine_logo.png + vnfd:mgmt-interface: + vnfd:vdu-id: iovdu_0 + vnfd:name: traffic steering engine + vnfd:service-function-chain: UNAWARE + vnfd:short-name: tse + vnfd:vdu: + - vnfd:external-interface: + - vnfd:name: subscriber-cp + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: subscriber-cp + - vnfd:name: internet-cp + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: internet-cp + - vnfd:name: service-cp + vnfd:virtual-interface: + vnfd:type: VIRTIO + vnfd:vnfd-connection-point-ref: service-cp + vnfd:id: iovdu_0 + vnfd:guest-epa: + vnfd:cpu-pinning-policy: ANY + vnfd:image: "TSE_1.00.00-0075_x86_64_el7.pts_tse_dev_integration" + vnfd:name: vdu-1 + vnfd:cloud-init-file: cloud_init.cfg + vnfd:vm-flavor: + vnfd:memory-mb: '5192' + vnfd:storage-gb: '10' + vnfd:vcpu-count: '4' + vnfd:version: '1.0'