aboutsummaryrefslogtreecommitdiff
path: root/rpki/gui/app/models.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-11-05 18:36:55 +0000
committerRob Austein <sra@hactrn.net>2014-11-05 18:36:55 +0000
commitbe7513a26ac17ebd036a3eeee7d0ee2e173143a4 (patch)
tree0164f0b0c043642ca26cade4cc8017e3f3e8c77c /rpki/gui/app/models.py
parent6ff4e63a4950f04cff6936ae81a2c6e6f2dfc1c4 (diff)
Missed an _elt in [6002]. Pull changes from trunk.
svn path=/branches/tk705/; revision=6004
Diffstat (limited to 'rpki/gui/app/models.py')
-rw-r--r--rpki/gui/app/models.py26
1 files changed, 17 insertions, 9 deletions
diff --git a/rpki/gui/app/models.py b/rpki/gui/app/models.py
index 9d453261..ed32e9d2 100644
--- a/rpki/gui/app/models.py
+++ b/rpki/gui/app/models.py
@@ -153,11 +153,15 @@ class Conf(rpki.irdb.models.ResourceHolderCA):
# build a Q filter to select all RouteOrigin objects covered by
# prefixes in the resource holder's certificates
- q = models.Q()
- for p in ResourceRangeAddressV4.objects.filter(cert__conf=self):
- q |= models.Q(prefix_min__gte=p.prefix_min,
+ prefixes = ResourceRangeAddressV4.objects.filter(cert__conf=self)
+ if prefixes:
+ q = models.Q()
+ for p in prefixes:
+ q |= models.Q(prefix_min__gte=p.prefix_min,
prefix_max__lte=p.prefix_max)
- return RouteOrigin.objects.filter(q)
+ return RouteOrigin.objects.filter(q)
+ else:
+ return RouteOrigin.objects.none()
@property
def routes_v6(self):
@@ -167,11 +171,15 @@ class Conf(rpki.irdb.models.ResourceHolderCA):
# build a Q filter to select all RouteOrigin objects covered by
# prefixes in the resource holder's certificates
- q = models.Q()
- for p in ResourceRangeAddressV6.objects.filter(cert__conf=self):
- q |= models.Q(prefix_min__gte=p.prefix_min,
- prefix_max__lte=p.prefix_max)
- return RouteOriginV6.objects.filter(q)
+ prefixes = ResourceRangeAddressV6.objects.filter(cert__conf=self)
+ if prefixes:
+ q = models.Q()
+ for p in ResourceRangeAddressV6.objects.filter(cert__conf=self):
+ q |= models.Q(prefix_min__gte=p.prefix_min,
+ prefix_max__lte=p.prefix_max)
+ return RouteOriginV6.objects.filter(q)
+ else:
+ return RouteOriginV6.objects.none()
def send_alert(self, subject, message, from_email, severity=Alert.INFO):
"""Store an alert for this resource holder."""