Skip to content

Gutyán Gábor / circlestack

Go to a project
Commit 51f7a578 by Czémán Arnold
Options

firewall: fix network4 ips in tests

parent 31f1acaa
Showing with 5 additions and 5 deletions
circle/firewall/tests/test_firewall.py
...@@ -77,13 +77,13 @@ class GetNewAddressTestCase(MockCeleryMixin, TestCase): ...@@ -77,13 +77,13 @@ class GetNewAddressTestCase(MockCeleryMixin, TestCase):
d = Domain(name='example.org', owner=self.u1) d = Domain(name='example.org', owner=self.u1)
d.save() d.save()
# /29 = .1-.6 = 6 hosts/subnet + broadcast + network id # /29 = .1-.6 = 6 hosts/subnet + broadcast + network id
self.vlan = Vlan(vid=1, name='test', network4='10.0.0.0/29', self.vlan = Vlan(vid=1, name='test', network4='10.0.0.1/29',
network6='2001:738:2001:4031::/80', domain=d, network6='2001:738:2001:4031::/80', domain=d,
owner=self.u1) owner=self.u1)
self.vlan.clean() self.vlan.clean()
self.vlan.save() self.vlan.save()
self.vlan.host_set.all().delete() self.vlan.host_set.all().delete()
for i in [1] + range(3, 6): for i in range(3, 6):
Host(hostname='h-%d' % i, mac='01:02:03:04:05:%02d' % i, Host(hostname='h-%d' % i, mac='01:02:03:04:05:%02d' % i,
ipv4='10.0.0.%d' % i, vlan=self.vlan, ipv4='10.0.0.%d' % i, vlan=self.vlan,
owner=self.u1).save() owner=self.u1).save()
...@@ -114,7 +114,7 @@ class HostGetHostnameTestCase(MockCeleryMixin, TestCase): ...@@ -114,7 +114,7 @@ class HostGetHostnameTestCase(MockCeleryMixin, TestCase):
self.d = Domain(name='example.org', owner=self.u1) self.d = Domain(name='example.org', owner=self.u1)
self.d.save() self.d.save()
Record.objects.all().delete() Record.objects.all().delete()
self.vlan = Vlan(vid=1, name='test', network4='10.0.0.0/24', self.vlan = Vlan(vid=1, name='test', network4='10.0.0.1/24',
network6='2001:738:2001:4031::/80', domain=self.d, network6='2001:738:2001:4031::/80', domain=self.d,
owner=self.u1, network_type='portforward', owner=self.u1, network_type='portforward',
snat_ip='10.1.1.1') snat_ip='10.1.1.1')
...@@ -194,13 +194,13 @@ class ReloadTestCase(MockCeleryMixin, TestCase): ...@@ -194,13 +194,13 @@ class ReloadTestCase(MockCeleryMixin, TestCase):
self.u1 = User.objects.create(username='user1') self.u1 = User.objects.create(username='user1')
self.u1.save() self.u1.save()
d = Domain.objects.create(name='example.org', owner=self.u1) d = Domain.objects.create(name='example.org', owner=self.u1)
self.vlan = Vlan(vid=1, name='test', network4='10.0.0.0/29', self.vlan = Vlan(vid=1, name='test', network4='10.0.0.1/29',
snat_ip='152.66.243.99', snat_ip='152.66.243.99',
network6='2001:738:2001:4031::/80', domain=d, network6='2001:738:2001:4031::/80', domain=d,
owner=self.u1, network_type='portforward', owner=self.u1, network_type='portforward',
dhcp_pool='manual') dhcp_pool='manual')
self.vlan.save() self.vlan.save()
self.vlan2 = Vlan(vid=2, name='pub', network4='10.1.0.0/29', self.vlan2 = Vlan(vid=2, name='pub', network4='10.1.0.1/29',
network6='2001:738:2001:4032::/80', domain=d, network6='2001:738:2001:4032::/80', domain=d,
owner=self.u1, network_type='public') owner=self.u1, network_type='public')
self.vlan2.save() self.vlan2.save()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment