diff --git a/cli/src/main/java/org/onosproject/cli/net/AnnotatePortCommand.java b/cli/src/main/java/org/onosproject/cli/net/AnnotatePortCommand.java
index 931ea67..bab4f16 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AnnotatePortCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AnnotatePortCommand.java
@@ -17,9 +17,11 @@
 
 import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.apache.karaf.shell.api.action.Option;
 import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.completer.AnnotationKeysCompleter;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.config.NetworkConfigService;
 import org.onosproject.net.config.basics.PortAnnotationConfig;
@@ -35,10 +37,12 @@
 
     @Argument(index = 0, name = "port", description = "Device Port",
               required = true)
+    @Completion(ConnectPointCompleter.class)
     String port = null;
 
     @Argument(index = 1, name = "key", description = "Annotation key",
              required = false)
+    @Completion(AnnotationKeysCompleter.class)
     String key = null;
 
     @Argument(index = 2, name = "value",