load mycelium keys in the network, remove commented print, ue slices.…

…Contains instead of loop
threefoldtech · Oct 21, 2024 · ddf4b43 · ddf4b43
1 parent dbe67be
commit ddf4b43
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/grid-client/state/state.go b/grid-client/state/state.go
@@ -380,9 +380,16 @@ func (st *State) LoadNetworkFromGrid(ctx context.Context, name string) (znet wor
 		nodes = append(nodes, net.Nodes...)
 	}
 
+	myceliumKeys := make(map[uint32][]byte)
+	for _, net := range zNets {
+		maps.Copy(myceliumKeys, net.MyceliumKeys)
+		nodes = append(nodes, net.Nodes...)
+	}
+
 	znet.NodeDeploymentID = nodeDeploymentsIDs
 	znet.Nodes = nodes
 	znet.NodesIPRange = nodesIPRange
+	znet.MyceliumKeys = myceliumKeys
 	znet.Keys = keys
 	znet.WGPort = wgPort
 
@@ -456,15 +463,22 @@ func (st *State) LoadNetworkLightFromGrid(ctx context.Context, name string) (zne
 
 	// merge networks
 	var nodes []uint32
-	nodesIPRange := map[uint32]zosTypes.IPNet{}
+	nodesIPRange := make(map[uint32]zosTypes.IPNet)
 	for _, net := range zNets {
 		maps.Copy(nodesIPRange, net.NodesIPRange)
 		nodes = append(nodes, net.Nodes...)
 	}
 
+	myceliumKeys := make(map[uint32][]byte)
+	for _, net := range zNets {
+		maps.Copy(myceliumKeys, net.MyceliumKeys)
+		nodes = append(nodes, net.Nodes...)
+	}
+
 	znet.NodeDeploymentID = nodeDeploymentsIDs
 	znet.Nodes = nodes
 	znet.NodesIPRange = nodesIPRange
+	znet.MyceliumKeys = myceliumKeys
 
 	st.Networks.UpdateNetworkSubnets(znet.Name, znet.NodesIPRange)
 	return znet, nil

diff --git a/grid-client/workloads/network_interface.go b/grid-client/workloads/network_interface.go
@@ -32,8 +32,6 @@ type Network interface {
 		endpoints map[uint32]net.IP,
 		nodeUsedPorts map[uint32][]uint16,
 	) (map[uint32]zos.Deployment, error)
-	generateDeployments(endpointIPs map[uint32]net.IP, usedPorts map[uint32][]uint16, publicNode, twinID uint32,
-	) (map[uint32]zos.Deployment, error)
 	ReadNodesConfig(ctx context.Context, nodeDeployments map[uint32]zos.Deployment) error
 
 	GetNodes() []uint32

diff --git a/grid-client/zos/ipnet.go b/grid-client/zos/ipnet.go
@@ -13,7 +13,7 @@ func ParseIPNet(txt string) (r IPNet, err error) {
 		//empty ip net value
 		return r, nil
 	}
-	//fmt.Println("parsing: ", string(text))
+
 	ip, net, err := net.ParseCIDR(txt)
 	if err != nil {
 		return r, err
@@ -52,7 +52,7 @@ func (i IPNet) MarshalJSON() ([]byte, error) {
 	return []byte(v), nil
 }
 
-// MarshalJSON dumps iprange as a string
+// MarshalText dumps iprange as a string
 func (i IPNet) MarshalText() ([]byte, error) {
 	if len(i.IPNet.IP) == 0 {
 		return []byte{}, nil

diff --git a/grid-client/zos/workload.go b/grid-client/zos/workload.go
@@ -3,6 +3,7 @@ package zos
 import (
 	"encoding/json"
 	"io"
+	"slices"
 
 	"github.com/threefoldtech/zos/pkg/gridtypes"
 	gridtypes4 "github.com/threefoldtech/zos4/pkg/gridtypes"
@@ -56,13 +57,7 @@ func (r *Result) Unmarshal(v interface{}) error {
 type ResultState string
 
 func (s ResultState) IsAny(state ...ResultState) bool {
-	for _, in := range state {
-		if s == in {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(state, s)
 }
 
 func (s ResultState) IsOkay() bool {