VOL-4529 Allowing force delete while reconciling device
Change-Id: I799c4246618b55a0439f86e634887ee922f8b68d
diff --git a/VERSION b/VERSION
index b502146..0f9d6b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.2
+3.1.0-dev
diff --git a/rw_core/core/device/agent_transient_state.go b/rw_core/core/device/agent_transient_state.go
index ea105dd..51d08ff 100644
--- a/rw_core/core/device/agent_transient_state.go
+++ b/rw_core/core/device/agent_transient_state.go
@@ -62,9 +62,7 @@
}
func (agent *Agent) isForceDeletingAllowed(deviceTransientState core.DeviceTransientState_Types, device *voltha.Device) bool {
- return deviceTransientState != core.DeviceTransientState_FORCE_DELETING &&
- (device.OperStatus != common.OperStatus_RECONCILING ||
- !agent.matchTransientState(core.DeviceTransientState_RECONCILE_IN_PROGRESS))
+ return deviceTransientState != core.DeviceTransientState_FORCE_DELETING
}
func (agent *Agent) deleteTransientState(ctx context.Context) error {