From aa21a48e09bc8be2b8cf100f7edfc4bca98ace5a Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Thu, 10 Oct 2013 15:10:32 -0400 Subject: [PATCH] Config option for verifier event_types --- tests/unit/test_glance_verifier.py | 5 +++-- tests/unit/test_nova_verifier.py | 5 +++-- tests/unit/utils.py | 12 ++++++++++-- verifier/config.py | 8 ++++++++ verifier/glance_verifier.py | 2 +- verifier/nova_verifier.py | 2 +- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tests/unit/test_glance_verifier.py b/tests/unit/test_glance_verifier.py index 0bc4e1f..f95cc4b 100644 --- a/tests/unit/test_glance_verifier.py +++ b/tests/unit/test_glance_verifier.py @@ -30,6 +30,7 @@ from stacktach import datetime_to_decimal as dt from stacktach import models from tests.unit import StacktachBaseTestCase from utils import IMAGE_UUID_1 +from utils import GLANCE_VERIFIER_EVENT_TYPE from utils import make_verifier_config from verifier import glance_verifier from verifier import NullFieldException @@ -515,7 +516,7 @@ class GlanceVerifierTestCase(StacktachBaseTestCase): producer.acquire(block=True).AndReturn(producer) producer.__enter__().AndReturn(producer) kombu.common.maybe_declare(exchange, producer.channel) - message = {'event_type': 'image.exists.verified.old', + message = {'event_type': GLANCE_VERIFIER_EVENT_TYPE, 'message_id': 'some_other_uuid', 'original_message_id': 'some_uuid'} producer.publish(message, key) @@ -550,7 +551,7 @@ class GlanceVerifierTestCase(StacktachBaseTestCase): kombu.common.maybe_declare(exchange, producer.channel) self.mox.StubOutWithMock(uuid, 'uuid4') uuid.uuid4().AndReturn('some_other_uuid') - message = {'event_type': 'image.exists.verified.old', + message = {'event_type': GLANCE_VERIFIER_EVENT_TYPE, 'message_id': 'some_other_uuid', 'original_message_id': 'some_uuid'} producer.publish(message, exist_dict[0]) diff --git a/tests/unit/test_nova_verifier.py b/tests/unit/test_nova_verifier.py index d1a84ff..49a9941 100644 --- a/tests/unit/test_nova_verifier.py +++ b/tests/unit/test_nova_verifier.py @@ -44,6 +44,7 @@ from utils import OS_VERSION_2 from utils import TENANT_ID_1 from utils import TENANT_ID_2 from utils import INSTANCE_TYPE_ID_1 +from utils import NOVA_VERIFIER_EVENT_TYPE from verifier import nova_verifier from verifier import NullFieldException from verifier import WrongTypeException @@ -1105,7 +1106,7 @@ class NovaVerifierTestCase(StacktachBaseTestCase): producer.acquire(block=True).AndReturn(producer) producer.__enter__().AndReturn(producer) kombu.common.maybe_declare(exchange, producer.channel) - message = {'event_type': 'compute.instance.exists.verified.old', + message = {'event_type': NOVA_VERIFIER_EVENT_TYPE, 'message_id': 'some_other_uuid', 'original_message_id': 'some_uuid'} producer.publish(message, key) @@ -1140,7 +1141,7 @@ class NovaVerifierTestCase(StacktachBaseTestCase): kombu.common.maybe_declare(exchange, producer.channel) self.mox.StubOutWithMock(uuid, 'uuid4') uuid.uuid4().AndReturn('some_other_uuid') - message = {'event_type': 'compute.instance.exists.verified.old', + message = {'event_type': NOVA_VERIFIER_EVENT_TYPE, 'message_id': 'some_other_uuid', 'original_message_id': 'some_uuid'} producer.publish(message, exist_dict[0]) diff --git a/tests/unit/utils.py b/tests/unit/utils.py index f33873e..f503a70 100644 --- a/tests/unit/utils.py +++ b/tests/unit/utils.py @@ -66,6 +66,9 @@ PORT = '5672' VIRTUAL_HOST = '/' USERID = 'rabbit' PASSWORD = 'password' +NOVA_VERIFIER_EVENT_TYPE = 'compute.instance.exists.verified.old' +GLANCE_VERIFIER_EVENT_TYPE = 'image.exists.verified.old' + def decimal_utc(t = datetime.datetime.utcnow()): return dt.dt_to_decimal(t) @@ -152,7 +155,8 @@ def create_tracker(mox, request_id, lifecycle, start, last_timing=None, class FakeVerifierConfig(object): def __init__(self, host, port, virtual_host, userid, password, tick_time, - settle_time, settle_units, durable_queue, topics, notifs): + settle_time, settle_units, durable_queue, topics, notifs, + nova_event_type, glance_event_type): self.host = lambda: host self.port = lambda: port self.virtual_host = lambda: virtual_host @@ -166,11 +170,15 @@ class FakeVerifierConfig(object): self.topics = lambda: topics self.enable_notifications = lambda: notifs self.validation_level = lambda: 'all' + self.nova_event_type = lambda: nova_event_type + self.glance_event_type = lambda: glance_event_type def make_verifier_config(notifs): topics = {'exchange': ['notifications.info']} config = FakeVerifierConfig(HOST, PORT, VIRTUAL_HOST, USERID, PASSWORD, TICK_TIME, SETTLE_TIME, - SETTLE_UNITS, True, topics, notifs) + SETTLE_UNITS, True, topics, notifs, + NOVA_VERIFIER_EVENT_TYPE, + GLANCE_VERIFIER_EVENT_TYPE) return config \ No newline at end of file diff --git a/verifier/config.py b/verifier/config.py index f89b1f8..c3acc90 100644 --- a/verifier/config.py +++ b/verifier/config.py @@ -91,3 +91,11 @@ def virtual_host(): def validation_level(): return config['validation_level'] + + +def nova_event_type(): + return config.get('nova_event_type', 'compute.instance.exists.verified.old') + + +def glance_event_type(): + return config.get('glance_event_type', 'image.exists.verified.old') diff --git a/verifier/glance_verifier.py b/verifier/glance_verifier.py index 3ed49b6..49578ff 100644 --- a/verifier/glance_verifier.py +++ b/verifier/glance_verifier.py @@ -173,7 +173,7 @@ class GlanceVerifier(Verifier): routing_keys=None): body = exist.raw.json json_body = json.loads(body) - json_body[1]['event_type'] = 'image.exists.verified.old' + json_body[1]['event_type'] = self.config.glance_event_type() json_body[1]['original_message_id'] = json_body[1]['message_id'] json_body[1]['message_id'] = str(uuid.uuid4()) if routing_keys is None: diff --git a/verifier/nova_verifier.py b/verifier/nova_verifier.py index eaa373e..b192e05 100644 --- a/verifier/nova_verifier.py +++ b/verifier/nova_verifier.py @@ -269,7 +269,7 @@ class NovaVerifier(base_verifier.Verifier): routing_keys=None): body = exist.raw.json json_body = json.loads(body) - json_body[1]['event_type'] = 'compute.instance.exists.verified.old' + json_body[1]['event_type'] = self.config.nova_event_type() json_body[1]['original_message_id'] = json_body[1]['message_id'] json_body[1]['message_id'] = str(uuid.uuid4()) if routing_keys is None: