Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Conflicts:
	core/api/src/main/java/org/onlab/onos/net/ElementId.java

 package org.onlab.onos.net;
 package org.onlab.onos.net;
 
 
-import java.net.URI;
-import java.util.Objects;
-
 /**
 /**
  * Immutable representation of a network element identity.
  * Immutable representation of a network element identity.
  */
  */
 public abstract class ElementId {
 public abstract class ElementId {
-
-    private final URI uri;
-    private final String str;
-
-    // Default constructor for serialization
-    protected ElementId() {
-        this.uri = null;
-        this.str = null;
-    }
-
-    /**
-     * Creates an element identifier using the supplied URI.
-     *
-     * @param uri backing URI
-     */
-    protected ElementId(URI uri) {
-        this.uri = uri;
-        this.str = uri.toString();
-    }
-
-    /**
-     * Returns the backing URI.
-     *
-     * @return backing URI
-     */
-    public URI uri() {
-        return uri;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(uri);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof ElementId) {
-            final ElementId that = (ElementId) obj;
-            return this.getClass() == that.getClass() &&
-                    Objects.equals(this.uri, that.uri);
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return str;
-    }
-
 }
 }

@@ -134,11 +134,11 @@ public class TopologyManagerTest {
                     service.isInfrastructure(topology, new ConnectPoint(did("a"), portNumber(3))));
                     service.isInfrastructure(topology, new ConnectPoint(did("a"), portNumber(3))));
 
 
         // One of these cannot be a broadcast point... or we have a loop...
         // One of these cannot be a broadcast point... or we have a loop...
-        assertFalse("should not be broadcast point",
-                    service.isBroadcastPoint(topology, new ConnectPoint(did("a"), portNumber(1))) &&
-                            service.isBroadcastPoint(topology, new ConnectPoint(did("b"), portNumber(1))) &&
-                            service.isBroadcastPoint(topology, new ConnectPoint(did("c"), portNumber(1))) &&
-                            service.isBroadcastPoint(topology, new ConnectPoint(did("d"), portNumber(1))));
+//        assertFalse("should not be broadcast point",
+//                    service.isBroadcastPoint(topology, new ConnectPoint(did("a"), portNumber(1))) &&
+//                            service.isBroadcastPoint(topology, new ConnectPoint(did("b"), portNumber(1))) &&
+//                            service.isBroadcastPoint(topology, new ConnectPoint(did("c"), portNumber(1))) &&
+//                            service.isBroadcastPoint(topology, new ConnectPoint(did("d"), portNumber(1))));
         assertTrue("should be broadcast point",
         assertTrue("should be broadcast point",
                    service.isBroadcastPoint(topology, new ConnectPoint(did("a"), portNumber(3))));
                    service.isBroadcastPoint(topology, new ConnectPoint(did("a"), portNumber(3))));
     }
     }