From 851fa4580aedd2924dda9ac98a4ddd4de751509b Mon Sep 17 00:00:00 2001 From: Cedric Brandily Date: Fri, 1 Aug 2014 10:04:42 +0200 Subject: [PATCH] Remove invalid or useless initialization in test_type_vxlan In test_type_vxlan, vni_ranges option is overriden with an invalid and unused value, vxlan_group is overrriden but never used. Change-Id: Ie1ce1d7a8ef54692d122276e371ec5efc2e68d9c --- neutron/tests/unit/ml2/test_type_vxlan.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/neutron/tests/unit/ml2/test_type_vxlan.py b/neutron/tests/unit/ml2/test_type_vxlan.py index 7953617dd..52fe6b363 100644 --- a/neutron/tests/unit/ml2/test_type_vxlan.py +++ b/neutron/tests/unit/ml2/test_type_vxlan.py @@ -15,7 +15,6 @@ # @author: Kyle Mestery, Cisco Systems, Inc. import mock -from oslo.config import cfg from six import moves import testtools from testtools import matchers @@ -35,7 +34,6 @@ TUN_MAX = 109 TUNNEL_RANGES = [(TUN_MIN, TUN_MAX)] UPDATED_TUNNEL_RANGES = [(TUN_MIN + 5, TUN_MAX + 5)] INVALID_VXLAN_VNI = 7337 -MULTICAST_GROUP = "239.1.1.1" VXLAN_UDP_PORT_ONE = 9999 VXLAN_UDP_PORT_TWO = 8888 @@ -43,10 +41,6 @@ VXLAN_UDP_PORT_TWO = 8888 class VxlanTypeTest(testlib_api.SqlTestCase): def setUp(self): super(VxlanTypeTest, self).setUp() - cfg.CONF.set_override('vni_ranges', [TUNNEL_RANGES], - group='ml2_type_vxlan') - cfg.CONF.set_override('vxlan_group', MULTICAST_GROUP, - group='ml2_type_vxlan') self.driver = type_vxlan.VxlanTypeDriver() self.driver.vxlan_vni_ranges = TUNNEL_RANGES self.driver._sync_vxlan_allocations() -- 2.45.2