openstack
/
congress
Code Issues Proposed changes

Merge "Fixed policy metadata mismatch between policy engine and db"

This commit is contained in:
Jenkins 2016-03-16 08:52:53 +00:00 committed by Gerrit Code Review
parent 6fc37ddd36 77ad95d58c
commit 22e02a3176
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
congress/policy_engines/agnostic.py
View File

@ -255,7 +255,7 @@ class Runtime (object):
if id_ is None:
id_ = str(uuidutils.generate_uuid())
policy_obj = self.create_policy(
name=name, abbr=abbr, kind=kind, id_=id_)
name=name, abbr=abbr, kind=kind, id_=id_, desc=desc, owner='user')
# save policy to database
if desc is None:

19
congress/tests/test_congress.py
View File

@ -34,6 +34,7 @@ from oslo_log import log as logging
from congress.api import webservice
from congress.common import config
from congress.datalog import base as datalog_base
from congress.datalog import compile
from congress import harness
from congress.tests import base
@ -101,9 +102,12 @@ class TestCongress(base.SqlTestCase):
# FIXME(arosen): remove all this code
# monkey patch
engine.create_policy('neutron')
engine.create_policy('neutron2')
engine.create_policy('nova')
engine.create_policy('neutron',
kind=datalog_base.DATASOURCE_POLICY_TYPE)
engine.create_policy('neutron2',
kind=datalog_base.DATASOURCE_POLICY_TYPE)
engine.create_policy('nova',
kind=datalog_base.DATASOURCE_POLICY_TYPE)
harness.load_data_service(
'neutron', config, cage,
os.path.join(helper.root_path(), "congress"), 1)
@ -167,6 +171,15 @@ class TestCongress(base.SqlTestCase):
helper.retry_check_subscribers(
api['rule'], [(engine.name, 'policy-update')])
def test_synchronize_policy_no_erratic_change(self):
"""Test that synchronize_policies does not changes init state"""
with mock.patch.object(self.engine, 'delete_policy') as d:
with mock.patch.object(self.engine, 'create_policy') as c:
self.engine.synchronizer.synchronize_policies()
# TODO(ekcs): How can we show args used if erratic call made?
d.assert_not_called()
c.assert_not_called()
def test_policy_subscriptions(self):
"""Test that policy engine subscriptions adjust to policy changes."""
engine = self.engine