From 187d7aa1e21845352f1506703cd34e8266fa39b5 Mon Sep 17 00:00:00 2001 From: bravof Date: Thu, 25 Feb 2021 17:31:33 -0300 Subject: [PATCH 1/3] feat(relations): updated VNF multiVDU/KDU configurations Signed-off-by: bravof --- .../proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml | 2 ++ charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml b/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml index 1cb35a36..ffb49af9 100644 --- a/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml +++ b/charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml @@ -35,6 +35,7 @@ vnfd: juju: charm: simple_provides_proxy proxy: true + external-connection-point-ref: provides-mgmt-ext initial-config-primitive: - name: config execution-environment-ref: simple-provides-proxy-ee @@ -75,6 +76,7 @@ vnfd: juju: charm: simple_requires proxy: false + external-connection-point-ref: requires-mgmt-ext initial-config-primitive: - name: touch execution-environment-ref: simple-requires-ee diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index 35c0c029..f0a5b25e 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -43,6 +43,7 @@ vnfd: juju: charm: simple_requires proxy: false + external-connection-point-ref: requires-mgmt-ext initial-config-primitive: - name: touch execution-environment-ref: simple-requires-ee @@ -68,6 +69,7 @@ vnfd: juju: charm: simple_provides proxy: false + external-connection-point-ref: provides-mgmt-ext initial-config-primitive: - name: touch execution-environment-ref: simple-provides-ee -- GitLab From 322a4b8e8dfed492da99bf52288fb3b91d1d3aa4 Mon Sep 17 00:00:00 2001 From: bravof Date: Fri, 26 Feb 2021 12:18:16 -0300 Subject: [PATCH 2/3] fix(kdu): moving kdu helm charts to kdu config Signed-off-by: bravof --- magma/fb_magma_knf/fb_magma_vnfd.yaml | 8 +++++++- openldap_knf/openldap_vnfd.yaml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/magma/fb_magma_knf/fb_magma_vnfd.yaml b/magma/fb_magma_knf/fb_magma_vnfd.yaml index 068ed749..48efdca8 100644 --- a/magma/fb_magma_knf/fb_magma_vnfd.yaml +++ b/magma/fb_magma_knf/fb_magma_vnfd.yaml @@ -2,6 +2,13 @@ vnfd: description: KNF with KDU using a helm-chart for Facebook magma orc8r df: - id: default-df + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: orc8r + execution-environment-list: + - id: orc8r-ee + helm-chart: magma/orc8r ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -11,7 +18,6 @@ vnfd: - id: mgmtnet kdu: - name: orc8r - helm-chart: magma/orc8r mgmt-cp: mgmt-ext product-name: fb_magma_knf provider: ATOS diff --git a/openldap_knf/openldap_vnfd.yaml b/openldap_knf/openldap_vnfd.yaml index 3697b53d..182bfbaf 100644 --- a/openldap_knf/openldap_vnfd.yaml +++ b/openldap_knf/openldap_vnfd.yaml @@ -2,6 +2,13 @@ vnfd: description: KNF with single KDU using a helm-chart for openldap version 1.2.3 df: - id: default-df + lcm-operations-configuration: + operate-vnf-op-config: + day1-2: + - id: ldap + execution-environment-list: + - id: ldap-ee + helm-chart: stable/openldap:1.2.3 ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -11,7 +18,6 @@ vnfd: - id: mgmtnet kdu: - name: ldap - helm-chart: stable/openldap:1.2.3 mgmt-cp: mgmt-ext product-name: openldap_knf provider: Telefonica -- GitLab From 974e067e3995cf1246fb7c384ab6cb2e710b7fb4 Mon Sep 17 00:00:00 2001 From: bravof Date: Fri, 26 Feb 2021 13:05:23 -0300 Subject: [PATCH 3/3] Revert "fix(kdu): moving kdu helm charts to kdu config" This reverts commit 322a4b8e8dfed492da99bf52288fb3b91d1d3aa4. --- magma/fb_magma_knf/fb_magma_vnfd.yaml | 8 +------- openldap_knf/openldap_vnfd.yaml | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/magma/fb_magma_knf/fb_magma_vnfd.yaml b/magma/fb_magma_knf/fb_magma_vnfd.yaml index 48efdca8..068ed749 100644 --- a/magma/fb_magma_knf/fb_magma_vnfd.yaml +++ b/magma/fb_magma_knf/fb_magma_vnfd.yaml @@ -2,13 +2,6 @@ vnfd: description: KNF with KDU using a helm-chart for Facebook magma orc8r df: - id: default-df - lcm-operations-configuration: - operate-vnf-op-config: - day1-2: - - id: orc8r - execution-environment-list: - - id: orc8r-ee - helm-chart: magma/orc8r ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -18,6 +11,7 @@ vnfd: - id: mgmtnet kdu: - name: orc8r + helm-chart: magma/orc8r mgmt-cp: mgmt-ext product-name: fb_magma_knf provider: ATOS diff --git a/openldap_knf/openldap_vnfd.yaml b/openldap_knf/openldap_vnfd.yaml index 182bfbaf..3697b53d 100644 --- a/openldap_knf/openldap_vnfd.yaml +++ b/openldap_knf/openldap_vnfd.yaml @@ -2,13 +2,6 @@ vnfd: description: KNF with single KDU using a helm-chart for openldap version 1.2.3 df: - id: default-df - lcm-operations-configuration: - operate-vnf-op-config: - day1-2: - - id: ldap - execution-environment-list: - - id: ldap-ee - helm-chart: stable/openldap:1.2.3 ext-cpd: - id: mgmt-ext k8s-cluster-net: mgmtnet @@ -18,6 +11,7 @@ vnfd: - id: mgmtnet kdu: - name: ldap + helm-chart: stable/openldap:1.2.3 mgmt-cp: mgmt-ext product-name: openldap_knf provider: Telefonica -- GitLab