commit ed12ae5e81d0da5b2192667d0f2ded93995b8afc
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Mon Feb 09 14:43:19 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 17 17:58:49 2015 +0000
tree 34cdb8fd0b03934ece19540959a6a42602511fbd
parent 77bdd26ac6104df9eea44b1dabfd491f66240cc9

ONOS-985: Sample integration test application for group subsystem

Change-Id: I68352f922e5c7a0800fcc4fa839955769bf925a6

core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java

diff --git a/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java b/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java
index eba2c6c..9248625 100644
--- a/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java
+++ b/core/api/src/main/java/org/onosproject/net/group/DefaultGroup.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.group;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.Objects;
@@ -205,4 +206,13 @@
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        return toStringHelper(this)
+                .add("description", super.toString())
+                .add("groupid", id)
+                .add("state", state)
+                .toString();
+    }
 }

core/api/src/main/java/org/onosproject/net/group/DefaultGroupBucket.java

diff --git a/core/api/src/main/java/org/onosproject/net/group/DefaultGroupBucket.java b/core/api/src/main/java/org/onosproject/net/group/DefaultGroupBucket.java
index 931cc71..ff1271e 100644
--- a/core/api/src/main/java/org/onosproject/net/group/DefaultGroupBucket.java
+++ b/core/api/src/main/java/org/onosproject/net/group/DefaultGroupBucket.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.group;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -212,4 +213,11 @@
         return false;
     }
 
+    @Override
+    public String toString() {
+        return toStringHelper(this)
+                .add("type", type)
+                .add("treatment", treatment)
+                .toString();
+    }
 }

core/api/src/main/java/org/onosproject/net/group/DefaultGroupDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/group/DefaultGroupDescription.java b/core/api/src/main/java/org/onosproject/net/group/DefaultGroupDescription.java
index 8d374c1..385a5d6 100644
--- a/core/api/src/main/java/org/onosproject/net/group/DefaultGroupDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/group/DefaultGroupDescription.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.group;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Objects;
@@ -168,4 +169,13 @@
         return false;
     }
 
+    @Override
+    public String toString() {
+        return toStringHelper(this)
+                .add("deviceId", deviceId)
+                .add("type", type)
+                .add("buckets", buckets)
+                .add("appId", appId)
+                .toString();
+    }
 }
\ No newline at end of file

core/api/src/main/java/org/onosproject/net/group/GroupBuckets.java

diff --git a/core/api/src/main/java/org/onosproject/net/group/GroupBuckets.java b/core/api/src/main/java/org/onosproject/net/group/GroupBuckets.java
index 5ca8f30..26cd5f6 100644
--- a/core/api/src/main/java/org/onosproject/net/group/GroupBuckets.java
+++ b/core/api/src/main/java/org/onosproject/net/group/GroupBuckets.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.net.group;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
@@ -66,4 +67,10 @@
         return false;
     }
 
+    @Override
+    public String toString() {
+        return toStringHelper(this)
+                .add("buckets", buckets)
+                .toString();
+    }
 }
\ No newline at end of file

core/api/src/main/java/org/onosproject/net/group/GroupStore.java

diff --git a/core/api/src/main/java/org/onosproject/net/group/GroupStore.java b/core/api/src/main/java/org/onosproject/net/group/GroupStore.java
index 6803b58..e7bf4f8 100644
--- a/core/api/src/main/java/org/onosproject/net/group/GroupStore.java
+++ b/core/api/src/main/java/org/onosproject/net/group/GroupStore.java
@@ -132,8 +132,9 @@
      * Indicates the first group audit is completed.
      *
      * @param deviceId the device ID
+     * @param completed initial audit status
      */
-    void deviceInitialAuditCompleted(DeviceId deviceId);
+    void deviceInitialAuditCompleted(DeviceId deviceId, boolean completed);
 
     /**
      * Retrieves the initial group audit status for a device.