Adds granularity support in OpenStack vim config
Adds global config class in core
Reorders common_consumer conditional blocks
Adds support for OS_DEFAULT_GRANULARITY env var
Modifies tests to support changes
Change-Id: I873b8d24814825bff6e628092942bf16fa5e2a03
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
diff --git a/osm_mon/test/OpenStack/test_common.py b/osm_mon/test/OpenStack/test_common.py
index 9853d15..042d15b 100644
--- a/osm_mon/test/OpenStack/test_common.py
+++ b/osm_mon/test/OpenStack/test_common.py
@@ -22,21 +22,17 @@
"""Tests for all common OpenStack methods."""
import json
-
import logging
-
import unittest
-from keystoneclient.v3 import client
-
import mock
+import requests
+from keystoneclient.v3 import client
from osm_mon.core.auth import AuthManager
from osm_mon.core.database import VimCredentials
+from osm_mon.core.settings import Config
from osm_mon.plugins.OpenStack.common import Common
-from osm_mon.plugins.OpenStack.settings import Config
-
-import requests
__author__ = "Helena McGough"