Add group rule service, purge flood rules, use group to handle ARP
Change-Id: If0db889d6ab28a4d36f433f16bf84241d2726045
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
index 40d07f5..8837a65 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
@@ -56,6 +56,8 @@
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.group.DefaultGroupKey;
+import org.onosproject.net.group.GroupKey;
import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.PacketService;
import org.onosproject.openstacknetworking.api.Constants.VnicType;
@@ -1321,6 +1323,16 @@
}
/**
+ * Obtains flow group key from the given id.
+ *
+ * @param groupId flow group identifier
+ * @return flow group key
+ */
+ public static GroupKey getGroupKey(int groupId) {
+ return new DefaultGroupKey((Integer.toString(groupId)).getBytes());
+ }
+
+ /**
* Builds up and a complete endpoint URL from gateway node.
*
* @param node gateway node
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/RulePopulatorUtil.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/RulePopulatorUtil.java
index bc7ecba..de5295c 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/RulePopulatorUtil.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/RulePopulatorUtil.java
@@ -25,11 +25,15 @@
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.driver.DriverHandler;
import org.onosproject.net.driver.DriverService;
+import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.ExtensionSelector;
import org.onosproject.net.flow.criteria.ExtensionSelectorType;
import org.onosproject.net.flow.instructions.ExtensionPropertyException;
import org.onosproject.net.flow.instructions.ExtensionTreatment;
import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
+import org.onosproject.net.group.DefaultGroupBucket;
+import org.onosproject.net.group.GroupBucket;
+import org.onosproject.net.group.GroupDescription;
import org.slf4j.Logger;
import java.util.ArrayList;
@@ -226,6 +230,32 @@
}
/**
+ * Returns the group bucket with given traffic treatment and group type.
+ *
+ * @param treatment traffic treatment
+ * @param type group type
+ * @param weight weight (only for select type)
+ * @return group bucket
+ */
+ public static GroupBucket buildGroupBucket(TrafficTreatment treatment,
+ GroupDescription.Type type, short weight) {
+ switch (type) {
+ case ALL:
+ return DefaultGroupBucket.createAllGroupBucket(treatment);
+ case SELECT:
+ if (weight == -1) {
+ return DefaultGroupBucket.createSelectGroupBucket(treatment);
+ } else {
+ return DefaultGroupBucket.createSelectGroupBucket(treatment, weight);
+ }
+ case INDIRECT:
+ return DefaultGroupBucket.createIndirectGroupBucket(treatment);
+ default:
+ return null;
+ }
+ }
+
+ /**
* Returns the nicira push extension treatment.
*
* @param device device instance