Update atests for new charts, update ONOS apps to released versions
Change-Id: Ibe361abb960dbe2a4fec1e60ba178d783fafa692
diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index e2b5c70..5973b43 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -28,7 +28,7 @@
ADD config/dependencies.xml .
RUN mvn dependency:copy -Dmdep.useBaseVersion=true -DoutputDirectory=${DOWNLOAD_ROOT} -Dsilent=true -f dependencies.xml -s mvn_settings.xml
-FROM onosproject/onos:1.13.9-rc4 as install
+FROM onosproject/onos:1.13.9 as install
MAINTAINER Open Networking Foundation <info@opennetworking.org>
# The ENV settings must be replicated below as they are not shared between stages
diff --git a/docker/config/dependencies.xml b/docker/config/dependencies.xml
index d8dd642..38b5c64 100644
--- a/docker/config/dependencies.xml
+++ b/docker/config/dependencies.xml
@@ -24,13 +24,13 @@
<version>fake</version>
<properties>
- <aaa.version>1.9.0-SNAPSHOT</aaa.version>
+ <aaa.version>1.9.0</aaa.version>
<config.version>1.4.0</config.version>
- <dhcpl2relay.version>1.6.0-SNAPSHOT</dhcpl2relay.version>
+ <dhcpl2relay.version>1.6.0</dhcpl2relay.version>
<igmpproxy.version>1.2.0</igmpproxy.version>
<mcast.version>1.4.0</mcast.version>
- <olt.version>3.0.1-SNAPSHOT</olt.version>
- <sadis.version>3.1.0-SNAPSHOT</sadis.version>
+ <olt.version>3.0.1</olt.version>
+ <sadis.version>3.1.0</sadis.version>
</properties>
<build>
diff --git a/tests/atests/build/sadis_json b/tests/atests/build/sadis_json
index a5f1fbb..1f32f0f 100644
--- a/tests/atests/build/sadis_json
+++ b/tests/atests/build/sadis_json
@@ -1,19 +1,19 @@
-{
- "org.opencord.sadis":{
- "sadis":{
- "integration":{
- "cache":{
+{
+ "org.opencord.sadis":{
+ "sadis":{
+ "integration":{
+ "cache":{
"enabled":true,
"maxsize":50,
"ttl":"PT1m"
}
},
- "entries":[
- {
- "id":"PSMO12345678",
+ "entries":[
+ {
+ "id":"PSMO00000000",
"cTag":33,
"sTag":44,
- "nasPortId":"PSMO12345678",
+ "nasPortId":"PSMO00000000",
"technologyProfileId":64,
"upstreamBandwidthProfile":"High-Speed-Internet",
"downstreamBandwidthProfile":"User1-Specific"