commit 017a14bd0905b7d58792c1cbc9ab3c43df664962
author Suchitra Vemuri <suchitra@opennetworking.org> Wed Oct 30 14:31:29 2019 -0700
committer Suchitra Vemuri <suchitra@opennetworking.org> Wed Oct 30 22:03:19 2019 +0000
tree 3a3e49523d72bdb147bdae4cba01a1677d7c6ceb
parent 7ba839826d75d74b8d61603a449ea42982f35283

[VOL-2047] multi ONU support

Change-Id: Ic73bb01b3531257fafb810c0a8b8e294e45ed126

Jenkinsfile-voltha-build

diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 0ffafd4..ef6a883 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -58,7 +58,7 @@
                     sh returnStdout: true, script: """
                     export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
                     cd kind-voltha/
-                    EXTRA_HELM_FLAGS='-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}.yml' VOLTHA_LOG_LEVEL=DEBUG WITH_SIM_ADAPTERS=n WITH_RADIUS=y WITH_TP=yes DEPLOY_K8S=no INSTALL_KUBECTL=no INSTALL_HELM=no FANCY=0 ONOS_TAG=voltha-2.1 ./voltha up
+                    EXTRA_HELM_FLAGS='-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}.yml' VOLTHA_LOG_LEVEL=DEBUG WITH_SIM_ADAPTERS=n WITH_RADIUS=y WITH_TP=yes DEPLOY_K8S=no INSTALL_KUBECTL=no INSTALL_HELM=no FANCY=0 ./voltha up
                     """
                 }
             }

Jenkinsfile-voltha-test

diff --git a/Jenkinsfile-voltha-test b/Jenkinsfile-voltha-test
index 2edfa18..0ddad70 100644
--- a/Jenkinsfile-voltha-test
+++ b/Jenkinsfile-voltha-test
@@ -39,7 +39,7 @@
                     rm -rf *.log
                     screen -dmS voltha-api-minimal bash -c 'while true; do kubectl port-forward -n voltha service/voltha-api 55555:55555; done'
                     screen -dmS voltha-ssh kubectl port-forward -n voltha service/voltha-cli 5022:5022
-                    export VOLTCONFIG=/home/cord/.volt/config
+                    export VOLTCONFIG=/home/cord/.volt/config ; sleep 10
                     cd $WORKSPACE/voltha-system-tests/tests
                     robot --removekeywords wuks -d Log -V $WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} functional/Voltha_PODTests.robot || true
                     kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c

tests/data/onf-demo-pod-sadis.json

diff --git a/tests/data/onf-demo-pod-sadis.json b/tests/data/onf-demo-pod-sadis.json
index ff81c76..b9ccb85 100644
--- a/tests/data/onf-demo-pod-sadis.json
+++ b/tests/data/onf-demo-pod-sadis.json
@@ -25,8 +25,8 @@
             "circuitId": "",
             "remoteId": "",
             "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "upstreamBandwidthProfile": "User_Bandwidth1",
+            "downstreamBandwidthProfile": "User_Bandwidth1"
           },
           {
             "id": "ALPHe3d1cf9d-1",
@@ -36,8 +36,8 @@
             "circuitId": "",
             "remoteId": "",
             "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "upstreamBandwidthProfile": "User_Bandwidth1",
+            "downstreamBandwidthProfile": "User_Bandwidth1"
           },
           {
             "id": "ALPHe3d1ced5-1",
@@ -47,8 +47,8 @@
             "circuitId": "",
             "remoteId": "",
             "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "upstreamBandwidthProfile": "User_Bandwidth1",
+            "downstreamBandwidthProfile": "User_Bandwidth1"
           },
           {
             "id": "EC1904000654",