commit 28bfb38aff960f570cc3d7ede09e98fb33267aad
author Andrea Campanella <andrea@opennetworking.org> Thu Apr 09 11:14:14 2020 +0200
committer Andrea Campanella <andrea@opennetworking.org> Fri Apr 10 07:36:50 2020 +0000
tree b954138cc49788a8d7d4d6513720d3d3552d76c0
parent ca1c5d3f01030695e521f29cded5b11692ac2295

[VOL-2906] Adding capability to push custom tech profile on GPON OLT. Minimal DT sadis cfg adjustment

Change-Id: I1d70d21d27f77453800c638bf95da2726f96d202

Jenkinsfile-voltha-build

diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 5198c70..ccc0831 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -17,6 +17,10 @@
     if (params.withKind != null){
         withKind = params.withKind
     }
+    def tech_prof_directory = "XGS_PON"
+    if (params.oltDebVersion.contains("asgvolt64")){
+        tech_prof_directory = "GPON"
+    }
     timeout (100) {
         try {
             stage ("Parse deployment configuration file") {
@@ -128,14 +132,14 @@
                         export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
                         etcd_container=\$(kubectl get pods -n voltha | grep voltha-etcd-cluster | awk 'NR==1{print \$1}')
                         kubectl cp $WORKSPACE/voltha-system-tests/tests/data/TechProfile-${profile}.json voltha/\$etcd_container:/tmp/flexpod.json
-                        put_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'cat /tmp/flexpod.json | ETCDCTL_API=3 etcdctl put service/voltha/technology_profiles/XGS-PON/64')
+                        put_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'cat /tmp/flexpod.json | ETCDCTL_API=3 etcdctl put service/voltha/technology_profiles/${tech_prof_directory}/64')
                         """
                         return out_push_tp == 0
                     }
                     timeout(1) {
                         out_get_tp = sh returnStatus: true, script: """
                         etcd_container=\$(kubectl get pods -n voltha | grep voltha-etcd-cluster | awk 'NR==1{print \$1}')
-                        get_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'ETCDCTL_API=3 etcdctl get --prefix service/voltha/technology_profiles/XGS-PON/64')
+                        get_result=\$(kubectl exec -it \$etcd_container -n voltha -- /bin/sh -c 'ETCDCTL_API=3 etcdctl get --prefix service/voltha/technology_profiles/${tech_prof_directory}/64')
                         """
                         return out_get_tp == 0
                     }

tests/data/dt-berlin-pod-gpon-sadis-DT.json

diff --git a/tests/data/dt-berlin-pod-gpon-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
index 8cb7e9b..9776d91 100644
--- a/tests/data/dt-berlin-pod-gpon-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
@@ -28,7 +28,7 @@
               "technologyProfileId": 64,
               "upstreamBandwidthProfile": "Default",
               "downstreamBandwidthProfile": "Default",
-              "isDhcpRequired": true
+              "isDhcpRequired": false
             }]
           },
           {
@@ -44,7 +44,7 @@
                 "technologyProfileId": 64,
                 "upstreamBandwidthProfile": "Default",
                 "downstreamBandwidthProfile": "Default",
-                "isDhcpRequired": true
+                "isDhcpRequired": false
               }]
           },
           {
@@ -60,7 +60,7 @@
                 "technologyProfileId": 64,
                 "upstreamBandwidthProfile": "Default",
                 "downstreamBandwidthProfile": "Default",
-                "isDhcpRequired": true
+                "isDhcpRequired": false
               }]
           }]
       },