From 68933d83d1509c70b654f408f8f42a29a128ecc7 Mon Sep 17 00:00:00 2001 From: Amir Sadoughi Date: Wed, 18 Jun 2014 13:45:18 -0500 Subject: [PATCH] Fix for neutron change deb27d9c24d3745ff062bc437081bd67cf10059f --- quark/ipam.py | 18 +++++++--------- quark/plugin_modules/subnets.py | 21 +++++++------------ .../plugin_modules/test_networks.py | 7 +++++++ quark/tests/functional/test_ipam.py | 7 +++++++ quark/tests/plugin_modules/test_subnets.py | 15 ++++++------- quark/tests/test_ipam.py | 19 ++++++++++------- 6 files changed, 46 insertions(+), 41 deletions(-) diff --git a/quark/ipam.py b/quark/ipam.py index 678fd6a..110f926 100644 --- a/quark/ipam.py +++ b/quark/ipam.py @@ -22,8 +22,8 @@ import uuid import netaddr from neutron.common import exceptions +from neutron.common import rpc as n_rpc from neutron.openstack.common import log as logging -from neutron.openstack.common.notifier import api as notifier_api from neutron.openstack.common import timeutils from oslo.config import cfg @@ -367,11 +367,9 @@ class QuarkIpam(object): ip_address=addr["address_readable"], device_ids=[p["device_id"] for p in addr["ports"]], created_at=addr["created_at"]) - notifier_api.notify(context, - notifier_api.publisher_id("network"), - "ip_block.address.create", - notifier_api.CONF.default_notification_level, - payload) + n_rpc.get_notifier("network").info(context, + "ip_block.address.create", + payload) def allocate_ip_address(self, context, new_addresses, net_id, port_id, reuse_after, segment_id=None, version=None, @@ -421,11 +419,9 @@ class QuarkIpam(object): device_ids=[p["device_id"] for p in address["ports"]], created_at=address["created_at"], deleted_at=timeutils.utcnow()) - notifier_api.notify(context, - notifier_api.publisher_id("network"), - "ip_block.address.delete", - notifier_api.CONF.default_notification_level, - payload) + n_rpc.get_notifier("network").info(context, + "ip_block.address.delete", + payload) def deallocate_ips_by_port(self, context, port=None, **kwargs): ips_removed = [] diff --git a/quark/plugin_modules/subnets.py b/quark/plugin_modules/subnets.py index 351da66..9ba687a 100644 --- a/quark/plugin_modules/subnets.py +++ b/quark/plugin_modules/subnets.py @@ -16,9 +16,9 @@ import netaddr from neutron.common import config as neutron_cfg from neutron.common import exceptions +from neutron.common import rpc as n_rpc from neutron.openstack.common import importutils from neutron.openstack.common import log as logging -from neutron.openstack.common.notifier import api as notifier_api from neutron.openstack.common import timeutils from oslo.config import cfg @@ -163,13 +163,12 @@ def create_subnet(context, subnet): subnet_dict = v._make_subnet_dict(new_subnet) subnet_dict["gateway_ip"] = gateway_ip - notifier_api.notify(context, - notifier_api.publisher_id("network"), - "ip_block.create", - notifier_api.CONF.default_notification_level, - dict(tenant_id=subnet_dict["tenant_id"], - ip_block_id=subnet_dict["id"], - created_at=new_subnet["created_at"])) + n_rpc.get_notifier("network").info( + context, + "ip_block.create", + dict(tenant_id=subnet_dict["tenant_id"], + ip_block_id=subnet_dict["id"], + created_at=new_subnet["created_at"])) return subnet_dict @@ -332,11 +331,7 @@ def delete_subnet(context, id): _delete_subnet(context, subnet) - notifier_api.notify(context, - notifier_api.publisher_id("network"), - "ip_block.delete", - notifier_api.CONF.default_notification_level, - payload) + n_rpc.get_notifier("network").info(context, "ip_block.delete", payload) def diagnose_subnet(context, id, fields): diff --git a/quark/tests/functional/plugin_modules/test_networks.py b/quark/tests/functional/plugin_modules/test_networks.py index 039784e..68d7113 100644 --- a/quark/tests/functional/plugin_modules/test_networks.py +++ b/quark/tests/functional/plugin_modules/test_networks.py @@ -15,8 +15,10 @@ import contextlib +import mock import netaddr from neutron.common import exceptions +from neutron.common import rpc from neutron import context from neutron.db import api as neutron_db_api from oslo.config import cfg @@ -33,6 +35,11 @@ class QuarkNetworkFunctionalTest(unittest2.TestCase): self.context = context.Context('fake', 'fake', is_admin=False) super(QuarkNetworkFunctionalTest, self).setUp() + patcher = mock.patch("neutron.common.rpc.messaging") + patcher.start() + self.addCleanup(patcher.stop) + rpc.init(mock.MagicMock()) + cfg.CONF.set_override('connection', 'sqlite://', 'database') neutron_db_api.configure_db() neutron_db_api.register_models(models.BASEV2) diff --git a/quark/tests/functional/test_ipam.py b/quark/tests/functional/test_ipam.py index a4d0ebd..43ec9c7 100644 --- a/quark/tests/functional/test_ipam.py +++ b/quark/tests/functional/test_ipam.py @@ -16,8 +16,10 @@ import contextlib import datetime +import mock import netaddr from neutron.common import exceptions +from neutron.common import rpc from neutron import context from neutron.db import api as neutron_db_api from neutron.openstack.common import timeutils @@ -34,6 +36,11 @@ class QuarkIpamBaseFunctionalTest(unittest2.TestCase): self.context = context.Context('fake', 'fake', is_admin=False) super(QuarkIpamBaseFunctionalTest, self).setUp() + patcher = mock.patch("neutron.common.rpc.messaging") + patcher.start() + self.addCleanup(patcher.stop) + rpc.init(mock.MagicMock()) + cfg.CONF.set_override('connection', 'sqlite://', 'database') neutron_db_api.configure_db() neutron_db_api.register_models(models.BASEV2) diff --git a/quark/tests/plugin_modules/test_subnets.py b/quark/tests/plugin_modules/test_subnets.py index bf01346..f66964e 100644 --- a/quark/tests/plugin_modules/test_subnets.py +++ b/quark/tests/plugin_modules/test_subnets.py @@ -21,7 +21,6 @@ import uuid import mock from neutron.api.v2 import attributes as neutron_attrs from neutron.common import exceptions -from neutron.openstack.common.notifier import api as notifier_api from oslo.config import cfg from quark.db import models @@ -911,7 +910,7 @@ class TestSubnetsNotification(test_quark_plugin.TestQuarkPlugin): s["network"]["created_at"] = s["created_at"] subnet = models.Subnet(**s) db_mod = "quark.db.api" - api_mod = "neutron.openstack.common.notifier.api" + rpc_mod = "neutron.common.rpc" time_mod = "neutron.openstack.common.timeutils" sub_plugin_mod = "quark.plugin_modules.subnets" with contextlib.nested( @@ -919,7 +918,7 @@ class TestSubnetsNotification(test_quark_plugin.TestQuarkPlugin): mock.patch("%s.network_find" % db_mod), mock.patch("%s.subnet_create" % db_mod), mock.patch("%s.subnet_delete" % db_mod), - mock.patch("%s.notify" % api_mod), + mock.patch("%s.get_notifier" % rpc_mod), mock.patch("%s.utcnow" % time_mod), mock.patch("%s._validate_subnet_cidr" % sub_plugin_mod) ) as (sub_find, net_find, sub_create, sub_del, notify, @@ -934,11 +933,10 @@ class TestSubnetsNotification(test_quark_plugin.TestQuarkPlugin): tenant_id=1, id=1, created_at="123") with self._stubs(s) as notify: self.plugin.create_subnet(self.context, dict(subnet=s)) - notify.assert_called_once_with( + notify.assert_called_once_with("network") + notify.return_value.info.assert_called_once_with( self.context, - notifier_api.publisher_id("network"), "ip_block.create", - notifier_api.CONF.default_notification_level, dict(tenant_id=s["tenant_id"], ip_block_id=s["id"], created_at=s["created_at"])) @@ -949,11 +947,10 @@ class TestSubnetsNotification(test_quark_plugin.TestQuarkPlugin): s = dict(tenant_id=1, id=1, created_at=now) with self._stubs(s, deleted_at=later) as notify: self.plugin.delete_subnet(self.context, 1) - notify.assert_called_once_with( + notify.assert_called_once_with("network") + notify.return_value.info.assert_called_once_with( self.context, - notifier_api.publisher_id("network"), "ip_block.delete", - notifier_api.CONF.default_notification_level, dict(tenant_id=s["tenant_id"], created_at=s["created_at"], ip_block_id=s["id"], diff --git a/quark/tests/test_ipam.py b/quark/tests/test_ipam.py index d63236b..6df63fd 100644 --- a/quark/tests/test_ipam.py +++ b/quark/tests/test_ipam.py @@ -18,8 +18,8 @@ import contextlib import mock import netaddr from neutron.common import exceptions +from neutron.common import rpc from neutron.db import api as neutron_db_api -from neutron.openstack.common.notifier import api as notifier_api from oslo.config import cfg from quark.db import models @@ -32,6 +32,11 @@ class QuarkIpamBaseTest(test_base.TestBase): def setUp(self): super(QuarkIpamBaseTest, self).setUp() + patcher = mock.patch("neutron.common.rpc.messaging") + patcher.start() + self.addCleanup(patcher.stop) + rpc.init(mock.MagicMock()) + cfg.CONF.set_override('connection', 'sqlite://', 'database') neutron_db_api.configure_db() neutron_db_api.register_models(models.BASEV2) @@ -1202,7 +1207,7 @@ class QuarkIPAddressAllocationNotifications(QuarkIpamBaseTest): mock.patch("quark.db.api.ip_address_find"), mock.patch("quark.db.api.ip_address_create"), mock.patch("quark.db.api.subnet_find_allocation_counts"), - mock.patch("neutron.openstack.common.notifier.api.notify"), + mock.patch("neutron.common.rpc.get_notifier"), mock.patch("neutron.openstack.common.timeutils.utcnow"), ) as (addr_find, addr_create, subnet_find, notify, time): addr_find.side_effect = addresses @@ -1226,11 +1231,10 @@ class QuarkIPAddressAllocationNotifications(QuarkIpamBaseTest): addr = [] self.ipam.allocate_ip_address(self.context, addr, 0, 0, 0, version=4) - notify.assert_called_once_with( + notify.assert_called_once_with("network") + notify.return_value.info.assert_called_once_with( self.context, - notifier_api.publisher_id("network"), "ip_block.address.create", - notifier_api.CONF.default_notification_level, dict(ip_block_id=address["subnet_id"], ip_address="0.0.0.0", device_ids=[], @@ -1250,11 +1254,10 @@ class QuarkIPAddressAllocationNotifications(QuarkIpamBaseTest): with self._stubs(dict(), deleted_at="456") as notify: self.ipam.deallocate_ips_by_port(self.context, port) - notify.assert_called_once_with( + notify.assert_called_once_with("network") + notify.return_value.info.assert_called_once_with( self.context, - notifier_api.publisher_id("network"), "ip_block.address.delete", - notifier_api.CONF.default_notification_level, dict(ip_block_id=address["subnet_id"], ip_address="0.0.0.0", device_ids=["foo"],