diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java
index 40a17d4..1f7d40d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java
@@ -29,12 +29,14 @@
  *
  * This is a temporary development tool for use until yang integration is complete.
  * This uses a not properly specified behavior. DO NOT USE AS AN EXAMPLE.
+ *
+ * @deprecated in 1.10.0
  */
 
 //FIXME this should eventually be removed.
-
+@Deprecated
 @Command(scope = "onos", name = "device-configuration",
-        description = "Gets the configuration of the specified type from the" +
+        description = "[Deprecated]Gets the configuration of the specified type from the" +
                 "specified device.")
 public class DeviceConfigGetterCommand extends AbstractShellCommand {
 
@@ -48,6 +50,7 @@
 
     @Override
     protected void execute() {
+        print("[WARN] This command was marked deprecated in 1.10.0");
         DriverService service = get(DriverService.class);
         deviceId = DeviceId.deviceId(uri);
         DriverHandler h = service.createHandler(deviceId);
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java
index 2156a06..4b88266 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java
@@ -31,13 +31,15 @@
  *
  * This is a temporary development tool for use until yang integration is complete.
  * This uses a not properly specified behavior. DO NOT USE AS AN EXAMPLE.
+ *
+ * @deprecated in 1.10.0
  */
 //Temporary Developer tool, NOT TO BE USED in production or as example for
 // future commands.
 //FIXME this should eventually be removed.
-
+@Deprecated
 @Command(scope = "onos", name = "device-setconfiguration",
-        description = "Sets the configuration of the specified file to the " +
+        description = "[Deprecated]Sets the configuration of the specified file to the " +
                 "specified device.")
 public class DeviceConfigSetterCommand extends AbstractShellCommand {
 
@@ -51,6 +53,7 @@
 
     @Override
     protected void execute() {
+        print("[WARN] This command was marked deprecated in 1.10.0");
         DriverService service = get(DriverService.class);
         deviceId = DeviceId.deviceId(uri);
         DriverHandler h = service.createHandler(deviceId);
diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicePortGetterCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicePortGetterCommand.java
index 9956a2a..28018ff 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicePortGetterCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicePortGetterCommand.java
@@ -29,10 +29,12 @@
  *
  * This is a temporary development tool for use until yang integration is complete.
  * This uses a not properly specified behavior. DO NOT USE AS AN EXAMPLE.
+ *
+ * @deprecated in 1.10.0
  */
-
+@Deprecated
 @Command(scope = "onos", name = "device-ports",
-        description = "Gets the ports of the specified device.")
+        description = "[Deprecated]Gets the ports of the specified device.")
 public class DevicePortGetterCommand extends AbstractShellCommand {
 
     @Argument(index = 0, name = "uri", description = "Device ID",
@@ -42,6 +44,7 @@
 
     @Override
     protected void execute() {
+        print("[WARN] This command was marked deprecated in 1.10.0");
         DriverService service = get(DriverService.class);
         deviceId = DeviceId.deviceId(uri);
         DriverHandler h = service.createHandler(deviceId);
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index e5bf7fb..7d58b82 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -157,18 +157,21 @@
             <action class="org.onosproject.cli.net.DeviceConfigGetterCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
+                <null/>
             </completers>
         </command>
         <command>
             <action class="org.onosproject.cli.net.DeviceConfigSetterCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
+                <null/>
             </completers>
         </command>
         <command>
             <action class="org.onosproject.cli.net.DevicePortGetterCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
+                <null/>
             </completers>
         </command>
         <command>