diff --git a/cli/src/main/java/org/onosproject/cli/net/PortStateCompleter.java b/cli/src/main/java/org/onosproject/cli/net/PortStateCompleter.java
new file mode 100644
index 0000000..e9accbe
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/PortStateCompleter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * 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.cli.net;
+
+import java.util.List;
+
+import org.onosproject.cli.AbstractChoicesCompleter;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * PortState completer.
+ *
+ * Assumes argument right before the one being completed is PortNumber.
+ */
+public class PortStateCompleter extends AbstractChoicesCompleter {
+
+    @Override
+    protected List<String> choices() {
+        return ImmutableList.of("enable", "disable");
+    }
+}