VOL-5298:OpenOnuAdapterGo: Panic during scale tests if large number of ONTS flap during ACTIVATION
[VOL-5331] - Sanity E2E Test for OLT/ONU on POD for DT :: Validates E2E Ping Co... | FAIL |
Change-Id: I369de3b525c4e0db4dbf1527494320826bd0f7de
Signed-off-by: PRANEETH NALMAS <praneeth.nalmas@radisys.com>
diff --git a/VERSION b/VERSION
index 20e4310..61f7501 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.0-dev2
+2.12.0-dev3
diff --git a/internal/pkg/common/interfaces.go b/internal/pkg/common/interfaces.go
index cf79c06..eff1cd5 100755
--- a/internal/pkg/common/interfaces.go
+++ b/internal/pkg/common/interfaces.go
@@ -126,6 +126,7 @@
CreatePortInCore(context.Context, *voltha.Port) error
PerOnuFlowHandlerRoutine(uniID uint8)
+ GetDeviceDeleteCommChan(context.Context) chan bool
}
// IonuDeviceEntry interface to onuDeviceEntry
diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 08045c9..c4dd037 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -4690,6 +4690,10 @@
return resp
}
+func (dh *deviceHandler) GetDeviceDeleteCommChan(ctx context.Context) chan bool {
+ return dh.deviceDeleteCommChan
+}
+
// PrepareForGarbageCollection - remove references to prepare for garbage collection
func (dh *deviceHandler) PrepareForGarbageCollection(ctx context.Context, aDeviceID string) {
logger.Debugw(ctx, "prepare for garbage collection", log.Fields{"device-id": aDeviceID})
diff --git a/internal/pkg/mib/mib_download.go b/internal/pkg/mib/mib_download.go
index ea1ce40..921043a 100755
--- a/internal/pkg/mib/mib_download.go
+++ b/internal/pkg/mib/mib_download.go
@@ -405,5 +405,9 @@
// should not happen so far
logger.Warnw(ctx, "MibDownload-bridge-init response error", log.Fields{"for device-id": onuDeviceEntry.deviceID})
return fmt.Errorf("mibDownloadBridgeInit responseError %s", onuDeviceEntry.deviceID)
+ case <-onuDeviceEntry.baseDeviceHandler.GetDeviceDeleteCommChan(ctx):
+ logger.Warnw(ctx, "Deleting device, do not wait for OMCI response", log.Fields{"device-id": onuDeviceEntry.deviceID})
+ return fmt.Errorf("mibDownloadBridgeInit device deletion in progress! %s", onuDeviceEntry.deviceID)
+
}
}