commit 67c6b81fcf73fad31ea4cf36b92927f2d414054b
author Jian Li <pyguni@gmail.com> Mon Oct 08 16:05:53 2018 +0900
committer Jian Li <pyguni@gmail.com> Wed Oct 17 09:24:12 2018 +0000
tree bb7ccd2c309eb3f8640c0ce3415c2beb329dd0cb
parent 908cff4847cf48a62fdf7bb57d776ef165db29bc

Allow to remove instance ports in pending removal state

Change-Id: I2924be30f57c0d33ec79d522e7144d67b9825bd0

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/PurgeInstancePortsCommand.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/PurgeInstancePortsCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/PurgeInstancePortsCommand.java
index b785369..08ccd45 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/PurgeInstancePortsCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/PurgeInstancePortsCommand.java
@@ -23,6 +23,7 @@
 import org.onosproject.openstacknetworking.api.InstancePortAdminService;
 
 import static org.onosproject.openstacknetworking.api.InstancePort.State.INACTIVE;
+import static org.onosproject.openstacknetworking.api.InstancePort.State.REMOVE_PENDING;
 
 /**
  * Purges existing instance ports.
@@ -40,6 +41,11 @@
             required = false, multiValued = false)
     private boolean isInactive = false;
 
+    @Option(name = "-p", aliases = "--pending",
+            description = "Instance ports in pending removal state",
+            required = false, multiValued = false)
+    private boolean isPending = false;
+
     @Argument(index = 0, name = "portIds", description = "Instance Port IDs",
             required = false, multiValued = true)
     private String[] portIds = null;
@@ -48,11 +54,12 @@
     protected void execute() {
         InstancePortAdminService service = get(InstancePortAdminService.class);
 
-        if ((!isAll && !isInactive && portIds == null) ||
-                (isAll && isInactive) ||
-                (isInactive && portIds != null) ||
-                (portIds != null && isAll)) {
-            print("Please specify one of portIds, --all, and --inactive options.");
+        if ((!isAll && !isInactive && !isPending && portIds == null) ||
+                (isAll && isInactive && isPending) ||
+                (isInactive && isPending && portIds != null) ||
+                (portIds != null && isAll && isPending) ||
+                (isAll && isInactive && portIds != null)) {
+            print("Please specify one of portIds, --all or --inactive or --pending options.");
             return;
         }
 
@@ -63,6 +70,10 @@
             portIds = service.instancePorts().stream()
                              .filter(p -> p.state() == INACTIVE)
                              .map(InstancePort::portId).toArray(String[]::new);
+        } else if (isPending) {
+            portIds = service.instancePorts().stream()
+                             .filter(p -> p.state() == REMOVE_PENDING)
+                             .map(InstancePort::portId).toArray(String[]::new);
         }
 
         for (String portId : portIds) {