use NetID instead of string name

Author: Eslam-Nawara

pkg/netlight/network.go

@@ -131,7 +131,7 @@ func (n *networker) Delete(name string) error {
 		return err
 	}
 
-	netNR, err := n.networkOf(name)
+	netNR, err := n.networkOf(pkg.NetID(name))
 	if err != nil {
 		return err
 	}
@@ -204,17 +204,17 @@ func (n *networker) AttachZDB(id string) (string, error) {
 
 // GetSubnet of a local network resource identified by the network ID, ipv4 and ipv6
 // subnet respectively
-func (n *networker) GetSubnet(name string) (net.IPNet, error) {
-	localNR, err := n.networkOf(name)
+func (n *networker) GetSubnet(networkID pkg.NetID) (net.IPNet, error) {
+	localNR, err := n.networkOf(networkID)
 	if err != nil {
-		return net.IPNet{}, errors.Wrapf(err, "couldn't load network with name (%s)", name)
+		return net.IPNet{}, errors.Wrapf(err, "couldn't load network with name (%s)", networkID.String())
 	}
 
 	return localNR.Subnet.IPNet, nil
 }
 
-func (n *networker) networkOf(name string) (nr pkg.Network, err error) {
-	path := filepath.Join(n.networkDir, name)
+func (n *networker) networkOf(id pkg.NetID) (nr pkg.Network, err error) {
+	path := filepath.Join(n.networkDir, id.String())
 	file, err := os.OpenFile(path, os.O_RDWR, 0660)
 	if err != nil {
 		return nr, err
@@ -525,21 +525,21 @@ func (n *networker) WireguardPorts() ([]uint, error) {
 }
 
 // GetNet of a network identified by the network ID
-func (n *networker) GetNet(name string) (net.IPNet, error) {
-	localNR, err := n.networkOf(name)
+func (n *networker) GetNet(id pkg.NetID) (net.IPNet, error) {
+	localNR, err := n.networkOf(id)
 	if err != nil {
-		return net.IPNet{}, errors.Wrapf(err, "couldn't load network (%s)", name)
+		return net.IPNet{}, errors.Wrapf(err, "couldn't load network (%s)", id.String())
 	}
 
 	return localNR.NetworkIPRange.IPNet, nil
 }
 
 // GetDefaultGwIP returns the IPs of the default gateways inside the network
 // resource identified by the network ID on the local node, for IPv4
-func (n *networker) GetDefaultGwIP(name string) (net.IP, error) {
-	localNR, err := n.networkOf(name)
+func (n *networker) GetDefaultGwIP(id pkg.NetID) (net.IP, error) {
+	localNR, err := n.networkOf(id)
 	if err != nil {
-		return nil, errors.Wrapf(err, "couldn't load network (%s)", name)
+		return nil, errors.Wrapf(err, "couldn't load network (%s)", id.String())
 	}
 
 	// only IP4 atm
@@ -623,7 +623,7 @@ func (n *networker) releasePort(port uint16) error {
 func (n networker) setupWireguard(name string, net zos.NetworkLight, netr *resource.Resource) error {
 	log.Debug().Msg("setting up wireguard")
 
-	storedNR, err := n.networkOf(name)
+	storedNR, err := n.networkOf(pkg.NetID(name))
 	if err != nil && !os.IsNotExist(err) {
 		return errors.Wrap(err, "failed to load previous network setup")
 	}

pkg/network_light.go

@@ -30,9 +30,9 @@ type NetworkerLight interface {
 	LoadPublicConfig() (PublicConfig, error)
 
 	WireguardPorts() ([]uint, error)
-	GetDefaultGwIP(name string) (net.IP, error)
-	GetNet(name string) (net.IPNet, error)
-	GetSubnet(name string) (net.IPNet, error)
+	GetDefaultGwIP(id NetID) (net.IP, error)
+	GetNet(id NetID) (net.IPNet, error)
+	GetSubnet(id NetID) (net.IPNet, error)
 }
 
 type TapDevice struct {

pkg/primitives/vm-light/utils.go

@@ -201,9 +201,7 @@ func (p *Manager) newPrivNetworkInterface(ctx context.Context, dl gridtypes.Depl
 	network := localStubs.NewNetworkerLightStub(p.zbus)
 	netID := zos.NetworkID(dl.TwinID, inf.Network)
 
-	name := netID.String()
-
-	subnet, err := network.GetSubnet(ctx, name)
+	subnet, err := network.GetSubnet(ctx, netID)
 	if err != nil {
 		return pkg.VMIface{}, errors.Wrapf(err, "could not get network resource subnet")
 	}
@@ -222,7 +220,7 @@ func (p *Manager) newPrivNetworkInterface(ctx context.Context, dl gridtypes.Depl
 		return pkg.VMIface{}, fmt.Errorf("ip %s is reserved", inf.IP.String())
 	}
 
-	privNet, err := network.GetNet(ctx, name)
+	privNet, err := network.GetNet(ctx, netID)
 	if err != nil {
 		return pkg.VMIface{}, errors.Wrapf(err, "could not get network range")
 	}
@@ -232,7 +230,7 @@ func (p *Manager) newPrivNetworkInterface(ctx context.Context, dl gridtypes.Depl
 		Mask: subnet.Mask,
 	}
 
-	gw4, err := network.GetDefaultGwIP(ctx, name)
+	gw4, err := network.GetDefaultGwIP(ctx, netID)
 	if err != nil {
 		return pkg.VMIface{}, errors.Wrap(err, "could not get network resource default gateway")
 	}

pkg/stubs/network_light_stub.go

@@ -126,7 +126,7 @@ func (s *NetworkerLightStub) Detach(ctx context.Context, arg0 string) (ret0 erro
 	return
 }
 
-func (s *NetworkerLightStub) GetDefaultGwIP(ctx context.Context, arg0 string) (ret0 []uint8, ret1 error) {
+func (s *NetworkerLightStub) GetDefaultGwIP(ctx context.Context, arg0 zos.NetID) (ret0 []uint8, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "GetDefaultGwIP", args...)
 	if err != nil {
@@ -143,7 +143,7 @@ func (s *NetworkerLightStub) GetDefaultGwIP(ctx context.Context, arg0 string) (r
 	return
 }
 
-func (s *NetworkerLightStub) GetNet(ctx context.Context, arg0 string) (ret0 net.IPNet, ret1 error) {
+func (s *NetworkerLightStub) GetNet(ctx context.Context, arg0 zos.NetID) (ret0 net.IPNet, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "GetNet", args...)
 	if err != nil {
@@ -160,7 +160,7 @@ func (s *NetworkerLightStub) GetNet(ctx context.Context, arg0 string) (ret0 net.
 	return
 }
 
-func (s *NetworkerLightStub) GetSubnet(ctx context.Context, arg0 string) (ret0 net.IPNet, ret1 error) {
+func (s *NetworkerLightStub) GetSubnet(ctx context.Context, arg0 zos.NetID) (ret0 net.IPNet, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "GetSubnet", args...)
 	if err != nil {