apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-10-06 09:06:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fea:support nexthop group for routing ha (#57)

Browse Source
This commit is contained in:
Teddy_Zhu
2024-04-16 14:23:08 +08:00
committed by GitHub
parent d5a0ef2904
commit c7a27a46bf
13 changed files with 664 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
pkg/config/network.go
View File

@@ -8,24 +8,25 @@ import (
)
type Network struct {
ConfDir string `json:"-"`
File string `json:"file"`
Alias string `json:"-"`
Name string `json:"name"`
Provider string `json:"provider,omitempty"`
Bridge *Bridge `json:"bridge,omitempty"`
Subnet *Subnet `json:"subnet,omitempty"`
OpenVPN *OpenVPN `json:"openvpn,omitempty"`
Links []Point `json:"links,omitempty"`
Hosts []HostLease `json:"hosts,omitempty"`
Routes []PrefixRoute `json:"routes,omitempty"`
Acl string `json:"acl,omitempty"`
Specifies interface{} `json:"specifies,omitempty"`
Dhcp string `json:"dhcp,omitempty"`
Outputs []Output `json:"outputs,omitempty"`
ZTrust string `json:"ztrust,omitempty"`
Qos string `json:"qos,omitempty"`
Namespace string `json:"namespace,omitempty"`
ConfDir string `json:"-"`
File string `json:"file"`
Alias string `json:"-"`
Name string `json:"name"`
Provider string `json:"provider,omitempty"`
Bridge *Bridge `json:"bridge,omitempty"`
Subnet *Subnet `json:"subnet,omitempty"`
OpenVPN *OpenVPN `json:"openvpn,omitempty"`
Links []Point `json:"links,omitempty"`
Hosts []HostLease `json:"hosts,omitempty"`
Routes []PrefixRoute `json:"routes,omitempty"`
Acl string `json:"acl,omitempty"`
Specifies interface{} `json:"specifies,omitempty"`
Dhcp string `json:"dhcp,omitempty"`
Outputs []Output `json:"outputs,omitempty"`
ZTrust string `json:"ztrust,omitempty"`
Qos string `json:"qos,omitempty"`
Namespace string `json:"namespace,omitempty"`
NextGroup map[string]NextGroup `json:"nextgroup,omitempty"`
}
func (n *Network) NewSpecifies() interface{} {
@@ -97,6 +98,11 @@ func (n *Network) Correct(sw *Switch) {
n.OpenVPN.Merge(obj)
n.OpenVPN.Correct(sw)
}
for key, value := range n.NextGroup {
value.Correct()
n.NextGroup[key] = value
}
}
func (n *Network) Dir(elem ...string) string {
@@ -131,6 +137,15 @@ func (n *Network) LoadOutput() {
}
}
func (n *Network) LoadNextGroup() {
file := n.Dir("nextgroup", n.Name+".json")
if err := libol.FileExist(file); err == nil {
if err := libol.UnmarshalLoad(&n.NextGroup, file); err != nil {
libol.Error("Network.LoadNextGroup... %n", err)
}
}
}
func (n *Network) Save() {
obj := *n
obj.Routes = nil
@@ -142,6 +157,7 @@ func (n *Network) Save() {
n.SaveRoute()
n.SaveLink()
n.SaveOutput()
n.SaveNextGroup()
}
func (n *Network) SaveRoute() {
@@ -174,6 +190,16 @@ func (n *Network) SaveOutput() {
}
}
func (n *Network) SaveNextGroup() {
file := n.Dir("nextgroup", n.Name+".json")
if n.NextGroup == nil {
return
}
if err := libol.MarshalSave(n.NextGroup, file, true); err != nil {
libol.Error("Network.SaveNextGroup %s %s", n.Name, err)
}
}
func (n *Network) Reload() {
switch n.Provider {
case "esp":