save network resource on creation

Author: Eslam-Nawara

pkg/netlight/network.go

@@ -20,6 +20,7 @@ import (
 	"github.com/threefoldtech/zosbase/pkg"
 	localPkg "github.com/threefoldtech/zosbase/pkg"
 	"github.com/threefoldtech/zosbase/pkg/cache"
+	"github.com/threefoldtech/zosbase/pkg/gridtypes"
 	"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
 	"github.com/threefoldtech/zosbase/pkg/netbase/wireguard"
 	"github.com/threefoldtech/zosbase/pkg/netlight/bridge"
@@ -41,6 +42,7 @@ const (
 	ipamLeaseDir  = "ndmz-lease"
 	DefaultBridge = "zos"
 	networkDir    = "networks"
+	linkDir       = "link"
 )
 
 var NDMZGwIP = &net.IPNet{
@@ -54,6 +56,7 @@ type networker struct {
 	ipamLease  string
 	networkDir string
 	portSet    *set.UIntSet
+	linkDir    string
 }
 
 var _ localPkg.NetworkerLight = (*networker)(nil)
@@ -66,11 +69,17 @@ func NewNetworker() (localPkg.NetworkerLight, error) {
 
 	ipamLease := filepath.Join(vd, ipamLeaseDir)
 	runtimeDir := filepath.Join(vd, networkDir)
+	linkDir := filepath.Join(runtimeDir, linkDir)
+
+	if err := os.MkdirAll(linkDir, 0755); err != nil {
+		return nil, errors.Wrapf(err, "failed to create directory: '%s'", linkDir)
+	}
 
 	n := networker{
 		ipamLease:  ipamLease,
 		networkDir: runtimeDir,
 		portSet:    set.NewInt(),
+		linkDir:    linkDir,
 	}
 
 	if err := n.syncWGPorts(); err != nil {
@@ -79,7 +88,11 @@ func NewNetworker() (localPkg.NetworkerLight, error) {
 	return &n, nil
 }
 
-func (n *networker) Create(name string, net zos.NetworkLight, seed []byte) error {
+func (n *networker) Create(name string, wl gridtypes.WorkloadID, net zos.NetworkLight) error {
+	if err := n.storeNetwork(name, wl, net); err != nil {
+		return errors.Wrap(err, "failed to store network object")
+	}
+
 	b, err := bridge.Get(NDMZBridge)
 	if err != nil {
 		return err
@@ -89,28 +102,6 @@ func (n *networker) Create(name string, net zos.NetworkLight, seed []byte) error
 		return err
 	}
 
-	storedNR, err := n.networkOf(zos.NetID(name))
-	if err != nil && !os.IsNotExist(err) {
-		return errors.Wrap(err, "failed to load previous network setup")
-	}
-
-	if err == nil {
-		if err := n.releasePort(storedNR.WGListenPort); err != nil {
-			return err
-		}
-	}
-
-	if err := n.reservePort(net.WGListenPort); err != nil {
-		return err
-	}
-
-	// _, err = resource.Create(name, b, ip, NDMZGwIP, &privateNet, seed)
-	netr, err := resource.Create(name, b, ip, NDMZGwIP, &net.Subnet.IPNet, seed, net)
-	// netr, err := resource.Create(name, b, ip, NDMZGwIP, &net.Subnet.IPNet, net.Mycelium.Key, net.NetworkIPRange.IPNet, net)
-	if err != nil {
-		return err
-	}
-
 	cleanup := func() {
 		log.Error().Msg("clean up network resource")
 		if err := resource.Delete(name); err != nil {
@@ -127,39 +118,35 @@ func (n *networker) Create(name string, net zos.NetworkLight, seed []byte) error
 		}
 	}()
 
-	wgName, err := netr.WGName()
+	// _, err = resource.Create(name, b, ip, NDMZGwIP, &privateNet, seed)
+	// netr, err := resource.Create(name, b, ip, NDMZGwIP, &net.Subnet.IPNet, net.Mycelium.Key, net.NetworkIPRange.IPNet, net)
+	netr, err := resource.Create(name, b, ip, NDMZGwIP, &net.Subnet.IPNet, net.Mycelium.Key, net)
 	if err != nil {
-		return errors.Wrap(err, "failed to get wg interface name for network resource")
+		return err
 	}
 
-	exists, err := netr.HasWireguard()
-	if err != nil {
-		return errors.Wrap(err, "failed to check if network resource has wireguard setup")
-	}
+	return n.setupWireguard(name, net, netr)
+}
 
-	if !exists {
-		var wg *wireguard.Wireguard
-		wg, err = wireguard.New(wgName)
-		if err != nil {
-			return errors.Wrapf(err, "failed to create wg interface for network resource '%s'", name)
-		}
-		if err = netr.SetWireguard(wg); err != nil {
-			return errors.Wrap(err, "failed to setup wireguard interface for network resource")
-		}
+func (n *networker) Delete(wl gridtypes.WorkloadWithID) error {
+	if err := ipam.DeAllocateIPv4(wl.ID.String(), n.ipamLease); err != nil {
+		return err
 	}
 
-	if err = netr.ConfigureWG(net.WGPrivateKey); err != nil {
-		return errors.Wrap(err, "failed to configure network resource")
+	netID, err := zos.NetworkIDFromWorkloadID(wl.ID)
+	if err != nil {
+		return err
 	}
-	return err
-}
-
-func (n *networker) Delete(name string) error {
-	if err := ipam.DeAllocateIPv4(name, n.ipamLease); err != nil {
+	netNR, err := n.networkOf(netID)
+	if err != nil {
 		return err
 	}
 
-	return resource.Delete(name)
+	if err := n.releasePort(netNR.WGListenPort); err != nil {
+		log.Error().Err(err).Msg("release wireguard port failed")
+	}
+
+	return resource.Delete(string(wl.ID))
 }
 
 func (n *networker) AttachPrivate(name, id string, vmIp net.IP) (device localPkg.TapDevice, err error) {
@@ -602,3 +589,72 @@ func (n *networker) releasePort(port uint16) error {
 	n.portSet.Remove(uint(port))
 	return nil
 }
+
+func (n networker) setupWireguard(name string, net zos.NetworkLight, netr *resource.Resource) error {
+	storedNR, err := n.networkOf(zos.NetID(name))
+	if err != nil && !os.IsNotExist(err) {
+		return errors.Wrap(err, "failed to load previous network setup")
+	}
+
+	if err == nil {
+		if err := n.releasePort(storedNR.WGListenPort); err != nil {
+			return err
+		}
+	}
+
+	if err := n.reservePort(net.WGListenPort); err != nil {
+		return err
+	}
+
+	wgName, err := netr.WGName()
+	if err != nil {
+		return errors.Wrap(err, "failed to get wg interface name for network resource")
+	}
+
+	exists, err := netr.HasWireguard()
+	if err != nil {
+		return errors.Wrap(err, "failed to check if network resource has wireguard setup")
+	}
+
+	if !exists {
+		var wg *wireguard.Wireguard
+		wg, err = wireguard.New(wgName)
+		if err != nil {
+			return errors.Wrapf(err, "failed to create wg interface for network resource '%s'", name)
+		}
+		if err = netr.SetWireguard(wg); err != nil {
+			return errors.Wrap(err, "failed to setup wireguard interface for network resource")
+		}
+	}
+
+	if err = netr.ConfigureWG(net.WGPrivateKey); err != nil {
+		return errors.Wrap(err, "failed to configure network resource")
+	}
+
+	return nil
+}
+
+func (n *networker) storeNetwork(name string, wl gridtypes.WorkloadID, network zos.NetworkLight) error {
+	// map the network ID to the network namespace
+	path := filepath.Join(n.networkDir, name)
+	file, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	writer, err := versioned.NewWriter(file, NetworkSchemaLatestVersion)
+	if err != nil {
+		return err
+	}
+
+	enc := json.NewEncoder(writer)
+	if err := enc.Encode(&network); err != nil {
+		return err
+	}
+	link := filepath.Join(n.linkDir, wl.String())
+	if err := os.Symlink(filepath.Join("../", name), link); err != nil && !os.IsExist(err) {
+		return errors.Wrap(err, "failed to create network symlink")
+	}
+	return nil
+}

pkg/network_light.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"net"
 
+	"github.com/threefoldtech/zosbase/pkg/gridtypes"
 	"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
 )
 
@@ -12,8 +13,10 @@ import (
 
 // NetworkerLight is the interface for the network light module
 type NetworkerLight interface {
-	Create(name string, net zos.NetworkLight, seed []byte) error
-	Delete(name string) error
+	// Create(name string, net zos.NetworkLight, seed []byte) error
+	Create(name string, wl gridtypes.WorkloadID, net zos.NetworkLight) error
+	// Delete(name string) error
+	Delete(wl gridtypes.WorkloadWithID) error
 	AttachPrivate(name, id string, vmIp net.IP) (device TapDevice, err error)
 	AttachMycelium(name, id string, seed []byte) (device TapDevice, err error)
 	Detach(id string) error

pkg/primitives/network-light/network.go

@@ -39,7 +39,7 @@ func (p *Manager) networkProvisionImpl(ctx context.Context, wl *gridtypes.Worklo
 	mgr := stubs.NewNetworkerLightStub(p.zbus)
 	log.Debug().Str("network", fmt.Sprintf("%+v", network)).Msg("provision network")
 
-	err := mgr.Create(ctx, string(zos.NetworkID(twin, wl.Name)), network, network.Mycelium.Key)
+	err := mgr.Create(ctx, string(zos.NetworkID(twin, wl.Name)), wl.ID, network)
 	if err != nil {
 		return errors.Wrapf(err, "failed to create network resource for network %s", wl.ID)
 	}
@@ -56,10 +56,9 @@ func (p *Manager) Update(ctx context.Context, wl *gridtypes.WorkloadWithID) (int
 }
 
 func (p *Manager) Deprovision(ctx context.Context, wl *gridtypes.WorkloadWithID) error {
-	twin, _ := provision.GetDeploymentID(ctx)
 	mgr := stubs.NewNetworkerLightStub(p.zbus)
 
-	if err := mgr.Delete(ctx, string(zos.NetworkID(twin, wl.Name))); err != nil {
+	if err := mgr.Delete(ctx, *wl); err != nil {
 		return fmt.Errorf("failed to delete network resource: %w", err)
 	}
 

pkg/stubs/network_light_stub.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	zbus "github.com/threefoldtech/zbus"
 	pkg "github.com/threefoldtech/zosbase/pkg"
+	gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes"
 	zos "github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
 	"net"
 )
@@ -80,7 +81,7 @@ func (s *NetworkerLightStub) AttachZDB(ctx context.Context, arg0 string) (ret0 s
 	return
 }
 
-func (s *NetworkerLightStub) Create(ctx context.Context, arg0 string, arg1 zos.NetworkLight, arg2 []uint8) (ret0 error) {
+func (s *NetworkerLightStub) Create(ctx context.Context, arg0 string, arg1 gridtypes.WorkloadID, arg2 zos.NetworkLight) (ret0 error) {
 	args := []interface{}{arg0, arg1, arg2}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "Create", args...)
 	if err != nil {
@@ -95,7 +96,7 @@ func (s *NetworkerLightStub) Create(ctx context.Context, arg0 string, arg1 zos.N
 	return
 }
 
-func (s *NetworkerLightStub) Delete(ctx context.Context, arg0 string) (ret0 error) {
+func (s *NetworkerLightStub) Delete(ctx context.Context, arg0 gridtypes.WorkloadWithID) (ret0 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "Delete", args...)
 	if err != nil {