VOL-2970 - Improved readability & traceability of startup code.
Changed Start() function to implement majority of the startup functionality, with less helpers. Start() also defines local variables for each component created, to avoid accidentally using a component that isn't ready.
Also merged the rwCore into the Core.
Also changed Core to cancel a local context to on shutdown, and then wait for shutdown to complete.
Change-Id: I285e8486773476531e20ec352ff85a1b145432bf
diff --git a/rw_core/core/device/agent_test.go b/rw_core/core/device/agent_test.go
index 8b003b4..2abfdeb 100755
--- a/rw_core/core/device/agent_test.go
+++ b/rw_core/core/device/agent_test.go
@@ -144,23 +144,13 @@
if err = dat.kmp.Start(); err != nil {
logger.Fatal("Cannot start InterContainerProxy")
}
- if err = adapterMgr.Start(context.Background()); err != nil {
- logger.Fatal("Cannot start adapterMgr")
- }
- dat.deviceMgr.Start(context.Background())
- dat.logicalDeviceMgr.Start(context.Background())
+ adapterMgr.Start(context.Background())
}
func (dat *DATest) stopAll() {
if dat.kClient != nil {
dat.kClient.Stop()
}
- if dat.logicalDeviceMgr != nil {
- dat.logicalDeviceMgr.Stop(context.Background())
- }
- if dat.deviceMgr != nil {
- dat.deviceMgr.Stop(context.Background())
- }
if dat.kmp != nil {
dat.kmp.Stop()
}