[VOL-2586] Tests to include ONOS2.2 with latest apps
Change-Id: I393c6fe21e6558d7f305acaba01d37a123da5285
diff --git a/Jenkinsfile-voltha-bal31-build b/Jenkinsfile-voltha-bal31-build
index f181ce1..cc5dd61 100644
--- a/Jenkinsfile-voltha-bal31-build
+++ b/Jenkinsfile-voltha-bal31-build
@@ -120,7 +120,7 @@
stage('Push Sadis-config') {
timeout(1) {
sadis_out = sh returnStatus: true, script: """
- if [[ ${onosVersion} == "1.13.10" ]]; then
+ if [[ "${onosVersion}" == "1.13.10" || "${onosVersion}" == "2.2" ]]; 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
@@ -192,7 +192,7 @@
sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.dhcpl2relay"
sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.aaa"
sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.olt"
- if [[ ${onosVersion} == "1.13.10" ]]; then
+ if [[ "${onosVersion}" == "1.13.10" || "${onosVersion}" == "2.2" ]]; 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"
diff --git a/tests/data/flex-ocp-cord-2.2-sadis.json b/tests/data/flex-ocp-cord-2.2-sadis.json
new file mode 100644
index 0000000..307cb6b
--- /dev/null
+++ b/tests/data/flex-ocp-cord-2.2-sadis.json
@@ -0,0 +1,117 @@
+{
+ "devices": {
+ "of:000000000ac014ce": {
+ "basic": {
+ "driver": "voltha"
+ }
+ }
+ },
+ "apps": {
+ "org.opencord.sadis": {
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": false,
+ "maxsize": 50,
+ "ttl": "PT0m"
+ }
+ },
+ "entries": [
+ {
+ "id": "ALPHe3d1cfa7-1",
+ "nasPortId": "ALPHe3d1cfa7-1",
+ "circuitId": "ALPHe3d1cfa7-1",
+ "remoteId": "EC1838000853",
+ "uniTagList": [{
+ "ponCTag": 901,
+ "ponSTag": 111,
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "User_Bandwidth3",
+ "downstreamBandwidthProfile": "User_Bandwidth2",
+ "isDhcpRequired": true
+ }]
+ },
+ {
+ "id": "ALPHe3d1cea3-1",
+ "nasPortId": "ALPHe3d1cea3-1",
+ "circuitId": "ALPHe3d1cea3-1",
+ "remoteId": "EC1838000853",
+ "uniTagList": [{
+ "ponCTag": 801,
+ "ponSTag": 111,
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "User_Bandwidth2",
+ "downstreamBandwidthProfile": "User_Bandwidth2",
+ "isDhcpRequired": true
+ }]
+ },
+ {
+ "id": "ALPHe3d1ceb7-1",
+ "nasPortId": "ALPHe3d1ceb7-1",
+ "circuitId": "ALPHe3d1ceb7-1",
+ "remoteId": "EC1838000853",
+ "uniTagList": [{
+ "ponCTag": 101,
+ "ponSTag": 222,
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default",
+ "isDhcpRequired": true
+ }]
+ },
+ {
+ "id": "EC1838000853",
+ "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
+ "ipAddress": "10.192.20.206",
+ "nasId": "EC1838000853",
+ "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
+ }
+
+ ]
+ }
+ }
+ }
+}