commit cf78ece3844bd49e796998c4a761e641c935f7f8
author Matteo Scandolo <teo@opennetworking.org> Wed Oct 14 01:52:09 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Wed Oct 14 01:52:09 2020 +0000
tree d8e65e06cbb6ca60879a3ac465e58838536554bf
parent 12146d59fea6c618905871cc22552ec4896bedf0
parent 9e8c2a3d402429f3e5c64c3c067f0cd7cd05e48c

Merge "Exposing WITH_RADIUS config to scale job"

jjb/pipeline/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index d2d0126..576625a 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -32,7 +32,7 @@
     SCHEDULE_ON_CONTROL_NODES="yes"
     FANCY=0
     WITH_SIM_ADAPTERS="no"
-    WITH_RADIUS="yes"
+    WITH_RADIUS="${withRadius}"
     WITH_BBSIM="yes"
     LEGACY_BBSIM_INDEX="no"
     DEPLOY_K8S="no"
@@ -273,6 +273,10 @@
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flow.impl.FlowRuleManager allowExtraneousRules true
           sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flow.impl.FlowRuleManager importExtraneousRules true
 
+          kubectl exec onos-onos-classic-0 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set WARN org.opencord.sadis
+          kubectl exec onos-onos-classic-1 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set WARN org.opencord.sadis
+          kubectl exec onos-onos-classic-2 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set WARN org.opencord.sadis
+
           kubectl exec onos-onos-classic-0 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set TRACE org.opencord.aaa
           kubectl exec onos-onos-classic-1 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set TRACE org.opencord.aaa
           kubectl exec onos-onos-classic-2 -- bash /root/onos/apache-karaf-4.2.9/bin/client log:set TRACE org.opencord.aaa

jjb/voltha-scale.yaml

diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index e44c280..35d4c63 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -53,6 +53,7 @@
           build-node: 'onf-pod1-head-node'
           'disable-job': false
           time-trigger: "H H/4 * * *"
+          withMonitoring: false
           olts: 1
           pons: 16
           onus: 32
@@ -64,12 +65,13 @@
           openonuAdapterReplicas: 8
           onosReplicas: 3
           atomixReplicas: 3
-          extraHelmFlags: '--set authRetry=true,dhcpRetry=true '
+          extraHelmFlags: '--set debug=true'
           withPcap: true
           bbsimImg: matteoscandolo/bbsim:eapol-512
           openoltAdapterImg: gcgirish/voltha-openolt-adapter:flowReplica
-          onosImg:  andreacampanella/voltha-onos:aaa-single-radius-master-dhcp-option82
+          onosImg:  matteoscandolo/voltha-onos:dhcp-aaa
           radiusChart: /home/cord/helm-charts/freeradius
+          withRadius: 10.90.0.69:1812
 
 
       # jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS (1 OLT)
@@ -359,6 +361,11 @@
           description: 'Capture a .pcap on the OpenFlow connection from the ofAgent side'
 
       - string:
+          name: withRadius
+          default: '{withRadius}'
+          description: 'Value to pass to kind-voltha WITH_RADIUS'
+
+      - string:
           name: extraHelmFlags
           default: '{extraHelmFlags}'
           description: 'Any extra helm parameters you want (passed to every helm install command, not available if release != master)'
@@ -526,6 +533,7 @@
     withMonitoring: true
     withProfiling: false
     withPcap: false
+    withRadius: yes
     openonuAdapterReplicas: 1
     onosReplicas: 1
     atomixReplicas: 0
@@ -603,6 +611,7 @@
     withMonitoring: true
     withProfiling: false
     withPcap: false
+    withRadius: yes
     openonuAdapterReplicas: 1
     onosReplicas: 1
     atomixReplicas: 0