x/vmware-nsx
Code Issues Proposed changes

Merge "Remove invalid or useless initialization in test_type_vxlan"

Browse Source
This commit is contained in:
Jenkins 2014-08-22 23:22:09 +00:00 committed by Gerrit Code Review
commit ecb296b99a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/tests/unit/ml2/test_type_vxlan.py
View File

@ -15,7 +15,6 @@
# @author: Kyle Mestery, Cisco Systems, Inc. # @author: Kyle Mestery, Cisco Systems, Inc.
import mock import mock
from oslo.config import cfg
from six import moves from six import moves
import testtools import testtools
from testtools import matchers from testtools import matchers
@ -35,7 +34,6 @@ TUN_MAX = 109
TUNNEL_RANGES = [(TUN_MIN, TUN_MAX)] TUNNEL_RANGES = [(TUN_MIN, TUN_MAX)]
UPDATED_TUNNEL_RANGES = [(TUN_MIN + 5, TUN_MAX + 5)] UPDATED_TUNNEL_RANGES = [(TUN_MIN + 5, TUN_MAX + 5)]
INVALID_VXLAN_VNI = 7337 INVALID_VXLAN_VNI = 7337
MULTICAST_GROUP = "239.1.1.1"
VXLAN_UDP_PORT_ONE = 9999 VXLAN_UDP_PORT_ONE = 9999
VXLAN_UDP_PORT_TWO = 8888 VXLAN_UDP_PORT_TWO = 8888
@ -43,10 +41,6 @@ VXLAN_UDP_PORT_TWO = 8888
class VxlanTypeTest(testlib_api.SqlTestCase): class VxlanTypeTest(testlib_api.SqlTestCase):
def setUp(self): def setUp(self):
super(VxlanTypeTest, self).setUp() 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 = type_vxlan.VxlanTypeDriver()
self.driver.vxlan_vni_ranges = TUNNEL_RANGES self.driver.vxlan_vni_ranges = TUNNEL_RANGES
self.driver._sync_vxlan_allocations() self.driver._sync_vxlan_allocations()