|
|
@@ -8,6 +8,7 @@ import (
|
|
|
"os"
|
|
|
"os/exec"
|
|
|
"path/filepath"
|
|
|
+ "sort"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"sync"
|
|
|
@@ -294,6 +295,11 @@ func (sm *ServerManager) ListServers() []DHCPServerInstance {
|
|
|
copyS.ActiveLeases = activeLeases[s.Name]
|
|
|
list = append(list, copyS)
|
|
|
}
|
|
|
+
|
|
|
+ sort.Slice(list, func(i, j int) bool {
|
|
|
+ return list[i].Name < list[j].Name
|
|
|
+ })
|
|
|
+
|
|
|
return list
|
|
|
}
|
|
|
|
|
|
@@ -372,6 +378,11 @@ func (sm *ServerManager) ListNetworks() []DHCPNetwork {
|
|
|
for _, n := range sm.networks {
|
|
|
list = append(list, n)
|
|
|
}
|
|
|
+
|
|
|
+ sort.Slice(list, func(i, j int) bool {
|
|
|
+ return list[i].Address < list[j].Address
|
|
|
+ })
|
|
|
+
|
|
|
return list
|
|
|
}
|
|
|
|
|
|
@@ -449,6 +460,10 @@ func (sm *ServerManager) ListLeases() []DHCPLease {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ sort.Slice(result, func(i, j int) bool {
|
|
|
+ return compareIPs(net.ParseIP(result[i].Address), net.ParseIP(result[j].Address)) < 0
|
|
|
+ })
|
|
|
+
|
|
|
return result
|
|
|
}
|
|
|
|
|
|
@@ -630,6 +645,11 @@ func (sm *ServerManager) ListOptions() []DHCPOption {
|
|
|
for _, o := range sm.options {
|
|
|
list = append(list, o)
|
|
|
}
|
|
|
+
|
|
|
+ sort.Slice(list, func(i, j int) bool {
|
|
|
+ return list[i].Code < list[j].Code
|
|
|
+ })
|
|
|
+
|
|
|
return list
|
|
|
}
|
|
|
|