From ebc11ac62ace63b6317d49d47e562e6d4f9b9e0c Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 24 Feb 2021 17:30:38 +0000
Subject: [PATCH 1/2] Updates in openldap: chart version, params.yaml, README
 with testing instructions

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 openldap_knf/openldap_vnfd.yaml |  2 +-
 openldap_ns/README.md           | 72 +++++++++++++++++++++------------
 openldap_ns/params.yaml         | 24 +++++++++++
 3 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 openldap_ns/params.yaml

diff --git a/openldap_knf/openldap_vnfd.yaml b/openldap_knf/openldap_vnfd.yaml
index 3697b53d..152efa66 100644
--- a/openldap_knf/openldap_vnfd.yaml
+++ b/openldap_knf/openldap_vnfd.yaml
@@ -11,7 +11,7 @@ vnfd:
     - id: mgmtnet
   kdu:
   - name: ldap
-    helm-chart: stable/openldap:1.2.3
+    helm-chart: stable/openldap
   mgmt-cp: mgmt-ext
   product-name: openldap_knf
   provider: Telefonica
diff --git a/openldap_ns/README.md b/openldap_ns/README.md
index 8424611f..93fb79c6 100644
--- a/openldap_ns/README.md
+++ b/openldap_ns/README.md
@@ -1,26 +1,46 @@
-# SIMPLE OPEN-LDAP CHART
-
-Descriptors that installs an openldap version 1.2.1 chart in a K8s cluster
-
-There is one VNF (openldap\_vnf) with only one KDU.
-
-There is one NS that connects the VNF to a mgmt network
-
-## Onboarding and instantiation
-
-```bash
-osm nfpkg-create openldap_knf.tar.gz
-osm nspkg-create openldap_ns.tar.gz
-osm ns-create --ns_name ldap --nsd_name openldap_ns --vim_account <VIM_ACCOUNT_NAME>|<VIM_ACCOUNT_ID> --ssh_keys ${HOME}/.ssh/id_rsa.pub
-```
-
-### Instantiation option
-
-Some parameters could be passed during the instantiation.
-
-* replicaCount: Number of Open LDAP replicas that will be created
-
-```bash
-osm ns-create --ns_name ldap --nsd_name openldap_ns --vim_account <VIM_ACCOUNT_NAME>|<VIM_ACCOUNT_ID> --config '{additionalParamsForVnf: [{"member-vnf-index": "openldap", "additionalParams": {"replicaCount": "2"}}]}'
-```
-
+# SIMPLE OPEN-LDAP CHART
+
+Descriptors that installs an openldap version 1.2.1 chart in a K8s cluster
+
+There is one VNF (openldap\_vnf) with only one KDU.
+
+There is one NS that connects the VNF to a mgmt network
+
+## Onboarding and instantiation
+
+```bash
+osm nfpkg-create openldap_knf.tar.gz
+osm nspkg-create openldap_ns.tar.gz
+osm ns-create --ns_name ldap --nsd_name openldap_ns --vim_account <VIM_ACCOUNT_NAME>|<VIM_ACCOUNT_ID> --ssh_keys ${HOME}/.ssh/id_rsa.pub
+```
+
+### Instantiation option
+
+Some parameters could be passed during the instantiation.
+
+* replicaCount: Number of Open LDAP replicas that will be created
+
+```bash
+osm ns-create --ns_name ldap --nsd_name openldap_ns --vim_account <VIM_ACCOUNT_NAME>|<VIM_ACCOUNT_ID> --config '{additionalParamsForVnf: [{"member-vnf-index": "openldap", "additionalParams": {"replicaCount": "2"}}]}'
+osm ns-create --ns_name ldap --nsd_name openldap_ns --vim_account <VIM_ACCOUNT_NAME>|<VIM_ACCOUNT_ID> --config_file params.yaml
+```
+
+## Test deployment
+
+```bash
+helm -n <PROJECT_ID> list
+kubectl -n <PROJECT_ID> get all
+kubectl -n <PROJECT_ID> get service
+```
+
+## Testing LDAP server
+
+```bash
+sudo apt-get update
+sudo apt-get install ldap-utils
+# With LB:
+ldapsearch -x -H ldap://<LB_IP>:389 -b dc=example,dc=org -D "cn=admin,dc=example,dc=org" -w osm4u
+# With NodePort
+ldapsearch -x -H ldap://<NODE_IP>:<NODE_PORT> -b dc=example,dc=org -D "cn=admin,dc=example,dc=org" -w osm4u
+```
+
diff --git a/openldap_ns/params.yaml b/openldap_ns/params.yaml
new file mode 100644
index 00000000..8844ecb1
--- /dev/null
+++ b/openldap_ns/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 9d83494d7fa760a1970a8361a199162f0e85a603 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 25 Feb 2021 12:19:29 +0000
Subject: [PATCH 2/2] Moved params.yaml to params folder to pass package
 validation

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 openldap_ns/{ => params}/params.yaml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename openldap_ns/{ => params}/params.yaml (100%)

diff --git a/openldap_ns/params.yaml b/openldap_ns/params/params.yaml
similarity index 100%
rename from openldap_ns/params.yaml
rename to openldap_ns/params/params.yaml
-- 
GitLab