[ONOS-5169] GroupStore: properly add updated buckets
Adding buckets to group was ignoring the addition of groups
with different weights because they had the same treatment
and type. We'll now update such groupbuckets with the desired new
parameters.
Change-Id: I5f102c5fd78912844883c897bd858ee282f3cc12
diff --git a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
index 9a951a6..288d8de 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
@@ -60,6 +60,7 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
import static org.onosproject.net.NetTestTools.APP_ID;
import static org.onosproject.net.NetTestTools.did;
import static org.onosproject.net.group.GroupDescription.Type.*;
@@ -390,7 +391,7 @@
public void testUpdateGroupDescription() {
GroupBuckets buckets =
- new GroupBuckets(ImmutableList.of(failoverGroupBucket));
+ new GroupBuckets(ImmutableList.of(failoverGroupBucket, selectGroupBucket));
groupStore.deviceInitialAuditCompleted(deviceId1, true);
groupStore.storeGroupDescription(groupDescription1);
@@ -404,6 +405,27 @@
Group group1 = groupStore.getGroup(deviceId1, groupId1);
assertThat(group1.appCookie(), is(newKey));
assertThat(group1.buckets().buckets(), hasSize(2));
+
+ short weight = 5;
+ GroupBucket selectGroupBucketWithWeight =
+ DefaultGroupBucket.createSelectGroupBucket(treatment, weight);
+ buckets = new GroupBuckets(ImmutableList.of(failoverGroupBucket,
+ selectGroupBucketWithWeight));
+
+ groupStore.updateGroupDescription(deviceId1,
+ newKey,
+ ADD,
+ buckets,
+ newKey);
+
+ group1 = groupStore.getGroup(deviceId1, groupId1);
+ assertThat(group1.appCookie(), is(newKey));
+ assertThat(group1.buckets().buckets(), hasSize(2));
+ for (GroupBucket bucket : group1.buckets().buckets()) {
+ if (bucket.type() == SELECT) {
+ assertEquals(weight, bucket.weight());
+ }
+ }
}
@Test