commit f468de86cc04f59e30eb065dbf4a0e5620a52117
author Venkata Telu <venkata_telu@labs.att.com> Tue Aug 07 13:03:58 2018 -0500
committer Luca Prete <luca@opennetworking.org> Mon Aug 20 18:58:40 2018 +0000
tree 5a1ad6d55cd63e67d590fc136aeeafd7e8c214a3
parent 530887d32bb9def28f520809ab2a28cc702f1cc8

VOL-750: error format of disable cli

Change-Id: I6911ee765799919baba08182b3b9d2fd17141fc5

cli/main.py

diff --git a/cli/main.py b/cli/main.py
index 523ea62..218d384 100755
--- a/cli/main.py
+++ b/cli/main.py
@@ -416,10 +416,17 @@
         Disable a device. ID of the device needs to be provided
         """
         device_id = line
-        self.poutput('disabling {}'.format(device_id))
+        if device_id not in self.device_ids():
+            self.poutput('Error: There is no such device')
+            return
         try:
             stub = self.get_stub()
+            device = stub.GetDevice(voltha_pb2.ID(id=device_id))
+            if device.admin_state == voltha_pb2.AdminState.DISABLED:
+                self.poutput('Error: Device is already disabled')
+                return
             stub.DisableDevice(voltha_pb2.ID(id=device_id))
+            self.poutput('disabling {}'.format(device_id))
 
             # Do device query and verify that the device admin status is
             # DISABLED and Operational Status is unknown