firewall: fix handling of MX and multiple A records

firewall/models.py

@@ -296,7 +296,7 @@ class Record(models.Model):
                 raise ValidationError(_("Unknown record type."))
                 raise ValidationError(_("Unknown record type."))
 
 
     def __get_name(self):
     def __get_name(self):
-        if self.host:
+        if self.host and self.type != 'MX':
             if self.type in ['A', 'AAAA']:
             if self.type in ['A', 'AAAA']:
                 return self.host.get_fqdn()
                 return self.host.get_fqdn()
             elif self.type == 'CNAME':
             elif self.type == 'CNAME':

one/models.py

@@ -420,11 +420,10 @@ class Instance(models.Model):
             else:
             else:
                 if self.template.network.nat:
                 if self.template.network.nat:
                     ip = self.firewall_host.pub_ipv4
                     ip = self.firewall_host.pub_ipv4
-                    return Record.objects.get(type='A', address=ip).get_data()['name']
+                    return Record.objects.filter(type='A', address=ip)[0].get_data()['name']
                 else:
                 else:
                     return self.firewall_host.record_set.filter(type='A')[0].get_data()['name']
                     return self.firewall_host.record_set.filter(type='A')[0].get_data()['name']
         except:
         except:
-            raise
             if self.template.network.nat:
             if self.template.network.nat:
                 return self.firewall_host.pub_ipv4
                 return self.firewall_host.pub_ipv4
             else:
             else: