diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortIdCompleter.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortIdCompleter.java
new file mode 100644
index 0000000..c18a0a4
--- /dev/null
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortIdCompleter.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.openstacknetworking.cli;
+
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+import org.onosproject.openstacknetworking.api.InstancePort;
+import org.onosproject.openstacknetworking.api.InstancePortService;
+
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.stream.Collectors;
+
+import static org.onosproject.cli.AbstractShellCommand.get;
+
+/**
+ * Instance port ID completer.
+ */
+public class InstancePortIdCompleter implements Completer {
+
+    @Override
+    public int complete(String buffer, int cursor, List<String> candidates) {
+        StringsCompleter delegate = new StringsCompleter();
+
+        InstancePortService service = get(InstancePortService.class);
+        Set<String> portIds = service.instancePorts().stream()
+                                .map(InstancePort::portId).collect(Collectors.toSet());
+        SortedSet<String> strings = delegate.getStrings();
+
+        strings.addAll(portIds);
+
+        return delegate.complete(buffer, cursor, candidates);
+    }
+}
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
new file mode 100644
index 0000000..b785369
--- /dev/null
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/PurgeInstancePortsCommand.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.openstacknetworking.cli;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.openstacknetworking.api.InstancePort;
+import org.onosproject.openstacknetworking.api.InstancePortAdminService;
+
+import static org.onosproject.openstacknetworking.api.InstancePort.State.INACTIVE;
+
+/**
+ * Purges existing instance ports.
+ */
+@Command(scope = "onos", name = "purge-instance-ports",
+        description = "Purges existing instance ports created by OpenStack networking app")
+public class PurgeInstancePortsCommand extends AbstractShellCommand {
+
+    @Option(name = "-a", aliases = "--all", description = "All of instance ports",
+            required = false, multiValued = false)
+    private boolean isAll = false;
+
+    @Option(name = "-i", aliases = "--inactive",
+            description = "Instance ports in inactive state",
+            required = false, multiValued = false)
+    private boolean isInactive = false;
+
+    @Argument(index = 0, name = "portIds", description = "Instance Port IDs",
+            required = false, multiValued = true)
+    private String[] portIds = null;
+
+    @Override
+    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.");
+            return;
+        }
+
+        if (isAll) {
+            portIds = service.instancePorts().stream()
+                             .map(InstancePort::portId).toArray(String[]::new);
+        } else if (isInactive) {
+            portIds = service.instancePorts().stream()
+                             .filter(p -> p.state() == INACTIVE)
+                             .map(InstancePort::portId).toArray(String[]::new);
+        }
+
+        for (String portId : portIds) {
+            service.removeInstancePort(portId);
+            print("Instance port %s has been removed!", portId);
+        }
+        print("Done.");
+    }
+}
diff --git a/apps/openstacknetworking/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/openstacknetworking/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index da387fb..b362e1a 100644
--- a/apps/openstacknetworking/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/openstacknetworking/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -83,10 +83,17 @@
         <command>
             <action class="org.onosproject.openstacknetworking.cli.InstancePortListCommand" />
         </command>
+        <command>
+            <action class="org.onosproject.openstacknetworking.cli.PurgeInstancePortsCommand" />
+            <completers>
+                <ref component-id="instancePortIdCompleter"/>
+            </completers>
+        </command>
     </command-bundle>
 
     <bean id="ipAddressCompleter" class="org.onosproject.openstacknetworking.cli.IpAddressCompleter"/>
     <bean id="macAddressCompleter" class="org.onosproject.openstacknetworking.cli.MacAddressCompleter"/>
     <bean id="vlanIdCompleter" class="org.onosproject.openstacknetworking.cli.VlanIdCompleter"/>
     <bean id="arpModeCompleter" class="org.onosproject.openstacknetworking.cli.ArpModeCompleter"/>
+    <bean id="instancePortIdCompleter" class="org.onosproject.openstacknetworking.cli.InstancePortIdCompleter"/>
 </blueprint>
