Added a function to return the first group ID of the tunnel for 'show tunnel' CLI command.
Change-Id: I08e42bb4c7842a303efe3fb29dda952404110ecb
diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
index 4726b8e..2353fb7 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
@@ -1671,6 +1671,9 @@
@Override
public void removeTunnel(String tunnelId) {
List<Integer> groups = tunnelGroupIdTable.get(tunnelId);
+ if (groups == null)
+ return;
+
// we need to delete groups in reverse order
for (int i = groups.size() - 1; i >= 0; i--) {
int groupId = groups.get(i);
@@ -1679,11 +1682,20 @@
tunnelGroupIdTable.remove(tunnelId);
}
+ @Override
+ public int getTunnelGroupId(String tunnelId) {
+ List<Integer> groups = tunnelGroupIdTable.get(tunnelId);
+ if (groups == null)
+ return -1;
+
+ return groups.get(0);
+ }
+
+
// *****************************
// Unused
// *****************************
-
@SuppressWarnings("unused")
private void setAsyncConfig() throws IOException {
List<OFMessage> msglist = new ArrayList<OFMessage>(3);