From 313177beab320db5eec5e9efb9e62c5fa1e7b2fb Mon Sep 17 00:00:00 2001 From: lloretgalleg Date: Tue, 15 Dec 2020 10:43:34 +0000 Subject: [PATCH 1/2] Removed kdu-model to reflect IM 10095 changes Signed-off-by: lloretgalleg --- .../native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml | 9 +-------- hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml | 8 +------- magma/fb_magma_knf/fb_magma_vnfd.yaml | 8 +------- magma/squid_cnf/squid_vnfd.yaml | 9 +-------- openldap_knf/openldap_vnfd.yaml | 8 +------- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml b/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml index fc56dda1..fb4501e3 100644 --- a/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml +++ b/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml @@ -1,10 +1,6 @@ vnfd: df: - id: default-df - kdu-profile: - - kdu-configuration-id: native-kdu-kdu-configuration - kdu-model-id: native-kdu-model - name: native-kdu ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -14,6 +10,7 @@ vnfd: - id: mgmtnet kdu: - name: native-kdu + juju-bundle: bundle.yaml kdu-configuration: - config-primitive: - name: changecontent @@ -35,9 +32,5 @@ vnfd: name: customtitle value: Initial Config Primitive seq: 1 - kdu-model: - - id: native-kdu-model - kdu-model-locator: bundle.yaml - kdu-model-type: juju-bundle mgmt-cp: mgmt-ext product-name: native_k8s_charm-vnf diff --git a/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml index a4a72515..9d6d8e37 100644 --- a/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml +++ b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml @@ -1,9 +1,6 @@ vnfd: df: - id: default-df - kdu-profile: - - kdu-model-id: mykdu-model - name: mykdu ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -13,9 +10,6 @@ vnfd: - id: mgmtnet kdu: - name: mykdu - kdu-model: - - id: mykdu-model - kdu-model-locator: cs:~dominik.f/bundle/hf-k8s-bundle-0 - kdu-model-type: juju-bundle + juju-bundle: cs:~dominik.f/bundle/hf-k8s-bundle-0 mgmt-cp: mgmt-ext product-name: hackfest-simple-k8s-vnf diff --git a/magma/fb_magma_knf/fb_magma_vnfd.yaml b/magma/fb_magma_knf/fb_magma_vnfd.yaml index 2732a212..068ed749 100644 --- a/magma/fb_magma_knf/fb_magma_vnfd.yaml +++ b/magma/fb_magma_knf/fb_magma_vnfd.yaml @@ -2,9 +2,6 @@ vnfd: description: KNF with KDU using a helm-chart for Facebook magma orc8r df: - id: default-df - kdu-profile: - - kdu-model-id: orc8r-model - name: orc8r ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -14,10 +11,7 @@ vnfd: - id: mgmtnet kdu: - name: orc8r - kdu-model: - - id: orc8r-model - kdu-model-locator: magma/orc8r - kdu-model-type: helm-chart + helm-chart: magma/orc8r mgmt-cp: mgmt-ext product-name: fb_magma_knf provider: ATOS diff --git a/magma/squid_cnf/squid_vnfd.yaml b/magma/squid_cnf/squid_vnfd.yaml index 20e1a54f..5dfe0f96 100644 --- a/magma/squid_cnf/squid_vnfd.yaml +++ b/magma/squid_cnf/squid_vnfd.yaml @@ -2,10 +2,6 @@ vnfd: description: K8s container deployment of Squid Web Proxy df: - id: default-df - kdu-profile: - - kdu-configuration-id: squid-kdu-kdu-configuration - kdu-model-id: squid-kdu-model - name: squid-kdu ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -15,6 +11,7 @@ vnfd: - id: mgmtnet kdu: - name: squid-kdu + juju-bundle: bundle.yaml kdu-configuration: - config-primitive: - name: addurl @@ -34,10 +31,6 @@ vnfd: default-value: '' name: url id: squid-kdu-kdu-configuration - kdu-model: - - id: squid-kdu-model - kdu-model-locator: bundle.yaml - kdu-model-type: juju-bundle mgmt-cp: mgmt-ext product-name: squid_cnf provider: Canonical diff --git a/openldap_knf/openldap_vnfd.yaml b/openldap_knf/openldap_vnfd.yaml index f0e9502d..3697b53d 100644 --- a/openldap_knf/openldap_vnfd.yaml +++ b/openldap_knf/openldap_vnfd.yaml @@ -2,9 +2,6 @@ vnfd: description: KNF with single KDU using a helm-chart for openldap version 1.2.3 df: - id: default-df - kdu-profile: - - kdu-model-id: ldap-model - name: ldap ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -14,10 +11,7 @@ vnfd: - id: mgmtnet kdu: - name: ldap - kdu-model: - - id: ldap-model - kdu-model-locator: stable/openldap:1.2.3 - kdu-model-type: helm-chart + helm-chart: stable/openldap:1.2.3 mgmt-cp: mgmt-ext product-name: openldap_knf provider: Telefonica -- GitLab From 97a32940298b3fe8d867e2c8fa94c391c4ad8879 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 15 Dec 2020 12:16:10 +0000 Subject: [PATCH 2/2] Fix kdu-configuration to be a container inside kdu item Signed-off-by: garciadeblas --- .../native_k8s_charm_vnfd.yaml | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml b/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml index fb4501e3..6f4da557 100644 --- a/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml +++ b/charm-packages/native_k8s_charm_vnf/native_k8s_charm_vnfd.yaml @@ -11,26 +11,25 @@ vnfd: kdu: - name: native-kdu juju-bundle: bundle.yaml - kdu-configuration: - - config-primitive: - - name: changecontent - parameter: - - data-type: STRING - default-value: nginx - name: application-name - - data-type: STRING - default-value: '' - name: customtitle - id: native-kdu-kdu-configuration - initial-config-primitive: - - name: changecontent - parameter: - - data-type: STRING - name: application-name - value: nginx - - data-type: STRING - name: customtitle - value: Initial Config Primitive - seq: 1 + kdu-configuration: + config-primitive: + - name: changecontent + parameter: + - data-type: STRING + default-value: nginx + name: application-name + - data-type: STRING + default-value: '' + name: customtitle + initial-config-primitive: + - name: changecontent + parameter: + - data-type: STRING + name: application-name + value: nginx + - data-type: STRING + name: customtitle + value: Initial Config Primitive + seq: 1 mgmt-cp: mgmt-ext product-name: native_k8s_charm-vnf -- GitLab