Optimizing performance of HostId.
diff --git a/core/api/src/main/java/org/onlab/onos/net/HostId.java b/core/api/src/main/java/org/onlab/onos/net/HostId.java
index f2c0303..ffe558f 100644
--- a/core/api/src/main/java/org/onlab/onos/net/HostId.java
+++ b/core/api/src/main/java/org/onlab/onos/net/HostId.java
@@ -3,44 +3,69 @@
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
-import java.net.URI;
+import java.util.Objects;
+
+import static com.google.common.base.Preconditions.checkArgument;
/**
* Immutable representation of a host identity.
*/
public final class HostId extends ElementId {
- private static final String NIC = "nic";
-
/**
* Represents either no host, or an unspecified host; used for creating
* open ingress/egress edge links.
*/
- public static final HostId NONE = hostId(NIC + ":none-0");
+ public static final HostId NONE = new HostId(MacAddress.ZERO, VlanId.NONE);
+
+ private static final int MAC_LENGTH = 17;
+ private static final int MIN_ID_LENGTH = 19;
+
+ private final MacAddress mac;
+ private final VlanId vlanId;
// Public construction is prohibited
- private HostId(URI uri) {
- super(uri);
+ private HostId(MacAddress mac, VlanId vlanId) {
+ this.mac = mac;
+ this.vlanId = vlanId;
+ }
+
+ // Default constructor for serialization
+ private HostId() {
+ this.mac = null;
+ this.vlanId = null;
}
/**
- * Creates a device id using the supplied URI.
+ * Returns the host MAC address.
*
- * @param uri device URI
- * @return host identifier
+ * @return MAC address
*/
- public static HostId hostId(URI uri) {
- return new HostId(uri);
+ public MacAddress mac() {
+ return mac;
}
/**
- * Creates a device id using the supplied URI string.
+ * Returns the host MAC address.
+ *
+ * @return MAC address
+ */
+ public VlanId vlanId() {
+ return vlanId;
+ }
+
+ /**
+ * Creates a device id using the supplied ID string.
*
* @param string device URI string
* @return host identifier
*/
public static HostId hostId(String string) {
- return hostId(URI.create(string));
+ checkArgument(string.length() >= MIN_ID_LENGTH,
+ "Host ID must be at least %s characters", MIN_ID_LENGTH);
+ MacAddress mac = MacAddress.valueOf(string.substring(0, MAC_LENGTH));
+ VlanId vlanId = VlanId.vlanId(Short.parseShort(string.substring(MAC_LENGTH + 1)));
+ return new HostId(mac, vlanId);
}
/**
@@ -51,7 +76,7 @@
* @return host identifier
*/
public static HostId hostId(MacAddress mac, VlanId vlanId) {
- return hostId(NIC + ":" + mac + "-" + vlanId);
+ return new HostId(mac, vlanId);
}
/**
@@ -64,4 +89,26 @@
return hostId(mac, VlanId.vlanId(VlanId.UNTAGGED));
}
+ public String toString() {
+ return mac + "/" + vlanId;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mac, vlanId);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj instanceof HostId) {
+ final HostId other = (HostId) obj;
+ return Objects.equals(this.mac, other.mac) &&
+ Objects.equals(this.vlanId, other.vlanId);
+ }
+ return false;
+ }
+
}