← Back to branch summary

~allenap/maas/ipmi-power-confusion--bug-1560830

« back to all changes in this revision

Viewing changes to src/maasserver/dns/tests/test_zonegenerator.py

  • Committer: MAAS Lander
  • Author(s): LaMont Jones
  • Date: 2016-04-25 18:06:57 UTC
  • mfrom: (4933.2.9 bug-1571621)
  • Revision ID: maas_lander-20160425180657-flyd1jupqx7ec9zk
[r=mpontillo][bug=1562919,1571621,1573690][author=lamont] Handle delegations for subdomains.  Fix the handling of fqdn in the dns apis when it refers to the top of a domain.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/dns/tests/test_zonegenerator.py
325
325
                reverse_zone(default_domain, "10/29"),
326
326
                reverse_zone(default_domain, "10/24")))
327
327
 
 
328
    def test_with_child_domain_yields_delegation(self):
 
329
        default_domain = Domain.objects.get_default_domain().name
 
330
        domain = factory.make_Domain(name='henry')
 
331
        factory.make_Domain(name="john.henry")
 
332
        subnet = factory.make_Subnet(cidr=str(IPNetwork("10/29").cidr))
 
333
        factory.make_Node_with_Interface_on_Subnet(
 
334
            subnet=subnet, vlan=subnet.vlan, fabric=subnet.vlan.fabric)
 
335
        zones = ZoneGenerator(
 
336
            domain, subnet, serial=random.randint(0, 65535)).as_list()
 
337
        self.assertThat(
 
338
            zones, MatchesSetwise(
 
339
                forward_zone("henry"),
 
340
                reverse_zone(default_domain, "10/29"),
 
341
                reverse_zone(default_domain, "10/24")))
 
342
        expected_map = {'john': HostnameRRsetMapping(
 
343
            None, {(30, 'A', '127.0.0.1'), (30, 'NS', 'john')})}
 
344
        self.assertItemsEqual(expected_map, zones[0]._other_mapping)
 
345
 
328
346
    def test_returns_interface_ips_but_no_nulls(self):
329
347
        default_domain = Domain.objects.get_default_domain().name
330
348
        domain = factory.make_Domain(name='henry')