Skip to content

Commit 29e79ac

Browse files
committed
Update PatchPanel app to work on recent version of ONOS
Change-Id: I124b0d650eb47b7748fd8f158fd94c02eb2ce841
1 parent 9de1884 commit 29e79ac

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

mef-sca-api/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@
5454
<!-- End of extra properties due to MEF SCA API -->
5555
</properties>
5656

57+
<!-- Workaround for incompatible Carrier Ethernet app change-->
58+
<repositories>
59+
<repository>
60+
<id>snapshots</id>
61+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
62+
<snapshots>
63+
<enabled>true</enabled>
64+
</snapshots>
65+
</repository>
66+
</repositories>
67+
5768
<dependencies>
5869
<dependency>
5970
<groupId>org.onosproject</groupId>

patchpanel/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.onosproject</groupId>
2323
<artifactId>onos-dependencies</artifactId>
24-
<version>1.8.2</version>
24+
<version>1.12.0</version>
2525
<relativePath/><!-- parent is remote -->
2626
</parent>
2727

@@ -35,10 +35,10 @@
3535

3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<onos.version>1.8.2</onos.version>
38+
<onos.version>1.12.0</onos.version>
3939
<onos.app.name>org.onosproject.patchpanel</onos.app.name>
4040
<onos.app.title>Patch Panel</onos.app.title>
41-
<onos.app.origin>ON.Lab</onos.app.origin>
41+
<onos.app.origin>ONOS Community</onos.app.origin>
4242
<onos.app.category>Traffic Steering</onos.app.category>
4343
<onos.app.url>http://onosproject.org</onos.app.url>
4444
<onos.app.readme>Creates patches between ports on a switch</onos.app.readme>

patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private DataRequestHandler() {
7979
}
8080

8181
@Override
82-
public void process(long sid, ObjectNode payload) {
82+
public void process(ObjectNode payload) {
8383
DeviceService service = get(DeviceService.class);
8484
ObjectNode result = objectNode();
8585
ArrayNode cps = arrayNode();
@@ -104,7 +104,7 @@ private SecondDataRequestHandler() {
104104
}
105105

106106
@Override
107-
public void process(long sid, ObjectNode payload) {
107+
public void process(ObjectNode payload) {
108108
String deviceId = payload.get(RESULT).get(0).asText();
109109
ConnectPoint cp1 = deviceConnectPoint(deviceId + SLASH + payload.get(RESULT).get(1).asText());
110110
ConnectPoint cp2 = deviceConnectPoint(deviceId + SLASH + payload.get(RESULT).get(2).asText());
@@ -134,7 +134,7 @@ private ThirdDataRequestHandler() {
134134
}
135135

136136
@Override
137-
public void process(long sid, ObjectNode payload) {
137+
public void process(ObjectNode payload) {
138138
StringBuilder sb = new StringBuilder();
139139
for (int i = 0; i < previous.size(); i++) {
140140
sb.append(previous.get(i)).append(i % 2 == 0 ? WITH : EOL);

patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* Copyright 2016-present Open Networking Foundation
43
*

0 commit comments

Comments
 (0)