commit d35113e06d6c08bd7544926b94ca018fcc18035b
author heisenberg <aganno2@gmail.com> Thu Apr 28 06:12:34 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 04 17:11:28 2016 +0000
tree d0886a7e1e36200590d496e3748775083d10e2ff
parent 0a011be91ee231467ba27b4312313baf109e19f7

[ONOS-4476]As with Group type is FAILOVER,watchPort&watchGroup does not set correctly When builds the Group Modification Openflow message

Change-Id: I344e3b03cd18e16f4e30ceb5b67ce9e55e871876

providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java

diff --git a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
old mode 100644
new mode 100755
index 1f1491c..ce2df5f
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupModBuilder.java
@@ -194,8 +194,17 @@
             if (type == GroupDescription.Type.SELECT) {
                 bucketBuilder.setWeight(1);
             }
-            bucketBuilder.setWatchGroup(OFGroup.ANY);
-            bucketBuilder.setWatchPort(OFPort.ANY);
+            if (type == GroupDescription.Type.FAILOVER && bucket.watchPort() != null) {
+                bucketBuilder.setWatchPort(OFPort.of((int) bucket.watchPort().toLong()));
+            } else {
+                bucketBuilder.setWatchPort(OFPort.ANY);
+            }
+            if (type == GroupDescription.Type.FAILOVER &&  bucket.watchGroup() != null) {
+                bucketBuilder.setWatchGroup(OFGroup.of(bucket.watchGroup().id()));
+            } else {
+                bucketBuilder.setWatchGroup(OFGroup.ANY);
+            }
+
             OFBucket ofBucket = bucketBuilder.build();
             ofBuckets.add(ofBucket);
         }