commit ba342de7b981deb47af4813e80fbc82d737a61c1
author Matteo Scandolo <matteo.scandolo@gmail.com> Tue Oct 22 10:41:33 2019 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Oct 24 17:20:53 2019 -0700
tree 57dcbb57fa4d1a69539ab8a94314d9ef798442f8
parent fcecd3907a75ff0f09b83085377866318fc99d87

Fixing the BBsim pipeline

Change-Id: I7b3715de7cf84393816eef7d1ba0d85e48b67333

VERSION

diff --git a/VERSION b/VERSION
index 81340c7..ccf3e96 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.4
+0.0.5-dev

cmd/bbr/bbr.go

diff --git a/cmd/bbr/bbr.go b/cmd/bbr/bbr.go
index 69b8639..30c3c71 100644
--- a/cmd/bbr/bbr.go
+++ b/cmd/bbr/bbr.go
@@ -52,6 +52,8 @@
 		"NumNniPerOlt": options.NumNniPerOlt,
 		"NumPonPerOlt": options.NumPonPerOlt,
 		"NumOnuPerPon": options.NumOnuPerPon,
+		"BBSimIp":      options.BBSimIp,
+		"BBSimPort":    options.BBSimPort,
 	}).Info("BroadBand Reflector is on")
 
 	// NOTE this are probably useless in the MockOLT case, check if we can avoid using them in the CreateOlt method

internal/bbr/devices/olt.go

diff --git a/internal/bbr/devices/olt.go b/internal/bbr/devices/olt.go
index 103be3b..2a894b0 100644
--- a/internal/bbr/devices/olt.go
+++ b/internal/bbr/devices/olt.go
@@ -52,7 +52,7 @@
 
 	for _, pon := range o.Olt.Pons {
 		for _, onu := range pon.Onus {
-			log.Debugf("Created ONU: %s (%d:%d)", onu.Sn(), onu.STag, onu.CTag)
+			log.Tracef("Created ONU: %s (%d:%d)", onu.Sn(), onu.STag, onu.CTag)
 		}
 	}
 

tests/bbr.groovy

diff --git a/tests/bbr.groovy b/tests/bbr.groovy
index a86bc52..dfa975b 100644
--- a/tests/bbr.groovy
+++ b/tests/bbr.groovy
@@ -22,19 +22,12 @@
   }
 
   stages {
-    stage('Build BBSim') {
+    stage('Download BBR') {
       steps {
         sh """
-          docker pull voltha/bbsim:master
-          make docker-build
-        """
-      }
-    }
-    stage('Build BBR') {
-      steps {
-        sh """
-          export PATH=$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:$GOPATH/bin
-          make build-bbr
+          wget https://github.com/opencord/bbsim/releases/download/v0.0.2/bbr-linux-amd64
+          mv bbr-linux-amd64 bbr
+          chmod a+x bbr
         """
       }
     }
@@ -42,7 +35,9 @@
       steps {
         timeout(1) {
           sh """
-            DOCKER_RUN_ARGS="-pon 4 -onu 16" make docker-run
+            docker rm -f bbsim
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-pon 4 -onu 16" make docker-run
+            sleep 5
             ./bbr -pon 4 -onu 16 2>&1 | tee bbr_16_4.logs
             docker logs bbsim 2>&1 | tee bbsim_16_4.logs
           """
@@ -54,7 +49,8 @@
         timeout(1) {
           sh """
             docker rm -f bbsim
-            DOCKER_RUN_ARGS="-pon 4 -onu 32" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-pon 4 -onu 32" make docker-run
+            sleep 5
             ./bbr -pon 4 -onu 32 2>&1 | tee bbr_32_4.logs
             docker logs bbsim 2>&1 | tee bbsim_32_4.logs
           """
@@ -66,7 +62,8 @@
         timeout(1) {
           sh """
             docker rm -f bbsim
-            DOCKER_RUN_ARGS="-pon 8 -onu 32" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-pon 8 -onu 32" make docker-run
+            sleep 5
             ./bbr -pon 8 -onu 32 2>&1 | tee bbr_32_8.logs
             docker logs bbsim 2>&1 | tee bbsim_32_8.logs
           """