firewall: return IP address if there is no hostname

fixes #93

circle/firewall/models.py

@@ -631,6 +631,8 @@ class Host(models.Model):
                 if self.shared_ip and public:
                 if self.shared_ip and public:
                     res = Record.objects.filter(type='A',
                     res = Record.objects.filter(type='A',
                                                 address=self.pub_ipv4)
                                                 address=self.pub_ipv4)
+                    if res.count() < 1:
+                        return unicode(self.pub_ipv4)
                 else:
                 else:
                     res = self.record_set.filter(type='A',
                     res = self.record_set.filter(type='A',
                                                  address=self.ipv4)
                                                  address=self.ipv4)

circle/firewall/tests/test_firewall.py

 from django.test import TestCase
 from django.test import TestCase
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 from ..admin import HostAdmin
 from ..admin import HostAdmin
-from firewall.models import Vlan, Domain, Host
+from firewall.models import Vlan, Domain, Record, Host
 from django.forms import ValidationError
 from django.forms import ValidationError
 
 
 
 
@@ -82,3 +82,32 @@ class GetNewAddressTestCase(TestCase):
         Host(hostname='h-6', mac='01:02:03:04:05:06',
         Host(hostname='h-6', mac='01:02:03:04:05:06',
              ipv4='10.0.0.6', vlan=self.vlan, owner=self.u1).save()
              ipv4='10.0.0.6', vlan=self.vlan, owner=self.u1).save()
         self.assertEqual(self.vlan.get_new_address()['ipv4'], '10.0.0.2')
         self.assertEqual(self.vlan.get_new_address()['ipv4'], '10.0.0.2')
+
+
+class HostGetHostnameTestCase(TestCase):
+    def setUp(self):
+        self.u1 = User.objects.create(username='user1')
+        self.u1.save()
+        self.d = Domain(name='example.org', owner=self.u1)
+        self.d.save()
+        Record.objects.all().delete()
+        self.vlan = Vlan(vid=1, name='test', network4='10.0.0.0/24',
+                         network6='2001:738:2001:4031::/80', domain=self.d,
+                         owner=self.u1, network_type='portforward',
+                         snat_ip='10.1.1.1')
+        self.vlan.save()
+        self.h = Host(hostname='h', mac='01:02:03:04:05:00', ipv4='10.0.0.1',
+                      vlan=self.vlan, owner=self.u1, shared_ip=True,
+                      pub_ipv4=self.vlan.snat_ip)
+        self.h.save()
+
+    def test_issue_93_wo_record(self):
+        self.assertEqual(self.h.get_hostname(proto='ipv4', public=True),
+                         unicode(self.h.pub_ipv4))
+
+    def test_issue_93_w_record(self):
+        self.r = Record(name='vm', type='A', domain=self.d, owner=self.u1,
+                        address=self.vlan.snat_ip)
+        self.r.save()
+        self.assertEqual(self.h.get_hostname(proto='ipv4', public=True),
+                         self.r.fqdn)