Moved event bus to common lib
Change-Id: I530498db2d4fd3ba644dd4a92e0b6ce74bce3a27
diff --git a/chameleon/main.py b/chameleon/main.py
index 0065b66..805acba 100755
--- a/chameleon/main.py
+++ b/chameleon/main.py
@@ -32,7 +32,7 @@
from chameleon.web_server.web_server import WebServer
from common.utils.dockerhelpers import get_my_containers_name
from common.utils.nethelpers import get_my_primary_local_ipv4
-from common.utils.structlog_setup import setup_logging
+from common.structlog_setup import setup_logging
defs = dict(
diff --git a/voltha/core/event_bus.py b/common/event_bus.py
similarity index 100%
rename from voltha/core/event_bus.py
rename to common/event_bus.py
diff --git a/common/utils/structlog_setup.py b/common/structlog_setup.py
similarity index 100%
rename from common/utils/structlog_setup.py
rename to common/structlog_setup.py
diff --git a/ofagent/main.py b/ofagent/main.py
index 1d6149e..3e31e31 100755
--- a/ofagent/main.py
+++ b/ofagent/main.py
@@ -16,13 +16,14 @@
#
import argparse
import os
+
import yaml
from twisted.internet import reactor
from twisted.internet.defer import inlineCallbacks
+from common.structlog_setup import setup_logging
from common.utils.dockerhelpers import get_my_containers_name
from common.utils.nethelpers import get_my_primary_local_ipv4
-from common.utils.structlog_setup import setup_logging
from connection_mgr import ConnectionManager
defs = dict(
diff --git a/podder/main.py b/podder/main.py
index cd515e6..1da0b41 100755
--- a/podder/main.py
+++ b/podder/main.py
@@ -17,11 +17,13 @@
import argparse
import os
-from consul_mgr import ConsulManager
-from twisted.internet.defer import inlineCallbacks
-from common.utils.nethelpers import get_my_primary_local_ipv4
-from common.utils.structlog_setup import setup_logging
+
import yaml
+from twisted.internet.defer import inlineCallbacks
+
+from common.structlog_setup import setup_logging
+from common.utils.nethelpers import get_my_primary_local_ipv4
+from consul_mgr import ConsulManager
defs = dict(
config=os.environ.get('CONFIG', './podder.yml'),
diff --git a/tests/utests/common/__init__.py b/tests/utests/common/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/utests/common/__init__.py
diff --git a/tests/utests/voltha/core/test_event_bus.py b/tests/utests/common/test_event_bus.py
similarity index 98%
rename from tests/utests/voltha/core/test_event_bus.py
rename to tests/utests/common/test_event_bus.py
index f937722..532befb 100644
--- a/tests/utests/voltha/core/test_event_bus.py
+++ b/tests/utests/common/test_event_bus.py
@@ -20,7 +20,7 @@
from twisted.internet.defer import DeferredQueue, inlineCallbacks
from twisted.trial.unittest import TestCase
-from voltha.core.event_bus import EventBusClient, EventBus
+from common.event_bus import EventBusClient, EventBus
class TestEventBus(TestCase):
diff --git a/voltha/main.py b/voltha/main.py
index a9a0157..c4ed67b 100755
--- a/voltha/main.py
+++ b/voltha/main.py
@@ -19,20 +19,19 @@
import argparse
import os
-import sys
import time
import yaml
from twisted.internet.defer import inlineCallbacks
-from voltha.coordinator import Coordinator
+from common.structlog_setup import setup_logging
from common.utils.dockerhelpers import get_my_containers_name
from common.utils.nethelpers import get_my_primary_interface, \
get_my_primary_local_ipv4
+from voltha.coordinator import Coordinator
from voltha.northbound.grpc.grpc_server import VolthaGrpcServer
-from voltha.northbound.rest.health_check import init_rest_service
-from common.utils.structlog_setup import setup_logging
from voltha.northbound.kafka.kafka_proxy import KafkaProxy, get_kafka_proxy
+from voltha.northbound.rest.health_check import init_rest_service
defs = dict(
config=os.environ.get('CONFIG', './voltha.yml'),