From 8801f9de61577b5b511e4bd6f6c4e90c659cc163 Mon Sep 17 00:00:00 2001 From: aktas Date: Fri, 31 Dec 2021 23:46:34 +0300 Subject: [PATCH 1/3] New packages for Feature 10886 Signed-off-by: aktas --- .../global_value_kdu_vnfd.yaml | 34 ++++++++++++++++++ .../global_value_kdu_nsd.yaml | 21 +++++++++++ .../openldap_scale_vnfd.yaml | 36 +++++++++++++++++++ .../openldap_scale_ns/openldap_scale_nsd.yaml | 21 +++++++++++ .../openldap_scale_ns/params/params.yaml | 24 +++++++++++++ 5 files changed, 136 insertions(+) create mode 100644 charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml create mode 100644 charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml create mode 100644 charm-packages/openldap_scale_knf/openldap_scale_vnfd.yaml create mode 100644 charm-packages/openldap_scale_ns/openldap_scale_nsd.yaml create mode 100644 charm-packages/openldap_scale_ns/params/params.yaml diff --git a/charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml b/charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml new file mode 100644 index 00000000..86dc9ac3 --- /dev/null +++ b/charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml @@ -0,0 +1,34 @@ +vnfd: + description: KNF with 1 KDU using a helm-chart + df: + - id: default-df + kdu-resource-profile: + - id: global-scale + kdu-name: app1 + resource-name: global + min-number-of-instances: 1 + max-number-of-instances: 10 + scaling-aspect: + - id: scale-kdu + name: scale-kdu + max-scale-level: 10 + aspect-delta-details: + deltas: + - id: kdu-delta + kdu-resource-delta: + - id: global-scale + number-of-instances: 3 + ext-cpd: + - id: mgmt-ext + k8s-cluster-net: mgmtnet + id: global_value_kdu_knf + k8s-cluster: + nets: + - id: mgmtnet + kdu: + # TODO: put an chart with subchart and replicas or replicaCount as global value. + - name: app1 + helm-chart: stable/app1 + mgmt-cp: mgmt-ext + product-name: global_value_kdu_knf + version: '1.0' diff --git a/charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml b/charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml new file mode 100644 index 00000000..f3614b09 --- /dev/null +++ b/charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml @@ -0,0 +1,21 @@ +nsd: + nsd: + - description: NS consisting of a single KNF global_value_kdu_knf connected to mgmt network + df: + - id: default-df + vnf-profile: + - id: global_value_kdu + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: global_value_kdu + constituent-cpd-id: mgmt-ext + virtual-link-profile-id: mgmtnet + vnfd-id: 3kdu_knf + id: global_value_kdu_ns + name: global_value_kdu_ns + version: '1.0' + virtual-link-desc: + - id: mgmtnet + mgmt-network: 'true' + vnfd-id: + - global_value_kdu_knf diff --git a/charm-packages/openldap_scale_knf/openldap_scale_vnfd.yaml b/charm-packages/openldap_scale_knf/openldap_scale_vnfd.yaml new file mode 100644 index 00000000..bc892a20 --- /dev/null +++ b/charm-packages/openldap_scale_knf/openldap_scale_vnfd.yaml @@ -0,0 +1,36 @@ +vnfd: + description: KNF with single KDU using a helm-chart for openldap version 1.2.3 + df: + - id: default-df + kdu-resource-profile: + - id: openldap-scale + kdu-name: ldap + # If replicas or replicaCount iş not located under any section + # in the yaml like here -> https://github.com/helm/charts/blob/master/stable/openldap/values.yaml#L5 + # set resource-name as empty-string ("") like below. + resource-name: "" + min-number-of-instances: 1 + max-number-of-instances: 10 + scaling-aspect: + - id: scale-kdu + name: scale-kdu + max-scale-level: 10 + aspect-delta-details: + deltas: + - id: kdu-delta + kdu-resource-delta: + - id: openldap-scale + number-of-instances: 2 + ext-cpd: + - id: mgmt-ext + k8s-cluster-net: mgmtnet + id: openldap_scale_knf + k8s-cluster: + nets: + - id: mgmtnet + kdu: + - name: ldap + helm-chart: stable/openldap + mgmt-cp: mgmt-ext + product-name: openldap_scale_knf + version: '1.0' diff --git a/charm-packages/openldap_scale_ns/openldap_scale_nsd.yaml b/charm-packages/openldap_scale_ns/openldap_scale_nsd.yaml new file mode 100644 index 00000000..783ca9ff --- /dev/null +++ b/charm-packages/openldap_scale_ns/openldap_scale_nsd.yaml @@ -0,0 +1,21 @@ +nsd: + nsd: + - description: NS consisting of a single KNF openldap_knf connected to mgmt network + df: + - id: default-df + vnf-profile: + - id: openldap + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: openldap + constituent-cpd-id: mgmt-ext + virtual-link-profile-id: mgmtnet + vnfd-id: openldap_scale_knf + id: openldap_scale_ns + name: openldap_scale_ns + version: '1.0' + virtual-link-desc: + - id: mgmtnet + mgmt-network: 'true' + vnfd-id: + - openldap_scale_knf diff --git a/charm-packages/openldap_scale_ns/params/params.yaml b/charm-packages/openldap_scale_ns/params/params.yaml new file mode 100644 index 00000000..8844ecb1 --- /dev/null +++ b/charm-packages/openldap_scale_ns/params/params.yaml @@ -0,0 +1,24 @@ +vld: +- name: mgmtnet + vim-network-name: internal +additionalParamsForVnf: +- member-vnf-index: openldap + additionalParamsForKdu: + - kdu_name: ldap + additionalParams: + # replicaCount: 2 + # service.loadBalancerIP: '172.21.251.X' # MetalLB IP Address + # service.type: NodePort + service: + type: NodePort + # loadBalancerIP: '172.21.251.X' # MetalLB IP Address + adminPassword: osm4u + configPassword: osm4u + env: + LDAP_ORGANISATION: "Example Inc." + LDAP_DOMAIN: "example.org" + LDAP_BACKEND: "hdb" + LDAP_TLS: "true" + LDAP_TLS_ENFORCE: "false" + LDAP_REMOVE_CONFIG_AFTER_SETUP: "true" + -- GitLab From 43d6ace3005524561de6bf7e3a0ec0c5f07f596f Mon Sep 17 00:00:00 2001 From: aktas Date: Mon, 10 Jan 2022 23:06:37 +0300 Subject: [PATCH 2/3] remove packages Signed-off-by: aktas --- .../global_value_kdu_vnfd.yaml | 34 ------------------- .../global_value_kdu_nsd.yaml | 21 ------------ 2 files changed, 55 deletions(-) delete mode 100644 charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml delete mode 100644 charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml diff --git a/charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml b/charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml deleted file mode 100644 index 86dc9ac3..00000000 --- a/charm-packages/global_value_kdu_knf/global_value_kdu_vnfd.yaml +++ /dev/null @@ -1,34 +0,0 @@ -vnfd: - description: KNF with 1 KDU using a helm-chart - df: - - id: default-df - kdu-resource-profile: - - id: global-scale - kdu-name: app1 - resource-name: global - min-number-of-instances: 1 - max-number-of-instances: 10 - scaling-aspect: - - id: scale-kdu - name: scale-kdu - max-scale-level: 10 - aspect-delta-details: - deltas: - - id: kdu-delta - kdu-resource-delta: - - id: global-scale - number-of-instances: 3 - ext-cpd: - - id: mgmt-ext - k8s-cluster-net: mgmtnet - id: global_value_kdu_knf - k8s-cluster: - nets: - - id: mgmtnet - kdu: - # TODO: put an chart with subchart and replicas or replicaCount as global value. - - name: app1 - helm-chart: stable/app1 - mgmt-cp: mgmt-ext - product-name: global_value_kdu_knf - version: '1.0' diff --git a/charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml b/charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml deleted file mode 100644 index f3614b09..00000000 --- a/charm-packages/global_value_kdu_ns/global_value_kdu_nsd.yaml +++ /dev/null @@ -1,21 +0,0 @@ -nsd: - nsd: - - description: NS consisting of a single KNF global_value_kdu_knf connected to mgmt network - df: - - id: default-df - vnf-profile: - - id: global_value_kdu - virtual-link-connectivity: - - constituent-cpd-id: - - constituent-base-element-id: global_value_kdu - constituent-cpd-id: mgmt-ext - virtual-link-profile-id: mgmtnet - vnfd-id: 3kdu_knf - id: global_value_kdu_ns - name: global_value_kdu_ns - version: '1.0' - virtual-link-desc: - - id: mgmtnet - mgmt-network: 'true' - vnfd-id: - - global_value_kdu_knf -- GitLab From c8a096e05d5c3fa50ed98958f09da024964e7249 Mon Sep 17 00:00:00 2001 From: aktas Date: Fri, 11 Feb 2022 07:26:25 +0000 Subject: [PATCH 3/3] Activate replicaCount and set to 1 --- charm-packages/openldap_scale_ns/params/params.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charm-packages/openldap_scale_ns/params/params.yaml b/charm-packages/openldap_scale_ns/params/params.yaml index 8844ecb1..ed2a71ac 100644 --- a/charm-packages/openldap_scale_ns/params/params.yaml +++ b/charm-packages/openldap_scale_ns/params/params.yaml @@ -6,7 +6,7 @@ additionalParamsForVnf: additionalParamsForKdu: - kdu_name: ldap additionalParams: - # replicaCount: 2 + replicaCount: 1 # service.loadBalancerIP: '172.21.251.X' # MetalLB IP Address # service.type: NodePort service: -- GitLab