Bump up onos and apps versions
Change-Id: Ieeac4d9305dfc796214fb31baee85868a3b75e80
diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index ebc6a3c..d7df6b8 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.5 as install
+FROM matteoscandolo/onos:1.13.9-rc4 as install
MAINTAINER Open Networking Foundation <info@opennetworking.org>
# The ENV settings must be replicated below as they are not shared between stages
@@ -49,7 +49,7 @@
RUN ./app-install.sh
# Create the final image coping over the installed applications from the build stage
-FROM onosproject/onos:1.13.5
+FROM matteoscandolo/onos:1.13.9-rc4
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 dbc1642..fee0102 100644
--- a/docker/config/dependencies.xml
+++ b/docker/config/dependencies.xml
@@ -24,13 +24,13 @@
<version>fake</version>
<properties>
- <aaa.version>1.8.0-SNAPSHOT</aaa.version>
+ <aaa.version>1.9.0-SNAPSHOT</aaa.version>
<config.version>1.4.0</config.version>
- <dhcpl2relay.version>1.5.0-SNAPSHOT</dhcpl2relay.version>
+ <dhcpl2relay.version>1.6.0-SNAPSHOT</dhcpl2relay.version>
<igmpproxy.version>1.2.0</igmpproxy.version>
<mcast.version>1.4.0</mcast.version>
- <olt.version>2.1.0-SNAPSHOT</olt.version>
- <sadis.version>2.2.0-SNAPSHOT</sadis.version>
+ <olt.version>3.0.1-SNAPSHOT</olt.version>
+ <sadis.version>3.1.0-SNAPSHOT</sadis.version>
</properties>
<build>
diff --git a/tests/atests/build/sadis_json b/tests/atests/build/sadis_json
index 901bfb6..882655e 100644
--- a/tests/atests/build/sadis_json
+++ b/tests/atests/build/sadis_json
@@ -13,7 +13,10 @@
"id":"PSMO12345678",
"cTag":33,
"sTag":44,
- "nasPortId":"PSMO12345678"
+ "nasPortId":"PSMO12345678",
+ "technologyProfileId":64,
+ "upstreamBandwidthProfile":"High-Speed-Internet",
+ "downstreamBandwidthProfile":"User1-Specific"
},
{
"id":"BBSM00000100",