From 8eb142748d9f63a0e4d5902f55bb66281d0df615 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Fri, 13 Sep 2013 14:30:28 +0000 Subject: [PATCH] Fix URL used in NCS mechanism driver sync_full() operation The URL was incorrect due to a simple argument-passing bug. Change-Id: I2fabacdb2838022a1d187ceb70cb090c15457b7c Closes-Bug: #1224981 --- neutron/plugins/ml2/drivers/mechanism_ncs.py | 2 +- neutron/tests/unit/ml2/test_mechanism_ncs.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/neutron/plugins/ml2/drivers/mechanism_ncs.py b/neutron/plugins/ml2/drivers/mechanism_ncs.py index fc65447fa..833447731 100644 --- a/neutron/plugins/ml2/drivers/mechanism_ncs.py +++ b/neutron/plugins/ml2/drivers/mechanism_ncs.py @@ -116,7 +116,7 @@ class NCSMechanismDriver(api.MechanismDriver): json = {'openstack': {'network': networks, 'subnet': subnets, 'port': ports}} - self.sendjson('put', self.url, json) + self.sendjson('put', '', json) self.out_of_sync = False def sync_object(self, operation, object_type, context): diff --git a/neutron/tests/unit/ml2/test_mechanism_ncs.py b/neutron/tests/unit/ml2/test_mechanism_ncs.py index 9c2eb5fe9..2e1c23551 100644 --- a/neutron/tests/unit/ml2/test_mechanism_ncs.py +++ b/neutron/tests/unit/ml2/test_mechanism_ncs.py @@ -14,6 +14,7 @@ # under the License. from neutron.plugins.ml2 import config as config +from neutron.plugins.ml2.drivers import mechanism_ncs from neutron.tests.unit import test_db_plugin as test_plugin PLUGIN_NAME = 'neutron.plugins.ml2.plugin.Ml2Plugin' @@ -31,6 +32,11 @@ class NCSTestCase(test_plugin.NeutronDbPluginV2TestCase): self.addCleanup(config.cfg.CONF.reset) super(NCSTestCase, self).setUp(PLUGIN_NAME) self.port_create_status = 'DOWN' + mechanism_ncs.NCSMechanismDriver.sendjson = self.check_sendjson + + def check_sendjson(self, method, urlpath, obj): + # Confirm fix for bug #1224981 + self.assertFalse(urlpath.startswith("http://")) class NCSMechanismTestBasicGet(test_plugin.TestBasicGet, NCSTestCase): -- 2.45.2