Bump hacking in test-requirements.txt
Bumps the version of hacking to match that in global-requirements.txt. Change-Id: I7bb98dc773ce821b025d534f537f1a1704a50f9e Closes-bug: #1566463
This commit is contained in:
parent
4da6d609bb
commit
876107d89f
@ -40,6 +40,7 @@ class NetConfig(object):
|
||||
|
||||
def add_object(self, obj):
|
||||
"""Convenience method to add any type of object to the network config.
|
||||
|
||||
See objects.py.
|
||||
|
||||
:param obj: The object to add.
|
||||
|
@ -30,7 +30,7 @@ def ifcfg_config_path(name):
|
||||
return "/etc/sysconfig/network-scripts/ifcfg-%s" % name
|
||||
|
||||
|
||||
#NOTE(dprince): added here for testability
|
||||
# NOTE(dprince): added here for testability
|
||||
def bridge_config_path(name):
|
||||
return ifcfg_config_path(name)
|
||||
|
||||
@ -416,8 +416,8 @@ class IfcfgNetConfig(os_net_config.NetConfig):
|
||||
ivs_uplinks.append(interface_name)
|
||||
all_file_names.append(route6_path)
|
||||
if (utils.diff(interface_path, iface_data) or
|
||||
utils.diff(route_path, route_data) or
|
||||
utils.diff(route6_path, route6_data)):
|
||||
utils.diff(route_path, route_data) or
|
||||
utils.diff(route6_path, route6_data)):
|
||||
restart_interfaces.append(interface_name)
|
||||
restart_interfaces.extend(self.child_members(interface_name))
|
||||
update_files[interface_path] = iface_data
|
||||
@ -438,7 +438,7 @@ class IfcfgNetConfig(os_net_config.NetConfig):
|
||||
all_file_names.append(route6_path)
|
||||
ivs_interfaces.append(interface_name)
|
||||
if (utils.diff(interface_path, iface_data) or
|
||||
utils.diff(route_path, route_data)):
|
||||
utils.diff(route_path, route_data)):
|
||||
restart_interfaces.append(interface_name)
|
||||
restart_interfaces.extend(self.child_members(interface_name))
|
||||
update_files[interface_path] = iface_data
|
||||
@ -478,8 +478,8 @@ class IfcfgNetConfig(os_net_config.NetConfig):
|
||||
all_file_names.append(br_route_path)
|
||||
all_file_names.append(br_route6_path)
|
||||
if (utils.diff(bridge_path, bridge_data) or
|
||||
utils.diff(br_route_path, route_data) or
|
||||
utils.diff(br_route6_path, route6_data)):
|
||||
utils.diff(br_route_path, route_data) or
|
||||
utils.diff(br_route6_path, route6_data)):
|
||||
restart_bridges.append(bridge_name)
|
||||
restart_interfaces.extend(self.child_members(bridge_name))
|
||||
update_files[bridge_path] = bridge_data
|
||||
@ -498,8 +498,8 @@ class IfcfgNetConfig(os_net_config.NetConfig):
|
||||
all_file_names.append(br_route_path)
|
||||
all_file_names.append(br_route6_path)
|
||||
if (utils.diff(bridge_path, bridge_data) or
|
||||
utils.diff(br_route_path, route_data) or
|
||||
utils.diff(br_route6_path, route6_data)):
|
||||
utils.diff(br_route_path, route_data) or
|
||||
utils.diff(br_route6_path, route6_data)):
|
||||
restart_bridges.append(bridge_name)
|
||||
restart_interfaces.extend(self.child_members(bridge_name))
|
||||
update_files[bridge_path] = bridge_data
|
||||
@ -518,8 +518,8 @@ class IfcfgNetConfig(os_net_config.NetConfig):
|
||||
all_file_names.append(bond_route_path)
|
||||
all_file_names.append(bond_route6_path)
|
||||
if (utils.diff(bond_path, bond_data) or
|
||||
utils.diff(bond_route_path, route_data) or
|
||||
utils.diff(bond_route6_path, route6_data)):
|
||||
utils.diff(bond_route_path, route_data) or
|
||||
utils.diff(bond_route6_path, route6_data)):
|
||||
restart_linux_bonds.append(bond_name)
|
||||
restart_interfaces.extend(self.child_members(bond_name))
|
||||
update_files[bond_path] = bond_data
|
||||
|
@ -652,7 +652,7 @@ class TestIfcfgNetConfigApply(base.TestCase):
|
||||
self.assertEqual([], self.ifup_interface_names)
|
||||
|
||||
def test_bond_active_slave(self):
|
||||
#setup and apply a bond
|
||||
# setup and apply a bond
|
||||
interface1 = objects.Interface('em1')
|
||||
interface2 = objects.Interface('em2', primary=True)
|
||||
bond = objects.OvsBond('bond1', use_dhcp=True,
|
||||
@ -665,7 +665,7 @@ class TestIfcfgNetConfigApply(base.TestCase):
|
||||
self.assertIn(ovs_appctl_cmds, self.ovs_appctl_cmds)
|
||||
|
||||
def test_bond_active_ordering(self):
|
||||
#setup and apply a bond
|
||||
# setup and apply a bond
|
||||
interface1 = objects.Interface('em1')
|
||||
interface2 = objects.Interface('em2')
|
||||
bond = objects.OvsBond('bond1', use_dhcp=True,
|
||||
|
@ -85,8 +85,8 @@ class TestInterface(base.TestCase):
|
||||
v4_addr = objects.Address('192.168.1.1/24')
|
||||
v6_addr = objects.Address('2001:abc:a::/64')
|
||||
interface = objects.Interface('foo', addresses=[v4_addr, v6_addr])
|
||||
self.assertEquals("192.168.1.1", interface.v4_addresses()[0].ip)
|
||||
self.assertEquals("2001:abc:a::", interface.v6_addresses()[0].ip)
|
||||
self.assertEqual("192.168.1.1", interface.v4_addresses()[0].ip)
|
||||
self.assertEqual("2001:abc:a::", interface.v6_addresses()[0].ip)
|
||||
|
||||
def test_from_json_dhcp(self):
|
||||
data = '{"type": "interface", "name": "em1", "use_dhcp": true}'
|
||||
|
@ -1,4 +1,4 @@
|
||||
hacking>=0.5.6,<0.8
|
||||
hacking>=0.10.2,<0.11 # Apache-2.0
|
||||
|
||||
coverage>=3.6
|
||||
discover
|
||||
|
Loading…
x
Reference in New Issue
Block a user