From d4e5373240b97727ce9c4ec6636119bd5849bace Mon Sep 17 00:00:00 2001 From: Anthony Veiga Date: Wed, 11 Jun 2014 10:49:05 -0400 Subject: [PATCH] Fix invalid IPv6 address used in FakeV6 variables Uses RFC 5180 benchmark scope to change bad IPv6 addresses Closes-Bug: #1328889 Change-Id: I224ec8db28d62484f5f4142cfd361162fb37e1b6 --- neutron/tests/unit/test_linux_dhcp.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/neutron/tests/unit/test_linux_dhcp.py b/neutron/tests/unit/test_linux_dhcp.py index f11f3b68b..bedf1755f 100644 --- a/neutron/tests/unit/test_linux_dhcp.py +++ b/neutron/tests/unit/test_linux_dhcp.py @@ -126,8 +126,8 @@ class FakeV4HostRouteGateway: class FakeV6HostRoute: - destination = 'gdca:3ba5:a17a:4ba3::/64' - nexthop = 'gdca:3ba5:a17a:4ba3::1' + destination = '2001:0200:feed:7ac0::/64' + nexthop = '2001:0200:feed:7ac0::1' class FakeV4Subnet: @@ -193,7 +193,7 @@ class FakeV6Subnet: gateway_ip = 'fdca:3ba5:a17a:4ba3::1' enable_dhcp = True host_routes = [FakeV6HostRoute] - dns_nameservers = ['gdca:3ba5:a17a:4ba3::1'] + dns_nameservers = ['2001:0200:feed:7ac0::1'] class FakeV4SubnetNoDHCP: @@ -750,8 +750,8 @@ class TestDnsmasq(TestBase): max_leases=256) def test_output_opts_file(self): - fake_v6 = 'gdca:3ba5:a17a:4ba3::1' - fake_v6_cidr = 'gdca:3ba5:a17a:4ba3::/64' + fake_v6 = '2001:0200:feed:7ac0::1' + fake_v6_cidr = '2001:0200:feed:7ac0::/64' expected = ( 'tag:tag0,option:dns-server,8.8.8.8\n' 'tag:tag0,option:classless-static-route,20.0.0.1/24,20.0.0.1,' @@ -773,8 +773,8 @@ class TestDnsmasq(TestBase): self.safe.assert_called_once_with('/foo/opts', expected) def test_output_opts_file_gateway_route(self): - fake_v6 = 'gdca:3ba5:a17a:4ba3::1' - fake_v6_cidr = 'gdca:3ba5:a17a:4ba3::/64' + fake_v6 = '2001:0200:feed:7ac0::1' + fake_v6_cidr = '2001:0200:feed:7ac0::/64' expected = """ tag:tag0,option:dns-server,8.8.8.8 tag:tag0,option:router,192.168.0.1 @@ -1043,8 +1043,8 @@ tag:tag0,option:router""".lstrip() 'host-192-168-0-1\n' ).lstrip() exp_opt_name = '/dhcp/cccccccc-cccc-cccc-cccc-cccccccccccc/opts' - fake_v6 = 'gdca:3ba5:a17a:4ba3::1' - fake_v6_cidr = 'gdca:3ba5:a17a:4ba3::/64' + fake_v6 = '2001:0200:feed:7ac0::1' + fake_v6_cidr = '2001:0200:feed:7ac0::/64' exp_opt_data = ( 'tag:tag0,option:dns-server,8.8.8.8\n' 'tag:tag0,option:classless-static-route,20.0.0.1/24,20.0.0.1,' -- 2.45.2