Wipe out all packet requests when using the `wipeOut` command.
Change-Id: I76e451b3271acad567a5774d298b3b4d2896630c
diff --git a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
index 868566c..8d51054 100644
--- a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
@@ -36,6 +36,8 @@
import org.onosproject.net.intent.Key;
import org.onosproject.net.link.LinkAdminService;
import org.onosproject.net.meter.MeterService;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.packet.PacketRequest;
import org.onosproject.net.region.RegionAdminService;
import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiTopoLayoutService;
@@ -76,6 +78,7 @@
wipeOutDevices();
wipeOutLinks();
wipeOutNetworkConfig();
+ wipeOutPacketRequests();
wipeOutLayouts();
wipeOutRegions();
@@ -186,6 +189,14 @@
}
}
+ private void wipeOutPacketRequests() {
+ print("Wiping packet requests");
+ PacketService service = get(PacketService.class);
+ for (PacketRequest r : service.getRequests()) {
+ service.cancelPackets(r.selector(), r.priority(), r.appId(), r.deviceId());
+ }
+ }
+
private void wipeOutLayouts() {
print("Wiping UI layouts");
UiTopoLayoutService service = get(UiTopoLayoutService.class);