[VOL-3187]Pass Context down the execution call hierarchy across voltha-go codebase
Change-Id: I6bc2a0f7226c1beed4ae01a15d7b5c4dc04358d8
diff --git a/tests/utils/common.go b/tests/utils/common.go
index bef91e2..f81e3b8 100644
--- a/tests/utils/common.go
+++ b/tests/utils/common.go
@@ -21,12 +21,12 @@
"github.com/opencord/voltha-lib-go/v3/pkg/log"
)
-var logger log.Logger
+var logger log.CLogger
func init() {
// Setup this package so that it's log level can be modified at run time
var err error
- logger, err = log.AddPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "utils"})
+ logger, err = log.RegisterPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "utils"})
if err != nil {
panic(err)
}
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
index 3aaf89b..9f8fbc8 100644
--- a/tests/utils/test_utils.go
+++ b/tests/utils/test_utils.go
@@ -452,22 +452,22 @@
}
// StopSimulatedEnv stops kafka, etcd, olt, onu adapters, core
-func StopSimulatedEnv(composePath string) error {
+func StopSimulatedEnv(ctx context.Context, composePath string) error {
err := stopSimulatedOLTAndONUAdapters(composePath)
if err != nil {
- logger.Errorw("unable-to-stop-simulated-olt-onu-adapters", log.Fields{"error": err})
+ logger.Errorw(ctx, "unable-to-stop-simulated-olt-onu-adapters", log.Fields{"error": err})
}
err = stopCore(composePath)
if err != nil {
- logger.Errorw("unable-to-stop-core", log.Fields{"error": err})
+ logger.Errorw(ctx, "unable-to-stop-core", log.Fields{"error": err})
}
err = stopKafka(composePath)
if err != nil {
- logger.Errorw("unable-to-stop-kafka", log.Fields{"error": err})
+ logger.Errorw(ctx, "unable-to-stop-kafka", log.Fields{"error": err})
}
err = stopEtcd(composePath)
if err != nil {
- logger.Errorw("unable-to-stop-etcd", log.Fields{"error": err})
+ logger.Errorw(ctx, "unable-to-stop-etcd", log.Fields{"error": err})
}
return nil
}