fix resource routes

Author: Eslam-Nawara

pkg/netlight/network.go

@@ -120,7 +120,7 @@ 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.Mycelium.Key, net)
+	netr, err := resource.Create(name, b, ip, NDMZGwIP, &net.Subnet.IPNet, net)
 	if err != nil {
 		return err
 	}
@@ -183,7 +183,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 := fmt.Sprintf("n-%s", name)
 
 	ns, err := namespace.GetByName(nsName)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
@@ -288,7 +288,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 {

pkg/netlight/resource/resource.go

@@ -52,10 +52,10 @@ type Resource struct {
 // ndmzGwIP: the gw Ip for the resource. Normally this is the ip assigned to the master bridge.
 // privateNet: optional private network range
 // seed: mycelium seed
-func Create(name string, master *netlink.Bridge, ndmzIP *net.IPNet, ndmzGwIP *net.IPNet, privateNet *net.IPNet, seed []byte, nr zos.NetworkLight) (*Resource, error) {
+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]
@@ -170,11 +170,11 @@ func Create(name string, master *netlink.Bridge, ndmzIP *net.IPNet, ndmzGwIP *ne
 		return nil, fmt.Errorf("failed to apply nft rules for namespace '%s': %w", name, err)
 	}
 	rules.Close()
-	return &Resource{name, nr, nr.Subnet.IPNet}, SetupMycelium(netNS, infMycelium, seed)
+	return &Resource{name, nr, nr.NetworkIPRange.IPNet}, SetupMycelium(netNS, infMycelium, nr.Mycelium.Key)
 }
 
 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,7 @@ 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 := fmt.Sprintf("n-%s", r.name)
 	netNs, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -311,7 +311,7 @@ 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 := fmt.Sprintf("n-%s", r.name)
 	netNS, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -359,7 +359,7 @@ 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 := fmt.Sprintf("n-%s", r.name)
 	netNS, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -432,7 +432,7 @@ 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 := fmt.Sprintf("n-%s", r.name)
 	netNS, err := namespace.GetByName(nsName)
 	if err != nil {
 		return
@@ -489,7 +489,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)
 	}