diff --git a/src/main/java/net/onrc/onos/apps/sdnip/BgpPeer.java b/src/main/java/net/onrc/onos/apps/sdnip/BgpPeer.java
index 9c93d9e..6c99c8c 100644
--- a/src/main/java/net/onrc/onos/apps/sdnip/BgpPeer.java
+++ b/src/main/java/net/onrc/onos/apps/sdnip/BgpPeer.java
@@ -1,6 +1,7 @@
 package net.onrc.onos.apps.sdnip;
 
 import java.net.InetAddress;
+import java.util.Objects;
 
 import org.codehaus.jackson.annotate.JsonProperty;
 
@@ -44,4 +45,24 @@
     public InetAddress getIpAddress() {
         return ipAddress;
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(interfaceName, ipAddress);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+
+        if (!(obj instanceof BgpPeer)) {
+            return false;
+        }
+
+        BgpPeer that = (BgpPeer) obj;
+        return Objects.equals(this.interfaceName, that.interfaceName)
+                && Objects.equals(this.ipAddress, that.ipAddress);
+    }
 }
