From ea2c6ff6ebec86bb84265f2bc8de3476766ab053 Mon Sep 17 00:00:00 2001 From: calvinosanc1 Date: Fri, 26 Jun 2020 09:55:08 +0200 Subject: [PATCH 1/2] Packages needed for K8s_03 Robot tests Signed-off-by: calvinosanc1 --- .../hackfest_simple_k8s_nsd.yaml | 22 +++++++++++++++++++ .../hackfest_simple_k8s_vnfd.yaml | 15 +++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml create mode 100644 hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml diff --git a/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml b/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml new file mode 100644 index 00000000..428d5eed --- /dev/null +++ b/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml @@ -0,0 +1,22 @@ +nsd:nsd-catalog: + nsd: + - id: hackfest-simple-k8s-nsd + name: hackfest-simple-k8s-nsd + short-name: hackfest-simple-k8s-nsd + description: NS with 1 KDU connected to the mgmtnet VL + version: '1.0' + logo: osm.png + constituent-vnfd: + - vnfd-id-ref: hackfest-simple-k8s-vnfd + member-vnf-index: '1' + vld: + - id: mgmtnet + name: mgmtnet + short-name: mgmtnet + type: ELAN + mgmt-network: 'true' + vim-network-name: mgmt + vnfd-connection-point-ref: + - vnfd-id-ref: hackfest-simple-k8s-vnfd + member-vnf-index-ref: '1' + vnfd-connection-point-ref: mgmtnet diff --git a/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml b/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml new file mode 100644 index 00000000..a802bf7c --- /dev/null +++ b/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml @@ -0,0 +1,15 @@ +vnfd-catalog: + vnfd: + - id: hackfest-simple-k8s-vnfd + name: hackfest-simple-k8s-vnfd + connection-point: + - name: mgmtnet + mgmt-interface: + cp: mgmt + kdu: + - name: mykdu + juju-bundle: cs:~dominik.f/bundle/hf-k8s-bundle-0 + k8s-cluster: + nets: + - id: mgmtnet + external-connection-point-ref: mgmt -- GitLab From ec2ecdff57c5b471f555ffcdf144e5e14e82671f Mon Sep 17 00:00:00 2001 From: calvinosanc1 Date: Fri, 26 Jun 2020 09:55:08 +0200 Subject: [PATCH 2/2] Packages needed for K8s_03 Robot tests Signed-off-by: calvinosanc1 --- .../hackfest_simple_k8s_nsd.yaml | 10 +++++----- .../hackfest_simple_k8s_vnfd.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename {hackfest_simple_k8s_nsd => hackfest_simple_k8s_ns}/hackfest_simple_k8s_nsd.yaml (69%) rename {hackfest_simple_k8s_vnfd => hackfest_simple_k8s_vnf}/hackfest_simple_k8s_vnfd.yaml (81%) diff --git a/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml similarity index 69% rename from hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml rename to hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml index 428d5eed..ae146bdf 100644 --- a/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml +++ b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml @@ -1,13 +1,13 @@ nsd:nsd-catalog: nsd: - - id: hackfest-simple-k8s-nsd - name: hackfest-simple-k8s-nsd - short-name: hackfest-simple-k8s-nsd + - id: hackfest-simple-k8s-ns + name: hackfest-simple-k8s-ns + short-name: hackfest-simple-k8s-ns description: NS with 1 KDU connected to the mgmtnet VL version: '1.0' logo: osm.png constituent-vnfd: - - vnfd-id-ref: hackfest-simple-k8s-vnfd + - vnfd-id-ref: hackfest-simple-k8s-vnf member-vnf-index: '1' vld: - id: mgmtnet @@ -17,6 +17,6 @@ nsd:nsd-catalog: mgmt-network: 'true' vim-network-name: mgmt vnfd-connection-point-ref: - - vnfd-id-ref: hackfest-simple-k8s-vnfd + - vnfd-id-ref: hackfest-simple-k8s-vnf member-vnf-index-ref: '1' vnfd-connection-point-ref: mgmtnet diff --git a/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml similarity index 81% rename from hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml rename to hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml index a802bf7c..40a719c2 100644 --- a/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml +++ b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml @@ -1,7 +1,7 @@ vnfd-catalog: vnfd: - - id: hackfest-simple-k8s-vnfd - name: hackfest-simple-k8s-vnfd + - id: hackfest-simple-k8s-vnf + name: hackfest-simple-k8s-vnf connection-point: - name: mgmtnet mgmt-interface: -- GitLab