From 8d2d6a02f2282c50a934ccab25fc909e3bbc27c6 Mon Sep 17 00:00:00 2001 From: Benjamin Diaz Date: Mon, 8 Oct 2018 16:26:32 -0300 Subject: [PATCH] Renames DbClient to CommonDbClient to avoid confusion POL comunicates with two different databases, a relational one, that stores records for alarms, scaling groups and more, and a nonrelational one, that is common to all OSM modules, which we call CommonDB, that currently corrsponds to a MongoDB instance and stores nsds, vnfds, etc. The name db_client and DbClient used in the file and class that comunicates with CommonDB may be open to confussion, so it has been renamed as common_db_client and CommonDbClient. Signed-off-by: Benjamin Diaz Change-Id: I8209cbc23b5ab129221d1c928703929e4f405a4c --- .../common/{db_client.py => common_db_client.py} | 2 +- osm_policy_module/core/agent.py | 4 ++-- osm_policy_module/tests/integration/test_policy_agent.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename osm_policy_module/common/{db_client.py => common_db_client.py} (98%) diff --git a/osm_policy_module/common/db_client.py b/osm_policy_module/common/common_db_client.py similarity index 98% rename from osm_policy_module/common/db_client.py rename to osm_policy_module/common/common_db_client.py index 1eed0f3..83bb46c 100644 --- a/osm_policy_module/common/db_client.py +++ b/osm_policy_module/common/common_db_client.py @@ -26,7 +26,7 @@ from osm_common import dbmongo from osm_policy_module.core.config import Config -class DbClient: +class CommonDbClient: def __init__(self): cfg = Config.instance() self.common_db = dbmongo.DbMongo() diff --git a/osm_policy_module/core/agent.py b/osm_policy_module/core/agent.py index d637374..1e81141 100644 --- a/osm_policy_module/core/agent.py +++ b/osm_policy_module/core/agent.py @@ -30,7 +30,7 @@ from json import JSONDecodeError import yaml from aiokafka import AIOKafkaConsumer -from osm_policy_module.common.db_client import DbClient +from osm_policy_module.common.common_db_client import CommonDbClient from osm_policy_module.common.lcm_client import LcmClient from osm_policy_module.common.mon_client import MonClient from osm_policy_module.core import database @@ -48,7 +48,7 @@ class PolicyModuleAgent: if not loop: loop = asyncio.get_event_loop() self.loop = loop - self.db_client = DbClient() + self.db_client = CommonDbClient() self.mon_client = MonClient(loop=self.loop) self.lcm_client = LcmClient(loop=self.loop) self.kafka_server = '{}:{}'.format(cfg.OSMPOL_MESSAGE_HOST, diff --git a/osm_policy_module/tests/integration/test_policy_agent.py b/osm_policy_module/tests/integration/test_policy_agent.py index a2794eb..11bc969 100644 --- a/osm_policy_module/tests/integration/test_policy_agent.py +++ b/osm_policy_module/tests/integration/test_policy_agent.py @@ -32,7 +32,7 @@ from kafka import KafkaProducer from osm_common.dbmongo import DbMongo from peewee import SqliteDatabase -from osm_policy_module.common.db_client import DbClient +from osm_policy_module.common.common_db_client import CommonDbClient from osm_policy_module.common.mon_client import MonClient from osm_policy_module.core import database from osm_policy_module.core.agent import PolicyModuleAgent @@ -423,9 +423,9 @@ class PolicyModuleAgentTest(unittest.TestCase): @patch.object(DbMongo, 'db_connect', Mock()) @patch.object(KafkaProducer, '__init__') @patch.object(MonClient, 'create_alarm') - @patch.object(DbClient, 'get_vnfd') - @patch.object(DbClient, 'get_nsr') - @patch.object(DbClient, 'get_vnfr') + @patch.object(CommonDbClient, 'get_vnfd') + @patch.object(CommonDbClient, 'get_nsr') + @patch.object(CommonDbClient, 'get_vnfr') def test_configure_scaling_groups(self, get_vnfr, get_nsr, get_vnfd, create_alarm, kafka_producer_init): def _test_configure_scaling_groups_get_vnfr(*args, **kwargs): if '1' in args[1]: -- 2.17.1