bug fix: empty per-partition topology when tree topology is not set (#162)

Signed-off-by: Dmitry Shmulevich <[email protected]>

Author: dmitsh

pkg/translate/topology.go

@@ -11,6 +11,7 @@ import (
 	"sort"
 
 	"github.com/agrea/ptr"
+	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/topograph/pkg/topology"
 )
@@ -126,6 +127,7 @@ func (nt *NetworkTopology) initTree(root *topology.Vertex) {
 			nt.vertices[v.ID] = v
 			if len(v.Vertices) == 0 {
 				nt.nodeInfo[v.Name] = &nodeInfo{instanceID: v.ID}
+				klog.V(4).InfoS("initTree: adding nodeInfo", "name", v.Name, "instanceID", v.ID)
 			}
 		}
 		for id, w := range v.Vertices {
@@ -165,6 +167,13 @@ func (nt *NetworkTopology) initBlocks(root *topology.Vertex) {
 			}
 			for _, w := range v.Vertices {
 				bInfo.nodes = append(bInfo.nodes, w.Name)
+
+				nt.nodeInfo[w.Name] = &nodeInfo{
+					instanceID: w.ID,
+					blockID:    id,
+					blockIndx:  ptr.Int(indx),
+				}
+				klog.V(4).InfoS("initBlocks: adding nodeInfo", "name", w.Name, "blockID", id, "blockIndx", indx)
 			}
 			nt.blocks = append(nt.blocks, bInfo)
 			indx++

pkg/translate/yaml_test.go

@@ -172,3 +172,45 @@ func TestMixedYamlTopology(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, expected, buf.String())
 }
+
+func TestBlockOnlyYamlTopology(t *testing.T) {
+	expected := `- topology: topo1
+  clusterDefault: true
+  block:
+    blockSizes:
+        - 2
+    blocks:
+        - block: block0
+          nodes: Node[104-105]
+- topology: topo2
+  clusterDefault: false
+  block:
+    blockSizes:
+        - 2
+    blocks:
+        - block: block0
+          nodes: Node[301,303]
+`
+
+	v, _ := GetBlockWithMultiIBTestSet()
+	delete(v.Vertices, topology.TopologyTree)
+
+	cfg := &Config{
+		Topologies: map[string]*TopologySpec{
+			"topo1": {
+				Plugin:         topology.TopologyBlock,
+				Nodes:          []string{"Node[104,105]"},
+				ClusterDefault: true,
+			},
+			"topo2": {
+				Plugin: topology.TopologyBlock,
+				Nodes:  []string{"Node[301,303]"},
+			},
+		},
+	}
+	nt, _ := NewNetworkTopology(v, cfg)
+	buf := &bytes.Buffer{}
+	err := nt.Generate(buf)
+	require.NoError(t, err)
+	require.Equal(t, expected, buf.String())
+}