commit 8e212797d02031b59b2a45f148536ed3cf705c3b
author Jonathan Hart <jono@opennetworking.org> Wed May 02 17:30:05 2018 -0700
committer Jonathan Hart <jono@opennetworking.org> Fri May 18 01:17:41 2018 +0000
tree e8b06dea04c2a2aaa62aa95411728d195ce34e21
parent ee3edc69dbf8be618e3014b4b49e277dad158f66

Upgrading app to ONOS 1.13

Change-Id: Iab61a975791c5ca3b4cd962c4270573fcd776799

pom.xml

diff --git a/pom.xml b/pom.xml
index acd6b61..ec7feb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.10.6</version>
+        <version>1.13.1</version>
         <relativePath></relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
 
     <properties>
         <onos.app.name>org.opencord.vtn</onos.app.name>
-        <onos.version>1.12.0</onos.version>
+        <onos.version>1.13.1</onos.version>
         <onos.app.title>VTN App</onos.app.title>
         <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://opencord.org</onos.app.url>
@@ -50,8 +50,8 @@
         <api.description>
             APIs for interacting with the CORD VTN application.
         </api.description>
-	<api.package>org.opencord.cordvtn.rest</api.package>
-        <cord.config.version>1.3.1</cord.config.version>
+	    <api.package>org.opencord.cordvtn.rest</api.package>
+        <cord.config.version>1.4.0-SNAPSHOT</cord.config.version>
     </properties>
 
     <dependencies>
@@ -206,7 +206,6 @@
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -214,6 +213,7 @@
             <plugin>
                 <groupId>org.onosproject</groupId>
                 <artifactId>onos-maven-plugin</artifactId>
+                <version>1.11</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>

src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
index 987bd32..a0cb610 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnArpProxy.java
@@ -113,7 +113,7 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ServiceNetworkService snetService;
 
-    @Property(name = PRIVATE_GATEWAY_MAC, value = DEFAULT_GATEWAY_MAC_STR,
+    @Property(name = PRIVATE_GATEWAY_MAC, value = "00:00:00:00:00:01",
             label = "Fake MAC address for virtual network gateway")
     private String privateGatewayMacStr = DEFAULT_GATEWAY_MAC_STR;
     private MacAddress privateGatewayMac = MacAddress.valueOf(privateGatewayMacStr);
@@ -147,6 +147,7 @@
         snetService.removeListener(snetListener);
         netConfigService.removeListener(configListener);
         compConfigService.unregisterProperties(getClass(), false);
+        cancelPacket();
 
         log.info("Stopped");
     }