From f0a4bc127471388a4cd7ac326eee0dafc3930192 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 18 Jul 2015 15:28:05 +0200 Subject: [PATCH] ensure_dir: switch to neutron.common.utils ensure_dir from neutron.agent.linux.utils is deprecated. Depends-On: I252356a72f3c742e57c1b6127275030f0994a221 Change-Id: I0721db0059c9f3a4883ce76d4f211a4409b22138 --- neutron_lbaas/drivers/haproxy/namespace_driver.py | 2 +- .../tests/unit/drivers/haproxy/test_namespace_driver.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron_lbaas/drivers/haproxy/namespace_driver.py b/neutron_lbaas/drivers/haproxy/namespace_driver.py index 6557d4e87..7e27273f7 100644 --- a/neutron_lbaas/drivers/haproxy/namespace_driver.py +++ b/neutron_lbaas/drivers/haproxy/namespace_driver.py @@ -272,7 +272,7 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver): confs_dir = os.path.abspath(os.path.normpath(self.state_path)) conf_dir = os.path.join(confs_dir, loadbalancer_id) if ensure_state_dir: - linux_utils.ensure_dir(conf_dir) + n_utils.ensure_dir(conf_dir) return os.path.join(conf_dir, kind) def _plug(self, namespace, port, vip_address, reuse_existing=True): diff --git a/neutron_lbaas/tests/unit/drivers/haproxy/test_namespace_driver.py b/neutron_lbaas/tests/unit/drivers/haproxy/test_namespace_driver.py index 82d57cfda..8700c1d1a 100644 --- a/neutron_lbaas/tests/unit/drivers/haproxy/test_namespace_driver.py +++ b/neutron_lbaas/tests/unit/drivers/haproxy/test_namespace_driver.py @@ -355,7 +355,7 @@ class TestHaproxyNSDriver(base.BaseTestCase): ret_val = self.driver.deployable(self.lb) self.assertTrue(ret_val) - @mock.patch('neutron.agent.linux.utils.ensure_dir') + @mock.patch('neutron.common.utils.ensure_dir') def test_get_state_file_path(self, ensure_dir): path = self.driver._get_state_file_path(self.lb.id, 'conf', ensure_state_dir=False) @@ -410,7 +410,7 @@ class TestHaproxyNSDriver(base.BaseTestCase): self.vif_driver.unplug.assert_called_once_with(interface_name, namespace='ns1') - @mock.patch('neutron.agent.linux.utils.ensure_dir') + @mock.patch('neutron.common.utils.ensure_dir') @mock.patch('neutron_lbaas.services.loadbalancer.drivers.haproxy.' 'jinja_cfg.save_config') @mock.patch('neutron.agent.linux.ip_lib.IPWrapper')