bug: name is removed from response

Problem: This is the same issue that hit fluence - Name was removed from the Match response. Solution: Remove it from here, since it is not largely used. Signed-off-by: vsoch <[email protected]>
converged-computing · Oct 11, 2024 · 57618f8 · 57618f8
1 parent 566b4e8
commit 57618f8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/src/fluxnetes/go.mod b/src/fluxnetes/go.mod
@@ -3,7 +3,7 @@ module github.com/converged-computing/fluxnetes
 go 1.21
 
 require (
-	github.com/flux-framework/fluxion-go v0.32.1-0.20240420052153-909523c84ca2
+	github.com/flux-framework/fluxion-go v0.39.0
 	github.com/stretchr/testify v1.7.0
 	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0

diff --git a/src/fluxnetes/go.sum b/src/fluxnetes/go.sum
@@ -98,8 +98,8 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/flux-framework/fluxion-go v0.32.1-0.20240420052153-909523c84ca2 h1:Yz/vVX0XfB2q51ZLh2p8YI5vphvv0rZF4PqtKPscvsY=
-github.com/flux-framework/fluxion-go v0.32.1-0.20240420052153-909523c84ca2/go.mod h1:jA5+kOSLxchFzixzYEvMAGjkXB5yszO/HxUwdhX/5/U=
+github.com/flux-framework/fluxion-go v0.39.0 h1:f68CTxHouyOvjfgu5YKYFHQ405vxtdSlG8crPph8+DU=
+github.com/flux-framework/fluxion-go v0.39.0/go.mod h1:jA5+kOSLxchFzixzYEvMAGjkXB5yszO/HxUwdhX/5/U=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

diff --git a/src/fluxnetes/pkg/jgf/jgf.go b/src/fluxnetes/pkg/jgf/jgf.go
@@ -97,11 +97,9 @@ func (g *FluxJGF) MakeBidirectionalEdge(parent, child string) {
 // MakeEdge creates an edge for the JGF
 func (g *FluxJGF) MakeEdge(source string, target string, contains string) {
 	newedge := edge{
-		Source: source,
-		Target: target,
-		Metadata: edgeMetadata{
-			Name: map[string]string{containmentKey: contains},
-		},
+		Source:   source,
+		Target:   target,
+		Metadata: edgeMetadata{Subsystem: containmentKey},
 	}
 	g.Graph.Edges = append(g.Graph.Edges, newedge)
 }

diff --git a/src/fluxnetes/pkg/jgf/jgf_test.go b/src/fluxnetes/pkg/jgf/jgf_test.go
@@ -44,8 +44,8 @@ func TestNewFluxJGF(t *testing.T) {
 	fmt.Println(out)
 
 	// Add some nodes!
-	computeNodeA := fluxgraph.MakeNode("node", subnetNodeA.Metadata.Name, 0)
-	computeNodeB := fluxgraph.MakeNode("node", subnetNodeB.Metadata.Name, 1)
+	computeNodeA := fluxgraph.MakeNode("node", subnetNodeA.Metadata.Type, 0)
+	computeNodeB := fluxgraph.MakeNode("node", subnetNodeB.Metadata.Type, 1)
 	fluxgraph.MakeBidirectionalEdge(subnetNodeA.Id, computeNodeA.Id)
 	fluxgraph.MakeBidirectionalEdge(subnetNodeB.Id, computeNodeB.Id)
 
@@ -56,11 +56,11 @@ func TestNewFluxJGF(t *testing.T) {
 	fmt.Println(out)
 
 	// Add a GPU to one, and cores to the other
-	subpath := fmt.Sprintf("%s/%s", subnetNodeA.Metadata.Name, computeNodeA.Metadata.Name)
+	subpath := fmt.Sprintf("%s/%s", subnetNodeA.Metadata.Type, computeNodeA.Metadata.Type)
 	gpuNodeA := fluxgraph.MakeGPU(NvidiaGPU, subpath, 1, 0)
 	fluxgraph.MakeBidirectionalEdge(computeNodeA.Id, gpuNodeA.Id)
 
-	subpath = fmt.Sprintf("%s/%s", subnetNodeB.Metadata.Name, computeNodeB.Metadata.Name)
+	subpath = fmt.Sprintf("%s/%s", subnetNodeB.Metadata.Type, computeNodeB.Metadata.Type)
 	coreNode := fluxgraph.MakeCore(CoreType, subpath, 0)
 	fluxgraph.MakeBidirectionalEdge(computeNodeB.Id, coreNode.Id)
 

diff --git a/src/fluxnetes/pkg/jgf/types.go b/src/fluxnetes/pkg/jgf/types.go
@@ -33,7 +33,7 @@ type edge struct {
 }
 
 type edgeMetadata struct {
-	Name map[string]string `json:"name,omitempty"`
+	Subsystem string `json:"subsystem"`
 }
 
 type nodeMetadata struct {

diff --git a/src/fluxnetes/pkg/utils/utils.go b/src/fluxnetes/pkg/utils/utils.go
@@ -256,7 +256,6 @@ func computeTotalRequests(podList *corev1.PodList) map[corev1.ResourceName]resou
 
 type allocation struct {
 	Type      string
-	Name      string
 	Basename  string
 	CoreCount int
 }
@@ -290,7 +289,6 @@ func ParseAllocResult(allocated, groupName string) []allocation {
 		if metadata["type"].(string) == jgf.NodeType {
 			result = append(result, allocation{
 				Type:      metadata["type"].(string),
-				Name:      metadata["name"].(string),
 				Basename:  metadata["basename"].(string),
 				CoreCount: corecount,
 			})
@@ -301,9 +299,9 @@ func ParseAllocResult(allocated, groupName string) []allocation {
 	}
 	fmt.Printf("Final node result for %s\n", groupName)
 	for i, alloc := range result {
-		fmt.Printf("Node %d: %s\n", i, alloc.Name)
-		fmt.Printf("  Type: %s\n  Name: %s\n  Basename: %s\n  CoreCount: %d\n",
-			alloc.Type, alloc.Name, alloc.Basename, alloc.CoreCount)
+		fmt.Printf("Node %d: %s\n", i, alloc.Basename)
+		fmt.Printf("  Type: %s\n  Basename: %s\n  CoreCount: %d\n",
+			alloc.Type, alloc.Basename, alloc.CoreCount)
 
 	}
 	return result