[#1208] Extracted pools are sorted

isc-projects · Nov 24, 2023 · c1f82e5 · c1f82e5
1 parent 142de9c
commit c1f82e5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/webui/src/app/subnets.spec.ts b/webui/src/app/subnets.spec.ts
@@ -177,16 +177,23 @@ describe('subnets', () => {
                                 },
                             },
                             {
-                                pool: '3000::10-3000::15',
+                                pool: '3000::40-3000::65',
                             },
                             {
                                 pool: '3000::20-3000::35',
                             },
                             {
-                                pool: '3000::40-3000::65',
+                                pool: '3000::10-3000::15',
                             },
                         ],
                         prefixDelegationPools: [
+                            {
+                                prefix: '3003::/64',
+                                delegatedLength: 80,
+                                keaConfigPoolParameters: {
+                                    clientClass: 'bar',
+                                },
+                            },
                             {
                                 prefix: '3001::/64',
                                 delegatedLength: 80,
@@ -197,13 +204,6 @@ describe('subnets', () => {
                                 delegatedLength: 80,
                                 excludedPrefix: '3002::/96',
                             },
-                            {
-                                prefix: '3003::/64',
-                                delegatedLength: 80,
-                                keaConfigPoolParameters: {
-                                    clientClass: 'bar',
-                                },
-                            },
                         ],
                     },
                     {
@@ -217,10 +217,10 @@ describe('subnets', () => {
                                 },
                             },
                             {
-                                pool: '3000::10-3000::15',
+                                pool: '3000::20-3000::35',
                             },
                             {
-                                pool: '3000::20-3000::35',
+                                pool: '3000::10-3000::15',
                             },
                             {
                                 pool: '3000::70-3000::85',

diff --git a/webui/src/app/subnets.ts b/webui/src/app/subnets.ts
@@ -1,3 +1,4 @@
+import { AddressRange } from './address-range'
 import { DelegatedPrefixPool, KeaConfigPoolParameters, LocalSubnet, Pool, SharedNetwork, Subnet } from './backend'
 
 /**
@@ -209,7 +210,21 @@ export function extractUniqueSubnetPools(subnets: Subnet[] | Subnet): SubnetWith
                 }
             }
         }
-        convertedSubnet.pools = pools.sort()
+        convertedSubnet.pools = pools.sort((a, b) => {
+            try {
+                const range1 = AddressRange.fromStringRange(a.pool)
+                const range2 = AddressRange.fromStringRange(b.pool)
+                if (range1.first.isLessThan(range2.first)) {
+                    return -1
+                } else if (range1.first.isGreaterThan(range2.first)) {
+                    return 1
+                }
+            } catch (_) {
+                // Parsing error is very unlikely but we have to handle it.
+                return 1
+            }
+            return 0
+        })
         convertedSubnet.prefixDelegationPools = prefixDelegationPools.sort((a, b) => a.prefix.localeCompare(b.prefix))
     }
     return convertedSubnets