commit de372571c53e0997b4716d2ba7eb31b69534e617
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Jan 14 03:42:47 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Jan 15 19:15:31 2016 +0000
tree 7dffe6fcb251331ccaca09f7c57bbe954457f2bf
parent 3e6fe45cf6b424af48081d95130a6b43e29160d8

CORD-471 Added physical port and data plane IP as node attribtes

Change-Id: I4c28053151e61feb4b9b0ca60e98f7e0e4af0207

src/main/java/org/onosproject/cordvtn/CordVtnNode.java

diff --git a/src/main/java/org/onosproject/cordvtn/CordVtnNode.java b/src/main/java/org/onosproject/cordvtn/CordVtnNode.java
index 439d16e..c11ba42 100644
--- a/src/main/java/org/onosproject/cordvtn/CordVtnNode.java
+++ b/src/main/java/org/onosproject/cordvtn/CordVtnNode.java
@@ -34,6 +34,8 @@
     private final IpAddress ovsdbIp;
     private final TpPort ovsdbPort;
     private final DeviceId bridgeId;
+    private final String phyPortName;
+    private final IpAddress localIp;
 
     public static final Comparator<CordVtnNode> CORDVTN_NODE_COMPARATOR =
             (node1, node2) -> node1.hostname().compareTo(node2.hostname());
@@ -45,12 +47,17 @@
      * @param ovsdbIp OVSDB server IP address
      * @param ovsdbPort OVSDB server port number
      * @param bridgeId integration bridge identifier
+     * @param phyPortName physical port name
+     * @param localIp local ip address of data plane
      */
-    public CordVtnNode(String hostname, IpAddress ovsdbIp, TpPort ovsdbPort, DeviceId bridgeId) {
+    public CordVtnNode(String hostname, IpAddress ovsdbIp, TpPort ovsdbPort,
+                       DeviceId bridgeId, String phyPortName, IpAddress localIp) {
         this.hostname = checkNotNull(hostname);
         this.ovsdbIp = checkNotNull(ovsdbIp);
         this.ovsdbPort = checkNotNull(ovsdbPort);
         this.bridgeId = checkNotNull(bridgeId);
+        this.phyPortName = checkNotNull(phyPortName);
+        this.localIp = checkNotNull(localIp);
     }
 
     /**
@@ -98,6 +105,24 @@
         return DeviceId.deviceId("ovsdb:" + this.ovsdbIp.toString());
     }
 
+    /**
+     * Returns physical port name.
+     *
+     * @return physical port name
+     */
+    public String phyPortName() {
+        return this.phyPortName;
+    }
+
+    /**
+     * Returns local IP address.
+     *
+     * @return ip address
+     */
+    public IpAddress localIp() {
+        return this.localIp;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -106,10 +131,7 @@
 
         if (obj instanceof CordVtnNode) {
             CordVtnNode that = (CordVtnNode) obj;
-            if (Objects.equals(hostname, that.hostname) &&
-                    Objects.equals(ovsdbIp, that.ovsdbIp) &&
-                    Objects.equals(ovsdbPort, that.ovsdbPort) &&
-                    Objects.equals(bridgeId, that.bridgeId)) {
+            if (Objects.equals(hostname, that.hostname)) {
                 return true;
             }
         }
@@ -128,6 +150,8 @@
                 .add("ip", ovsdbIp)
                 .add("port", ovsdbPort)
                 .add("bridgeId", bridgeId)
+                .add("phyPortName", phyPortName)
+                .add("localIp", localIp)
                 .toString();
     }
 }