use Namespace function instead of repeating "n%s"

Author: Eslam-Nawara

pkg/netlight/network.go

@@ -118,8 +118,6 @@ func (n *networker) Create(name string, wl gridtypes.WorkloadID, net zos.Network
 		}
 	}()
 
-	// _, 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)
 	if err != nil {
 		return err
@@ -183,7 +181,7 @@ func (n *networker) Detach(id string) error {
 
 func (n *networker) AttachZDB(id string) (string, error) {
 	name := ifaceutil.DeviceNameFromInputBytes([]byte(id))
-	nsName := fmt.Sprintf("n-%s", name)
+	nsName := n.Namespace(name)
 
 	ns, err := namespace.GetByName(nsName)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
@@ -288,7 +286,7 @@ func (n *networker) Ready() error {
 }
 
 func (n *networker) Namespace(id string) string {
-	return fmt.Sprintf("n-%s", id)
+	return fmt.Sprintf("n%s", id)
 }
 
 func (n *networker) ZOSAddresses(ctx context.Context) <-chan pkg.NetlinkAddresses {
@@ -558,7 +556,7 @@ func (n *networker) GetDefaultGwIP(name string) (net.IP, error) {
 }
 
 func (n *networker) syncWGPorts() error {
-	names, err := namespace.List("n-")
+	names, err := namespace.List("n")
 	if err != nil {
 		return err
 	}
@@ -570,7 +568,7 @@ func (n *networker) syncWGPorts() error {
 		}
 		defer netNS.Close()
 
-		ifaceName := strings.Replace(name, "n-", "w-", 1)
+		ifaceName := strings.Replace(name, "n", "w-", 1)
 
 		var port int
 		err = netNS.Do(func(_ ns.NetNS) error {

pkg/netlight/resource/resource.go

@@ -55,7 +55,7 @@ type Resource struct {
 func Create(name string, master *netlink.Bridge, ndmzIP *net.IPNet, ndmzGwIP *net.IPNet, privateNet *net.IPNet, nr zos.NetworkLight) (*Resource, error) {
 	privateNetBr := fmt.Sprintf("r%s", name)
 	myBr := fmt.Sprintf("m%s", name)
-	nsName := fmt.Sprintf("n-%s", name)
+	nsName := fmt.Sprintf("n%s", name)
 	peerPrefix := name
 	if len(name) > 4 {
 		peerPrefix = name[0:4]
@@ -174,7 +174,7 @@ func Create(name string, master *netlink.Bridge, ndmzIP *net.IPNet, ndmzGwIP *ne
 }
 
 func Delete(name string) error {
-	nsName := fmt.Sprintf("n-%s", name)
+	nsName := fmt.Sprintf("n%s", name)
 	netNS, err := namespace.GetByName(nsName)
 	if errors.Is(err, os.ErrNotExist) {
 		return nil
@@ -225,7 +225,7 @@ func setLinkAddr(name string, ip *net.IPNet) error {
 
 // Get return resource handler
 func Get(name string) (*Resource, error) {
-	nsName := fmt.Sprintf("n-%s", name)
+	nsName := fmt.Sprintf("n%s", name)
 
 	if namespace.Exists(nsName) {
 		return &Resource{name: name}, nil
@@ -240,7 +240,11 @@ var defaultNet = net.IPNet{
 }
 
 func (r *Resource) AttachPrivate(id string, vmIp net.IP) (device localPkg.TapDevice, err error) {
-	nsName := fmt.Sprintf("n-%s", r.name)
+	nsName, err := r.Namespace()
+	if err != nil {
+		return
+	}
+
 	netNs, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -311,7 +315,11 @@ func (r *Resource) AttachPrivate(id string, vmIp net.IP) (device localPkg.TapDev
 }
 
 func (r *Resource) AttachMycelium(id string, seed []byte) (device localPkg.TapDevice, err error) {
-	nsName := fmt.Sprintf("n-%s", r.name)
+	nsName, err := r.Namespace()
+	if err != nil {
+		return
+	}
+
 	netNS, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -359,7 +367,11 @@ func (r *Resource) AttachMycelium(id string, seed []byte) (device localPkg.TapDe
 }
 
 func (r *Resource) AttachMyceliumZDB(id string, zdbNS ns.NetNS) (err error) {
-	nsName := fmt.Sprintf("n-%s", r.name)
+	nsName, err := r.Namespace()
+	if err != nil {
+		return
+	}
+
 	netNS, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -432,7 +444,11 @@ func (r *Resource) AttachMyceliumZDB(id string, zdbNS ns.NetNS) (err error) {
 }
 
 func (r *Resource) Seed() (seed []byte, err error) {
-	nsName := fmt.Sprintf("n-%s", r.name)
+	nsName, err := r.Namespace()
+	if err != nil {
+		return
+	}
+
 	netNS, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -489,7 +505,7 @@ func (r *Resource) HasWireguard() (bool, error) {
 
 // Namespace returns the name of the network namespace to create for the network resource
 func (r *Resource) Namespace() (string, error) {
-	name := fmt.Sprintf("n-%s", r.name)
+	name := fmt.Sprintf("n%s", r.name)
 	if len(name) > 15 {
 		return "", errors.Errorf("network namespace too long %s", name)
 	}

pkg/primitives/network-light/network.go

@@ -56,8 +56,8 @@ func (p *Manager) Update(ctx context.Context, wl *gridtypes.WorkloadWithID) (int
 }
 
 func (p *Manager) Deprovision(ctx context.Context, wl *gridtypes.WorkloadWithID) error {
-	mgr := stubs.NewNetworkerLightStub(p.zbus)
 	twin, _ := provision.GetDeploymentID(ctx)
+	mgr := stubs.NewNetworkerLightStub(p.zbus)
 
 	if err := mgr.Delete(ctx, string(zos.NetworkID(twin, wl.Name))); err != nil {
 		return fmt.Errorf("failed to delete network resource: %w", err)