projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactors autoscaling module to separate concerns and allow better control of db...
[osm/POL.git]
/
osm_policy_module
/
tests
/
integration
/
test_policy_agent.py
diff --git
a/osm_policy_module/tests/integration/test_policy_agent.py
b/osm_policy_module/tests/integration/test_policy_agent.py
index
68ab1f4
..
4a7efbb
100644
(file)
--- a/
osm_policy_module/tests/integration/test_policy_agent.py
+++ b/
osm_policy_module/tests/integration/test_policy_agent.py
@@
-23,6
+23,7
@@
##
import asyncio
import logging
##
import asyncio
import logging
+import os
import sys
import unittest
import uuid
import sys
import unittest
import uuid
@@
-30,12
+31,12
@@
from unittest.mock import patch, Mock
from kafka import KafkaProducer
from osm_common.dbmongo import DbMongo
from kafka import KafkaProducer
from osm_common.dbmongo import DbMongo
-from p
eewee import SqliteDatabase
+from p
layhouse.db_url import connect
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.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
+from osm_policy_module.
autoscaling
.agent import PolicyModuleAgent
from osm_policy_module.core.config import Config
from osm_policy_module.core.database import ScalingGroup, ScalingAlarm, ScalingPolicy, ScalingCriteria
from osm_policy_module.core.config import Config
from osm_policy_module.core.database import ScalingGroup, ScalingAlarm, ScalingPolicy, ScalingCriteria
@@
-420,23
+421,23
@@
vnfd_record_mock = {
}
}
}
}
-test_db = SqliteDatabase(':memory:')
-
MODELS = [ScalingGroup, ScalingPolicy, ScalingCriteria, ScalingAlarm]
class PolicyModuleAgentTest(unittest.TestCase):
def setUp(self):
super()
MODELS = [ScalingGroup, ScalingPolicy, ScalingCriteria, ScalingAlarm]
class PolicyModuleAgentTest(unittest.TestCase):
def setUp(self):
super()
- database.db = test_db
- test_db.bind(MODELS)
- test_db.connect()
- test_db.drop_tables(MODELS)
- test_db.create_tables(MODELS)
+ database.db.initialize(connect('sqlite:///test_db.sqlite'))
+ database.db.bind(MODELS)
+ database.db.connect()
+ database.db.drop_tables(MODELS)
+ database.db.create_tables(MODELS)
+ database.db.close()
self.loop = asyncio.new_event_loop()
def tearDown(self):
super()
self.loop = asyncio.new_event_loop()
def tearDown(self):
super()
+ os.remove('test_db.sqlite')
@patch.object(DbMongo, 'db_connect', Mock())
@patch.object(KafkaProducer, '__init__')
@patch.object(DbMongo, 'db_connect', Mock())
@patch.object(KafkaProducer, '__init__')
@@
-461,7
+462,7
@@
class PolicyModuleAgentTest(unittest.TestCase):
create_alarm.side_effect = _test_configure_scaling_groups_create_alarm
config = Config()
agent = PolicyModuleAgent(config, self.loop)
create_alarm.side_effect = _test_configure_scaling_groups_create_alarm
config = Config()
agent = PolicyModuleAgent(config, self.loop)
- self.loop.run_until_complete(agent.
_
configure_scaling_groups("test_nsr_id"))
+ self.loop.run_until_complete(agent.
service.
configure_scaling_groups("test_nsr_id"))
create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
ns_id='test_nsr_id',
operation='GT',
create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
ns_id='test_nsr_id',
operation='GT',