[IM] Also ensure deterministic ordering of acls for route server configs

inex · Dec 15, 2014 · 9cec6bd · 9cec6bd
1 parent 1183685
commit 9cec6bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/application/Repositories/IrrdbAsn.php b/application/Repositories/IrrdbAsn.php
@@ -23,7 +23,8 @@ public function getForCustomerAndProtocol( $cust, $protocol )
     {
         return $this->getEntityManager()->createQuery(
                     "SELECT p.asn FROM \\Entities\\IrrdbAsn p
-                        WHERE p.Customer = :cust AND p.protocol = :protocol"
+                        WHERE p.Customer = :cust AND p.protocol = :protocol
+                        ORDER BY p.asn ASC, p.id ASC"
                 )
                 ->setParameter( 'cust', $cust )
                 ->setParameter( 'protocol', $protocol )

diff --git a/application/Repositories/IrrdbPrefix.php b/application/Repositories/IrrdbPrefix.php
@@ -23,13 +23,14 @@ public function getForCustomerAndProtocol( $cust, $protocol )
     {
         return $this->getEntityManager()->createQuery(
                     "SELECT p.prefix FROM \\Entities\\IrrdbPrefix p
-                        WHERE p.Customer = :cust AND p.protocol = :protocol"
+                        WHERE p.Customer = :cust AND p.protocol = :protocol
+                        ORDER BY p.prefix ASC, p.id ASC"
                 )
                 ->setParameter( 'cust', $cust )
                 ->setParameter( 'protocol', $protocol )
                 ->getScalarResult();
     }
-    
+
     /**
      * Utility function to get the number of prefixes a customer has for a given protocol
      *