From 28f7ab01a6c72d652a197505d2413b2dc542f386 Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Wed, 28 Mar 2018 09:31:50 +0700 Subject: [PATCH] Removing deprecated function 'IPWrapper.get_namespaces()' 'IPWrapper.get_namespaces()' is deprecated in version 'Queens' and was marked to be removed 'Rocky'. This patch removes it and switches to use 'neutron.agent.linux.ip_lib.list_network_namespaces' instead. Change-Id: I090cc5841aca5b638d08d65645162811950d6437 Depends-On: Id629481fd722004a7b7d827bf6209785f85f4c64 --- neutron/agent/linux/ip_lib.py | 9 --------- neutron/tests/functional/cmd/test_netns_cleanup.py | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py index 3c4894c41cf..77da1fd8167 100644 --- a/neutron/agent/linux/ip_lib.py +++ b/neutron/agent/linux/ip_lib.py @@ -17,7 +17,6 @@ import os import re import time -from debtcollector import removals import eventlet import netaddr from neutron_lib import constants @@ -264,14 +263,6 @@ class IPWrapper(SubProcessBase): privileged.create_interface(name, self.namespace, "vxlan", **kwargs) return (IPDevice(name, namespace=self.namespace)) - @removals.remove(version='Queens', removal_version='Rocky', - message="This will be removed in the future. Please use " - "'neutron.agent.linux.ip_lib." - "list_network_namespaces' instead.") - @classmethod - def get_namespaces(cls): - return list_network_namespaces() - class IPDevice(SubProcessBase): def __init__(self, name, namespace=None): diff --git a/neutron/tests/functional/cmd/test_netns_cleanup.py b/neutron/tests/functional/cmd/test_netns_cleanup.py index 052980367a1..41f720932e4 100644 --- a/neutron/tests/functional/cmd/test_netns_cleanup.py +++ b/neutron/tests/functional/cmd/test_netns_cleanup.py @@ -79,7 +79,7 @@ class NetnsCleanupTest(base.BaseSudoTestCase): netns_cleanup.cleanup_network_namespaces(self.conf) self.get_namespaces_p.stop() - namespaces_now = ip_lib.IPWrapper.get_namespaces() + namespaces_now = ip_lib.list_network_namespaces() procs_after = self._get_num_spawned_procs() self.assertEqual(procs_after, 0) self.assertNotIn(l3_namespace, namespaces_now)