Updated plugins with new directory structure
- Runs tests on build
Change-Id: If96693bfbc08e5c8e7e6cac98bbd3b8f0bad5f62
Signed-off-by: Helena McGough <helena.mcgough@intel.com>
diff --git a/osm_mon/__init__.py b/osm_mon/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/osm_mon/__init__.py
diff --git a/osm_mon/core/message_bus/common_consumer b/osm_mon/core/message_bus/common_consumer
index 9f261b7..e981184 100755
--- a/osm_mon/core/message_bus/common_consumer
+++ b/osm_mon/core/message_bus/common_consumer
@@ -22,8 +22,9 @@
import json
import logging
import sys
+import os
-sys.path.append("/root/MON")
+sys.path.insert(0, os.path.abspath('../'))
logging.basicConfig(filename='MON_plugins.log',
format='%(asctime)s %(message)s',
@@ -34,9 +35,9 @@
from kafka import KafkaConsumer
from kafka.errors import KafkaError
-from plugins.OpenStack.Aodh import alarming
-from plugins.OpenStack.common import Common
-from plugins.OpenStack.Gnocchi import metrics
+from osm_mon.plugins.OpenStack.Aodh import alarming
+from osm_mon.plugins.OpenStack.common import Common
+from osm_mon.plugins.OpenStack.Gnocchi import metrics
# Initialize servers
diff --git a/osm_mon/plugins/OpenStack/Aodh/alarming.py b/osm_mon/plugins/OpenStack/Aodh/alarming.py
index 5093281..b7978fb 100644
--- a/osm_mon/plugins/OpenStack/Aodh/alarming.py
+++ b/osm_mon/plugins/OpenStack/Aodh/alarming.py
@@ -25,12 +25,10 @@
import logging
-from core.message_bus.producer import KafkaProducer
+from osm_mon.core.message_bus.producer import KafkaProducer
-from plugins.OpenStack.response import OpenStack_Response
-from plugins.OpenStack.settings import Config
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.response import OpenStack_Response
+from osm_mon.plugins.OpenStack.settings import Config
log = logging.getLogger(__name__)
diff --git a/osm_mon/plugins/OpenStack/Aodh/notifier.py b/osm_mon/plugins/OpenStack/Aodh/notifier.py
index 5330197..ad12ada 100644
--- a/osm_mon/plugins/OpenStack/Aodh/notifier.py
+++ b/osm_mon/plugins/OpenStack/Aodh/notifier.py
@@ -26,6 +26,8 @@
import logging
+import os
+
import sys
import time
@@ -40,14 +42,14 @@
level=logging.INFO)
log = logging.getLogger(__name__)
-sys.path.append("/root/MON")
+sys.path.insert(0, os.path.abspath('../'))
-from core.message_bus.producer import KafkaProducer
+from osm_mon.core.message_bus.producer import KafkaProducer
-from plugins.OpenStack.Aodh.alarming import Alarming
-from plugins.OpenStack.common import Common
-from plugins.OpenStack.response import OpenStack_Response
-from plugins.OpenStack.settings import Config
+from osm_mon.plugins.OpenStack.Aodh.alarming import Alarming
+from osm_mon.plugins.OpenStack.common import Common
+from osm_mon.plugins.OpenStack.response import OpenStack_Response
+from osm_mon.plugins.OpenStack.settings import Config
class NotifierHandler(BaseHTTPRequestHandler):
diff --git a/osm_mon/plugins/OpenStack/Gnocchi/metrics.py b/osm_mon/plugins/OpenStack/Gnocchi/metrics.py
index 94641e6..8e2ab4e 100644
--- a/osm_mon/plugins/OpenStack/Gnocchi/metrics.py
+++ b/osm_mon/plugins/OpenStack/Gnocchi/metrics.py
@@ -27,12 +27,10 @@
import time
-from core.message_bus.producer import KafkaProducer
+from osm_mon.core.message_bus.producer import KafkaProducer
-from plugins.OpenStack.response import OpenStack_Response
-from plugins.OpenStack.settings import Config
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.response import OpenStack_Response
+from osm_mon.plugins.OpenStack.settings import Config
log = logging.getLogger(__name__)
diff --git a/osm_mon/plugins/OpenStack/common.py b/osm_mon/plugins/OpenStack/common.py
index 70154f2..8c9094c 100644
--- a/osm_mon/plugins/OpenStack/common.py
+++ b/osm_mon/plugins/OpenStack/common.py
@@ -26,7 +26,7 @@
from keystoneclient.v3 import client
-from plugins.OpenStack.settings import Config
+from osm_mon.plugins.OpenStack.settings import Config
import requests
diff --git a/osm_mon/plugins/OpenStack/response.py b/osm_mon/plugins/OpenStack/response.py
index 691374a..75d907e 100644
--- a/osm_mon/plugins/OpenStack/response.py
+++ b/osm_mon/plugins/OpenStack/response.py
@@ -23,9 +23,8 @@
import json
import logging
-log = logging.getLogger(__name__)
-__author__ = "Helena McGough"
+log = logging.getLogger(__name__)
schema_version = "1.0"
diff --git a/osm_mon/plugins/OpenStack/settings.py b/osm_mon/plugins/OpenStack/settings.py
index fe80641..a4b0752 100644
--- a/osm_mon/plugins/OpenStack/settings.py
+++ b/osm_mon/plugins/OpenStack/settings.py
@@ -26,7 +26,7 @@
from collections import namedtuple
-from plugins.OpenStack.singleton import Singleton
+from osm_mon.plugins.OpenStack.singleton import Singleton
import six
diff --git a/osm_mon/plugins/OpenStack/singleton.py b/osm_mon/plugins/OpenStack/singleton.py
index abfe4e2..59c5ee5 100644
--- a/osm_mon/plugins/OpenStack/singleton.py
+++ b/osm_mon/plugins/OpenStack/singleton.py
@@ -23,8 +23,6 @@
from __future__ import unicode_literals
-__author__ = "Helena McGough"
-
class Singleton(object):
"""Simple singleton class."""
diff --git a/osm_mon/test/OpenStack/test_alarm_req.py b/osm_mon/test/OpenStack/test_alarm_req.py
index 721fae9..2303506 100644
--- a/osm_mon/test/OpenStack/test_alarm_req.py
+++ b/osm_mon/test/OpenStack/test_alarm_req.py
@@ -29,10 +29,8 @@
import mock
-from plugins.OpenStack.Aodh import alarming as alarm_req
-from plugins.OpenStack.common import Common
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.Aodh import alarming as alarm_req
+from osm_mon.plugins.OpenStack.common import Common
log = logging.getLogger(__name__)
diff --git a/osm_mon/test/OpenStack/test_alarming.py b/osm_mon/test/OpenStack/test_alarming.py
index 6570570..92c21f6 100644
--- a/osm_mon/test/OpenStack/test_alarming.py
+++ b/osm_mon/test/OpenStack/test_alarming.py
@@ -29,10 +29,8 @@
import mock
-from plugins.OpenStack.Aodh import alarming as alarm_req
-from plugins.OpenStack.common import Common
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.Aodh import alarming as alarm_req
+from osm_mon.plugins.OpenStack.common import Common
log = logging.getLogger(__name__)
diff --git a/osm_mon/test/OpenStack/test_common.py b/osm_mon/test/OpenStack/test_common.py
index e725670..983128b 100644
--- a/osm_mon/test/OpenStack/test_common.py
+++ b/osm_mon/test/OpenStack/test_common.py
@@ -31,8 +31,8 @@
import mock
-from plugins.OpenStack.common import Common
-from plugins.OpenStack.settings import Config
+from osm_mon.plugins.OpenStack.common import Common
+from osm_mon.plugins.OpenStack.settings import Config
import requests
diff --git a/osm_mon/test/OpenStack/test_metric_calls.py b/osm_mon/test/OpenStack/test_metric_calls.py
index f4c7e97..3c4a7c8 100644
--- a/osm_mon/test/OpenStack/test_metric_calls.py
+++ b/osm_mon/test/OpenStack/test_metric_calls.py
@@ -29,11 +29,9 @@
import mock
-from plugins.OpenStack.Gnocchi import metrics as metric_req
+from osm_mon.plugins.OpenStack.Gnocchi import metrics as metric_req
-from plugins.OpenStack.common import Common
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.common import Common
log = logging.getLogger(__name__)
diff --git a/osm_mon/test/OpenStack/test_metric_req.py b/osm_mon/test/OpenStack/test_metric_req.py
index a3ab3dd..2a3cbc3 100644
--- a/osm_mon/test/OpenStack/test_metric_req.py
+++ b/osm_mon/test/OpenStack/test_metric_req.py
@@ -29,11 +29,9 @@
import mock
-from plugins.OpenStack.Gnocchi import metrics as metric_req
+from osm_mon.plugins.OpenStack.Gnocchi import metrics as metric_req
-from plugins.OpenStack.common import Common
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.common import Common
log = logging.getLogger(__name__)
diff --git a/osm_mon/test/OpenStack/test_notifier.py b/osm_mon/test/OpenStack/test_notifier.py
index ccebb69..97b3c2a 100644
--- a/osm_mon/test/OpenStack/test_notifier.py
+++ b/osm_mon/test/OpenStack/test_notifier.py
@@ -27,16 +27,14 @@
from BaseHTTPServer import BaseHTTPRequestHandler
-from core.message_bus.producer import KafkaProducer
-
import mock
-from plugins.OpenStack.Aodh.alarming import Alarming
-from plugins.OpenStack.common import Common
-from plugins.OpenStack.response import OpenStack_Response
-from plugins.OpenStack.settings import Config
+from osm_mon.core.message_bus.producer import KafkaProducer
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.Aodh.alarming import Alarming
+from osm_mon.plugins.OpenStack.common import Common
+from osm_mon.plugins.OpenStack.response import OpenStack_Response
+from osm_mon.plugins.OpenStack.settings import Config
# Mock data from post request
post_data = json.dumps({"severity": "critical",
diff --git a/osm_mon/test/OpenStack/test_responses.py b/osm_mon/test/OpenStack/test_responses.py
index 900d8fe..6cf4e3f 100644
--- a/osm_mon/test/OpenStack/test_responses.py
+++ b/osm_mon/test/OpenStack/test_responses.py
@@ -27,9 +27,7 @@
import mock
-from plugins.OpenStack import response as resp
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack import response as resp
log = logging.getLogger(__name__)
diff --git a/osm_mon/test/OpenStack/test_settings.py b/osm_mon/test/OpenStack/test_settings.py
index dcc1053..44bed82 100644
--- a/osm_mon/test/OpenStack/test_settings.py
+++ b/osm_mon/test/OpenStack/test_settings.py
@@ -29,9 +29,7 @@
import mock
-from plugins.OpenStack.settings import Config
-
-__author__ = "Helena McGough"
+from osm_mon.plugins.OpenStack.settings import Config
log = logging.getLogger(__name__)