[VOL-2556] Test ONOS1.13.10 on onf-demo POD
Change-Id: Ia7de48a292871fcc41e45353151027b0f708dfa2
diff --git a/Jenkinsfile-voltha-bal31-build b/Jenkinsfile-voltha-bal31-build
index e5f8e20..87e8ac6 100644
--- a/Jenkinsfile-voltha-bal31-build
+++ b/Jenkinsfile-voltha-bal31-build
@@ -122,7 +122,12 @@
stage('Push Sadis-config') {
timeout(1) {
sadis_out = sh returnStatus: true, script: """
+ if [[ ${onosVersion} == "1.13.10" ]]; then
+ curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-${onosVersion}-sadis.json
+ else
curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-sadis.json
+ fi
+
"""
return sadis_out == 0
}
@@ -171,13 +176,18 @@
}
}
}
-
if ( deployment_config.fabric_switches.size() > 0 ) {
stage('Switch Configurations in ONOS') {
timeout(1) {
netcfg_out = sh returnStatus: true, script: """
curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/${configBaseDir}/${configToscaDir}/voltha/${configFileName}-onos-netcfg-switch.json
curl -sSL --user karaf:karaf -X POST http://${deployment_config.nodes[0].ip}:30120/onos/v1/applications/org.onosproject.segmentrouting/active
+ if [[ ${onosVersion} == "1.13.10" ]]; then
+ sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableDhcpOnProvisioning true"
+ sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableDhcpV4 true"
+ sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableEapol true"
+ fi
+
"""
return netcfg_out == 0
}
diff --git a/tests/data/onf-demo-pod-1.13.10-sadis.json b/tests/data/onf-demo-pod-1.13.10-sadis.json
new file mode 100644
index 0000000..6208870
--- /dev/null
+++ b/tests/data/onf-demo-pod-1.13.10-sadis.json
@@ -0,0 +1,117 @@
+{
+ "devices": {
+ "of:000000000a80645a": {
+ "basic": {
+ "driver": "voltha"
+ }
+ }
+ },
+ "apps": {
+ "org.opencord.sadis": {
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": false,
+ "maxsize": 50,
+ "ttl": "PT0m"
+ }
+ },
+ "entries": [
+ {
+ "id": "BRCM22222222-1",
+ "nasPortId": "BRCM22222222-1",
+ "circuitId": "",
+ "remoteId": "",
+ "uniTagList": [{
+ "ponCTag": 11,
+ "ponSTag": 99,
+ "technologyProfileId": 64,
+ "downstreamBandwidthProfile": "Default",
+ "upstreamBandwidthProfile": "Default",
+ "isDhcpRequired": true
+ }]
+ },
+ {
+ "id": "ALPHe3d1cf9d-1",
+ "nasPortId": "ALPHe3d1cf9d-1",
+ "circuitId": "",
+ "remoteId": "",
+ "uniTagList": [{
+ "ponCTag": 22,
+ "ponSTag": 99,
+ "technologyProfileId": 64,
+ "downstreamBandwidthProfile": "Default",
+ "upstreamBandwidthProfile": "Default",
+ "isDhcpRequired": true
+ }]
+ },
+ {
+ "id": "ALPHe3d1ced5-1",
+ "nasPortId": "ALPHe3d1ced5-1",
+ "circuitId": "",
+ "remoteId": "",
+ "uniTagList": [{
+ "ponCTag": 33,
+ "ponSTag": 99,
+ "technologyProfileId": 64,
+ "downstreamBandwidthProfile": "Default",
+ "upstreamBandwidthProfile": "Default",
+ "isDhcpRequired": true
+ }]
+ },
+ {
+ "id": "EC1904000654",
+ "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
+ "ipAddress": "10.192.20.206",
+ "nasId": "EC1904000654",
+ "uplinkPort": 1048576
+ }
+ ]
+ },
+ "bandwidthprofile":{
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "air": 100000,
+ "cbs": 30,
+ "cir": 16000,
+ "ebs": 30,
+ "eir": 16000
+ },
+ {
+ "id": "User_Bandwidth1",
+ "air": 100000,
+ "cbs": 10000,
+ "cir": 30000,
+ "ebs": 1000,
+ "eir": 20000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "air": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "ebs": 5000,
+ "eir": 100000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "air": 100000,
+ "cbs": 5000,
+ "cir": 1000000,
+ "ebs": 5000,
+ "eir": 1000000
+ }
+
+ ]
+ }
+ }
+ }
+}