Advertisement
Guest User

Untitled

a guest
Aug 4th, 2014
210
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.49 KB | None | 0 0
  1. diff -r e9feb78ccbee dns/models/dnszone.py
  2. --- a/dns/models/dnszone.py Thu Jul 10 14:48:25 2014 +0400
  3. +++ b/dns/models/dnszone.py Mon Aug 04 14:16:44 2014 +0400
  4. @@ -671,3 +671,22 @@
  5.  def on_delete(sender, instance, **kwargs):
  6.      sync_request(instance.channels, "list", delta=5)
  7.      # @todo: Delete from repo
  8. +
  9. +
  10. +@receiver(post_save, sender=Address)
  11. +def on_address_save(sender, instance, created, **kwargs):
  12. +    """
  13. +    Fires after Address.save()
  14. +    """
  15. +    if created:
  16. +        old = Address.objects.get(id=instance.id)
  17. +        DNSZone.touch(old.address)
  18. +        DNSZone.touch(old.fqdn)
  19. +    DNSZone.touch(instance.address)
  20. +    DNSZone.touch(instance.fqdn)
  21. +
  22. +
  23. +@receiver(pre_delete, sender=Address)
  24. +def on_address_delete(sender, instance, **kwargs):
  25. +    DNSZone.touch(instance.fqdn)
  26. +    DNSZone.touch(instance.address)
  27. diff -r e9feb78ccbee ip/models/address.py
  28. --- a/ip/models/address.py  Thu Jul 10 14:48:25 2014 +0400
  29. +++ b/ip/models/address.py  Mon Aug 04 14:16:44 2014 +0400
  30. @@ -141,27 +141,7 @@
  31.          self.afi = self.get_afi(self.address)
  32.          # Set proper prefix
  33.          self.prefix = Prefix.get_parent(self.vrf, self.afi, self.address)
  34. -        old = None
  35. -        if self.pk:
  36. -            old = Address.objects.get(pk=self.pk)
  37.          super(Address, self).save(**kwargs)
  38. -        # If address or fqdn changed, touch zones
  39. -        if (not old or self.address != old.address or
  40. -            self.fqdn != old.fqdn or self.vrf != old.vrf):
  41. -            # Touch reverse zone
  42. -            DNSZone.touch(self.address)
  43. -            # Touch forward zone
  44. -            DNSZone.touch(self.fqdn)
  45. -            if old and old.fqdn and old.fqdn != self.fqdn:
  46. -                # Touch old forward zone too
  47. -                DNSZone.touch(old.fqdn)
  48. -
  49. -    def delete(self):
  50. -        fqdn = self.fqdn
  51. -        address = self.address
  52. -        super(Address, self).delete()
  53. -        DNSZone.touch(fqdn)
  54. -        DNSZone.touch(address)
  55.  
  56.      def clean(self):
  57.          """
  58. @@ -176,11 +156,11 @@
  59.          elif self.afi == "6":
  60.              check_ipv6(self.address)
  61.  
  62. -    ##
  63. -    ## First line of description
  64. -    ##
  65.      @property
  66.      def short_description(self):
  67. +        """
  68. +        First line of description
  69. +        """
  70.          if self.description:
  71.              return self.description.split("\n", 1)[0].strip()
  72.          else:
  73. @@ -220,6 +200,3 @@
  74.                  )
  75.              }
  76.          )
  77. -
  78. -## Prevent import loop
  79. -from noc.dns.models import DNSZone
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement