commit 5807dfc18987017ef15bf7e24357e3ec505f5d63
author Nicolas Palpacuer <np202g@att.com> Mon Aug 27 15:47:03 2018 -0400
committer Nicolas Palpacuer <np202g@att.com> Mon Aug 27 21:29:49 2018 +0000
tree a0f61381cedd55b919b86b2f03d3c67f5a3ff8c1
parent 6093c1a8bb935dcbbe6f5a6d52bc64bd06185158

VOL-789 If enable on activating device, go back to waiting for activation

Change-Id: Iaff40006ff4e7e9b2f690230ca2d69c8eaedf6e0

cli/main.py

diff --git a/cli/main.py b/cli/main.py
index 441b292..6ca318a 100755
--- a/cli/main.py
+++ b/cli/main.py
@@ -350,10 +350,12 @@
             stub = self.get_stub()
             device = stub.GetDevice(voltha_pb2.ID(id=device_id))
             if device.admin_state == voltha_pb2.AdminState.ENABLED:
-                self.poutput('Error: Device is already enabled')
-                return
-            stub.EnableDevice(voltha_pb2.ID(id=device_id))
-            self.poutput('enabling {}'.format(device_id))
+                if device.oper_status != voltha_pb2.OperStatus.ACTIVATING:
+                    self.poutput('Error: Device is already enabled')
+                    return
+            else:
+                stub.EnableDevice(voltha_pb2.ID(id=device_id))
+                self.poutput('enabling {}'.format(device_id))
 
             while True:
                 device = stub.GetDevice(voltha_pb2.ID(id=device_id))