[VOL-2694] Use package specific logger instance in all log statements
Change-Id: Icf1cb5ade42e42179aed7731b767af2f52481e3d
diff --git a/tests/utils/common.go b/tests/utils/common.go
new file mode 100644
index 0000000..bef91e2
--- /dev/null
+++ b/tests/utils/common.go
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Package utils Common Logger initialization
+package utils
+
+import (
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+)
+
+var logger log.Logger
+
+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"})
+ if err != nil {
+ panic(err)
+ }
+}
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
index 655e942..3aaf89b 100644
--- a/tests/utils/test_utils.go
+++ b/tests/utils/test_utils.go
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package core
+package utils
import (
"context"
@@ -455,19 +455,19 @@
func StopSimulatedEnv(composePath string) error {
err := stopSimulatedOLTAndONUAdapters(composePath)
if err != nil {
- log.Errorw("unable-to-stop-simulated-olt-onu-adapters", log.Fields{"error": err})
+ logger.Errorw("unable-to-stop-simulated-olt-onu-adapters", log.Fields{"error": err})
}
err = stopCore(composePath)
if err != nil {
- log.Errorw("unable-to-stop-core", log.Fields{"error": err})
+ logger.Errorw("unable-to-stop-core", log.Fields{"error": err})
}
err = stopKafka(composePath)
if err != nil {
- log.Errorw("unable-to-stop-kafka", log.Fields{"error": err})
+ logger.Errorw("unable-to-stop-kafka", log.Fields{"error": err})
}
err = stopEtcd(composePath)
if err != nil {
- log.Errorw("unable-to-stop-etcd", log.Fields{"error": err})
+ logger.Errorw("unable-to-stop-etcd", log.Fields{"error": err})
}
return nil
}