From 5fc1079da3a3b25b7319f69211205a9d190a6ff1 Mon Sep 17 00:00:00 2001 From: rajat29 Date: Fri, 13 Oct 2017 14:54:52 +0530 Subject: [PATCH] Fix usage of method ensure_dir This patch is for stopping using ensure_dir in device_driver, as the neutron.common.utils.ensure_dir is deprecated for removal, also ensure_tree(path, 0o755) from oslo_utils.fileutils is suggested to be used to create a directory. Co-Authored-By: Cao Xuan Hoang Change-Id: Ic9b4b86e65052c06c33c8628bb0c6700cdfd875b --- neutron_vpnaas/services/vpn/device_drivers/ipsec.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py index cebcac9a6..cea02e80a 100644 --- a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py +++ b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py @@ -26,7 +26,6 @@ import netaddr from neutron.agent.linux import ip_lib from neutron.agent.linux import utils as agent_utils from neutron.common import rpc as n_rpc -from neutron.common import utils as n_utils from neutron.plugins.common import utils as plugin_utils from neutron_lib.api import validators from neutron_lib import constants @@ -38,6 +37,7 @@ from oslo_log import helpers as log_helpers from oslo_log import log as logging import oslo_messaging from oslo_service import loopingcall +from oslo_utils import fileutils import six from neutron_vpnaas._i18n import _ @@ -238,10 +238,10 @@ class BaseSwanProcess(object): def ensure_config_dir(self, vpnservice): """Create config directory if it does not exist.""" - n_utils.ensure_dir(self.config_dir) + fileutils.ensure_tree(self.config_dir, 0o755) for subdir in self.CONFIG_DIRS: dir_path = os.path.join(self.config_dir, subdir) - n_utils.ensure_dir(dir_path) + fileutils.ensure_tree(dir_path, 0o755) def _gen_config_content(self, template_file, vpnservice): template = _get_template(template_file)