f-89: subnet: mode public_ip raccordé au bridge public comme bridge #89
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
8f1cb96a82
commit
2b252bb40c
8 changed files with 61 additions and 8 deletions
|
|
@ -61,9 +61,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
|
|||
if err := setupVxlanHost(d, vethE); err != nil {
|
||||
return err
|
||||
}
|
||||
case ModePublicIP:
|
||||
return fmt.Errorf("subnet mode %q: host network setup is not implemented yet", d.mode)
|
||||
case ModeBridge:
|
||||
case ModeBridge, ModePublicIP:
|
||||
if err := netif.BridgeSetMaster(vethE, d.localIface); err != nil {
|
||||
return fmt.Errorf("add veth-e to bridge: %w", err)
|
||||
}
|
||||
|
|
@ -122,7 +120,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
|
|||
}); err != nil {
|
||||
return fmt.Errorf("configure netns: %w", err)
|
||||
}
|
||||
case d.mode == ModeBridge:
|
||||
case Bridged(d.mode):
|
||||
if err := netns.Call(d.vpc, func() error {
|
||||
if err := netif.AddrAdd(d.bridge, d.interfaceIP); err != nil {
|
||||
return fmt.Errorf("add addr: %w", err)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ func DeleteSubnet(db *badger.DB, subnetName string, cfg *configuration.Config) e
|
|||
if err := deleteSubnetVxlan(d); err != nil {
|
||||
return err
|
||||
}
|
||||
case "bridge":
|
||||
case ModeBridge, ModePublicIP:
|
||||
if err := deleteSubnetBridge(d); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,3 +13,7 @@ func ValidMode(mode string) bool {
|
|||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func Bridged(mode string) bool {
|
||||
return mode == ModeBridge || mode == ModePublicIP
|
||||
}
|
||||
|
|
|
|||
11
internal/subnet/mode_test.go
Normal file
11
internal/subnet/mode_test.go
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
package subnet
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestBridged(t *testing.T) {
|
||||
for mode, want := range map[string]bool{"bridge": true, "public_ip": true, "vxlan": false, "": false} {
|
||||
if got := Bridged(mode); got != want {
|
||||
t.Errorf("%q : %v, %v attendu", mode, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue