Update PatchPanel app to work on recent version of ONOS
Change-Id: I124b0d650eb47b7748fd8f158fd94c02eb2ce841
diff --git a/mef-sca-api/pom.xml b/mef-sca-api/pom.xml
index 1b21456..45f02ac 100644
--- a/mef-sca-api/pom.xml
+++ b/mef-sca-api/pom.xml
@@ -54,6 +54,17 @@
<!-- End of extra properties due to MEF SCA API -->
</properties>
+ <!-- Workaround for incompatible Carrier Ethernet app change-->
+ <repositories>
+ <repository>
+ <id>snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/patchpanel/pom.xml b/patchpanel/pom.xml
index 91201ad..65e5a79 100644
--- a/patchpanel/pom.xml
+++ b/patchpanel/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.8.2</version>
+ <version>1.12.0</version>
<relativePath/><!-- parent is remote -->
</parent>
@@ -35,10 +35,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.8.2</onos.version>
+ <onos.version>1.12.0</onos.version>
<onos.app.name>org.onosproject.patchpanel</onos.app.name>
<onos.app.title>Patch Panel</onos.app.title>
- <onos.app.origin>ON.Lab</onos.app.origin>
+ <onos.app.origin>ONOS Community</onos.app.origin>
<onos.app.category>Traffic Steering</onos.app.category>
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.readme>Creates patches between ports on a switch</onos.app.readme>
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
index 0ca2d0f..130dffb 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
@@ -79,7 +79,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
DeviceService service = get(DeviceService.class);
ObjectNode result = objectNode();
ArrayNode cps = arrayNode();
@@ -104,7 +104,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
String deviceId = payload.get(RESULT).get(0).asText();
ConnectPoint cp1 = deviceConnectPoint(deviceId + SLASH + payload.get(RESULT).get(1).asText());
ConnectPoint cp2 = deviceConnectPoint(deviceId + SLASH + payload.get(RESULT).get(2).asText());
@@ -134,7 +134,7 @@
}
@Override
- public void process(long sid, ObjectNode payload) {
+ public void process(ObjectNode payload) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < previous.size(); i++) {
sb.append(previous.get(i)).append(i % 2 == 0 ? WITH : EOL);
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java
index 5c146c5..d4b5af9 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java
@@ -1,4 +1,3 @@
-
/*
* Copyright 2016-present Open Networking Foundation
*