commit 50ad080683317df192a0f7159d9902dc1c403ed2
author Deepa Vaddireddy <dvaddire@partner.ciena.com> Mon Aug 08 19:27:36 2016 +0530
committer sdn <dvaddire@partner.ciena.com> Fri Aug 26 03:22:47 2016 -0700
tree 0da21c3f3377c4ce0ab67e6bca522d42c324d8e0
parent 36dd8f1608a728c546425fd9bf782edd65b3a8e7

Fix for ONOS-5032 and ONOS-5034

Change-Id: Ib964252dd05754ce7069a7a82ccb1d1c29bfa978

core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
index 3503eca..74fbbe9 100644
--- a/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
@@ -21,6 +21,7 @@
 import org.onosproject.net.AbstractDescription;
 import org.onosproject.net.HostLocation;
 import org.onosproject.net.SparseAnnotations;
+import org.onosproject.store.service.WallClockTimestamp;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
@@ -40,6 +41,7 @@
     private final VlanId vlan;
     private final HostLocation location;
     private final Set<IpAddress> ip;
+    private final WallClockTimestamp timestamp;
 
     /**
      * Creates a host description using the supplied information.
@@ -83,11 +85,28 @@
     public DefaultHostDescription(MacAddress mac, VlanId vlan,
                                   HostLocation location, Set<IpAddress> ip,
                                   SparseAnnotations... annotations) {
+        this(mac, vlan, location, ip, new WallClockTimestamp(), annotations);
+    }
+
+    /**
+     * Creates a host description using the supplied information.
+     *
+     * @param mac         host MAC address
+     * @param vlan        host VLAN identifier
+     * @param location    host location
+     * @param ip          host IP addresses
+     * @param timestamp     host recent updated time
+     * @param annotations optional key/value annotations map
+     */
+    public DefaultHostDescription(MacAddress mac, VlanId vlan,
+                                  HostLocation location, Set<IpAddress> ip,
+                                  WallClockTimestamp timestamp, SparseAnnotations... annotations) {
         super(annotations);
         this.mac = mac;
         this.vlan = vlan;
         this.location = location;
         this.ip = ImmutableSet.copyOf(ip);
+        this.timestamp = timestamp;
     }
 
     @Override
@@ -111,12 +130,18 @@
     }
 
     @Override
+    public WallClockTimestamp timestamp() {
+        return timestamp;
+    }
+
+    @Override
     public String toString() {
         return toStringHelper(this)
                 .add("mac", mac)
                 .add("vlan", vlan)
                 .add("location", location)
                 .add("ipAddress", ip)
+                .add("timestamp", timestamp)
                 .toString();
     }
 
@@ -139,5 +164,4 @@
         }
         return false;
     }
-
 }

core/api/src/main/java/org/onosproject/net/host/HostDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/host/HostDescription.java b/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
index ad423a3..dd25339 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
@@ -22,6 +22,7 @@
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
+import org.onosproject.store.service.WallClockTimestamp;
 
 /**
  * Information describing host and its location.
@@ -55,4 +56,12 @@
      * @return host IP address
      */
     Set<IpAddress> ipAddress();
+
+    /**
+     * Returns the host recent updated Time.
+     * @return host last updated time.
+     */
+    default WallClockTimestamp timestamp() {
+        return null;
+    }
 }