Added output of appId to the flow list command. Fixed defect in CoreManager - we forgot to put registered ids in our map.
diff --git a/core/net/src/main/java/org/onlab/onos/impl/CoreManager.java b/core/net/src/main/java/org/onlab/onos/impl/CoreManager.java
index 29a8438..edfc080 100644
--- a/core/net/src/main/java/org/onlab/onos/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onlab/onos/impl/CoreManager.java
@@ -1,11 +1,5 @@
package org.onlab.onos.impl;
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
@@ -14,6 +8,11 @@
import org.onlab.onos.Version;
import org.onlab.util.Tools;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Core service implementation.
@@ -23,10 +22,11 @@
public class CoreManager implements CoreService {
private static final AtomicInteger ID_DISPENSER = new AtomicInteger(1);
+
private static final File VERSION_FILE = new File("../VERSION");
private static Version version = Version.version("1.0.0-SNAPSHOT");
- private final Map<Short, DefaultApplicationId> ids = new ConcurrentHashMap<>();
+ private final Map<Short, DefaultApplicationId> appIds = new ConcurrentHashMap<>();
// TODO: work in progress
@@ -45,12 +45,15 @@
@Override
public ApplicationId getAppId(Short id) {
- return ids.get(id);
+ return appIds.get(id);
}
@Override
public ApplicationId registerApplication(String name) {
- return new DefaultApplicationId((short) ID_DISPENSER.getAndIncrement(), name);
+ short id = (short) ID_DISPENSER.getAndIncrement();
+ DefaultApplicationId appId = new DefaultApplicationId(id, name);
+ appIds.put(id, appId);
+ return appId;
}
}
diff --git a/core/net/src/main/java/org/onlab/onos/impl/DefaultApplicationId.java b/core/net/src/main/java/org/onlab/onos/impl/DefaultApplicationId.java
index 04012db..eed5fb0 100644
--- a/core/net/src/main/java/org/onlab/onos/impl/DefaultApplicationId.java
+++ b/core/net/src/main/java/org/onlab/onos/impl/DefaultApplicationId.java
@@ -1,19 +1,19 @@
package org.onlab.onos.impl;
+import org.onlab.onos.ApplicationId;
+
import java.util.Objects;
-import org.onlab.onos.ApplicationId;
+import static com.google.common.base.MoreObjects.toStringHelper;
/**
* Application id generator class.
*/
public class DefaultApplicationId implements ApplicationId {
-
private final short id;
private final String name;
-
// Ban public construction
protected DefaultApplicationId(Short id, String identifier) {
this.id = id;
@@ -40,13 +40,16 @@
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
+ if (obj instanceof DefaultApplicationId) {
+ DefaultApplicationId other = (DefaultApplicationId) obj;
+ return Objects.equals(this.id, other.id);
}
- if (!(obj instanceof DefaultApplicationId)) {
- return false;
- }
- DefaultApplicationId other = (DefaultApplicationId) obj;
- return Objects.equals(this.id, other.id);
+ return false;
}
+
+ @Override
+ public String toString() {
+ return toStringHelper(this).add("id", id).add("name", name).toString();
+ }
+
}