f-62: vm: MAC fournie à la création par interface, fin de la table préchargée, migration #62
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
c26606787e
commit
077141443e
20 changed files with 338 additions and 171 deletions
|
|
@ -5,7 +5,6 @@ import (
|
|||
"net"
|
||||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/dhcp"
|
||||
"git.g3e.fr/syonad/two/internal/dhcpbackend"
|
||||
"git.g3e.fr/syonad/two/internal/ebtables"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
|
|
@ -139,7 +138,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
|
|||
}
|
||||
}
|
||||
|
||||
return startDHCP(db, subnetName, d, backend)
|
||||
return startDHCP(subnetName, d, backend)
|
||||
}
|
||||
|
||||
func setupVxlanHost(d subnetData, vethE string) error {
|
||||
|
|
@ -165,16 +164,12 @@ func setupVxlanHost(d subnetData, vethE string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func startDHCP(db *badger.DB, subnetName string, d subnetData, backend dhcpbackend.Backend) error {
|
||||
func startDHCP(subnetName string, d subnetData, backend dhcpbackend.Backend) error {
|
||||
defaultGateway, vpcRoute, err := dhcpRouting(d, netif.GetDefaultGateway)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := dhcp.StoreDHCPEntries(db, subnetName, dhcp.Entries(d.cidr)); err != nil {
|
||||
return fmt.Errorf("store dhcp entries: %w", err)
|
||||
}
|
||||
|
||||
listen := ""
|
||||
if d.anycast() {
|
||||
listen = d.gatewayLink()
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import (
|
|||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
|
@ -40,7 +39,7 @@ func DeleteSubnet(db *badger.DB, subnetName string, cfg *configuration.Config) e
|
|||
}
|
||||
}
|
||||
|
||||
if err := stopDHCP(db, subnetName, d, backend); err != nil {
|
||||
if err := stopDHCP(subnetName, d, backend); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
@ -60,19 +59,12 @@ func DeleteSubnet(db *badger.DB, subnetName string, cfg *configuration.Config) e
|
|||
return state.Set(db, "subnet/"+subnetName, state.Deleted)
|
||||
}
|
||||
|
||||
func stopDHCP(db *badger.DB, subnetName string, d subnetData, backend dhcpbackend.Backend) error {
|
||||
if err := backend.TeardownSubnet(dhcpbackend.Subnet{
|
||||
func stopDHCP(subnetName string, d subnetData, backend dhcpbackend.Backend) error {
|
||||
return backend.TeardownSubnet(dhcpbackend.Subnet{
|
||||
Name: subnetName,
|
||||
VPC: d.vpc,
|
||||
Bridge: d.bridge,
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := kv.DeleteInDB(db, "subnet/"+subnetName+"/dhcp"); err != nil {
|
||||
return fmt.Errorf("delete dhcp entries: %w", err)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func deleteSubnetVxlan(d subnetData) error {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue