[VOL-3106] Not sending EAPOL packets if we're only checking for flows
Change-Id: Ie3aa03eae60078024bdc9eea7d04be84ec470a9c
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index fc33790..3470aa9 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -55,7 +55,7 @@
NUM_OF_ONOS="${onosReplicas}"
NUM_OF_ATOMIX="${atomixReplicas}"
WITH_PPROF="${withProfiling}"
- EXTRA_HELM_FLAGS="${extraHelmFlags}"
+ EXTRA_HELM_FLAGS="${extraHelmFlags} " // note that the trailing space is required to separate the parameters from appends done later
VOLTHA_CHART="${volthaChart}"
VOLTHA_BBSIM_CHART="${bbsimChart}"
@@ -187,6 +187,10 @@
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set ${logLevel}
kubectl exec $(kubectl get pods | grep -E "bbsim[0-9]" | awk 'NR==1{print $1}') -- bbsimctl log ${logLevel} false
+ # Set Flows/Ports/Meters poll frequency
+ sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.provider.of.flow.impl.OpenFlowRuleProvider flowPollFrequency ${onosStatInterval}
+ sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.provider.of.device.impl.OpenFlowDeviceProvider portStatsPollFrequency ${onosStatInterval}
+
if [ ${withEapol} = false ] || [ ${withFlows} = false ]; then
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 app deactivate org.opencord.aaa
fi
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 8f85635..f2e4b4d 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -37,7 +37,7 @@
withDhcp: false
withIgmp: false
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-1-10-20-flows'
+ name: 'voltha-scale-measurements-1-10-20-att-flows'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 1
@@ -48,8 +48,9 @@
withEapol: true
withDhcp: true
withIgmp: false
+ extraHelmFlags: '--set auth=false '
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-1-10-20-subscribers'
+ name: 'voltha-scale-measurements-1-10-20-att-subscribers'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 1
@@ -61,7 +62,7 @@
withDhcp: true
withIgmp: false
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-1-10-20-subscribers-profiled'
+ name: 'voltha-scale-measurements-1-10-20-att-subscribers-profiled'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 1
@@ -78,6 +79,21 @@
openoltAdapterImg: voltha/voltha-openolt-adapter:master-profile
ofAgentImg: voltha/voltha-ofagent-go:master-profile
+ # jobs for DT with 200 ONUs with a single openonu-adapter
+ - 'voltha-scale-measurements':
+ name: 'voltha-scale-measurements-1-10-20-dt-subscribers'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ olts: 1
+ pons: 10
+ onus: 20
+ withFlows: true
+ provisionSubscribers: true
+ workflow: dt
+ withEapol: false
+ withDhcp: false
+ withIgmp: false
+
# jobs for 512 ONUs with a 8 openonu-adapters and clustered ONOS
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-1-16-32-activation'
@@ -95,7 +111,7 @@
onosReplicas: 3
atomixReplicas: 3
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-1-16-32-flows'
+ name: 'voltha-scale-measurements-1-16-32-att-flows'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 1
@@ -109,8 +125,9 @@
openonuAdapterReplicas: 8
onosReplicas: 3
atomixReplicas: 3
+ extraHelmFlags: '--set auth=false '
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-1-16-32-subscribers'
+ name: 'voltha-scale-measurements-1-16-32-att-subscribers'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 1
@@ -127,7 +144,7 @@
# jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
- 'voltha-scale-measurements':
- name: 'voltha-scale-dt-measurements-1-16-32-subscribers'
+ name: 'voltha-scale-measurements-1-16-32-dt-subscribers'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 1
@@ -145,6 +162,7 @@
# jobs for 1024 ONUs with a 8 openonu-adapters and clustered ONOS (2 OLTs)
- 'voltha-scale-measurements':
+ disabled: true
name: 'voltha-scale-measurements-2-16-32-activation'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
@@ -160,7 +178,8 @@
onosReplicas: 3
atomixReplicas: 3
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-2-16-32-flows'
+ disabled: true
+ name: 'voltha-scale-measurements-2-16-32-att-flows'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 2
@@ -174,8 +193,10 @@
openonuAdapterReplicas: 8
onosReplicas: 3
atomixReplicas: 3
+ extraHelmFlags: '--set auth=false '
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-2-16-32-subscribers'
+ disabled: true
+ name: 'voltha-scale-measurements-2-16-32-att-subscribers'
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
olts: 2
@@ -246,6 +267,7 @@
onosReplicas: 1
atomixReplicas: 0
extraHelmFlags: ''
+ onosStatInterval: 5
parameters:
- string:
@@ -344,6 +366,11 @@
description: 'How many Atomix instances to run'
- string:
+ name: onosStatInterval
+ default: '{onosStatInterval}'
+ description: 'How often ONOS should poll for ports, flows and meters'
+
+ - string:
name: bbsimImg
default: '{bbsimImg}'
description: 'Custom image selection for BBSIM (repo:tag)'
@@ -540,6 +567,11 @@
description: 'How many Atomix instances to run'
- string:
+ name: onosStatInterval
+ default: 5
+ description: 'How often ONOS should poll for ports, flows and meters'
+
+ - string:
name: bbsimImg
default: '{bbsimImg}'
description: 'Custom image selection for BBSIM (repo:tag)'