update block format output (#51)

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

Author: dmitsh

pkg/server/http_server_test.go

@@ -164,10 +164,14 @@ SwitchName=sw14 Nodes=n14-[1-2]
   ]
 }
 `,
-			expected: `BlockName=nvl1 Nodes=n11-[1-2]
-BlockName=nvl2 Nodes=n12-[1-2]
-BlockName=nvl3 Nodes=n13-[1-2]
-BlockName=nvl4 Nodes=n14-[1-2]
+			expected: `# block001=nvl1
+BlockName=block001 Nodes=n11-[1-2]
+# block002=nvl2
+BlockName=block002 Nodes=n12-[1-2]
+# block003=nvl3
+BlockName=block003 Nodes=n13-[1-2]
+# block004=nvl4
+BlockName=block004 Nodes=n14-[1-2]
 BlockSizes=2,4
 `,
 		},

pkg/translate/block.go

@@ -17,6 +17,7 @@
 package translate
 
 import (
+	"fmt"
 	"sort"
 
 	"github.com/NVIDIA/topograph/pkg/topology"
@@ -40,14 +41,24 @@ func (m DomainMap) ToBlocks() *topology.Vertex {
 	}
 	sort.Strings(domainNames)
 
-	for _, domainName := range domainNames {
-		domain := m[domainName]
+	for i, domainName := range domainNames {
+		nodes := make([]string, 0, len(m[domainName]))
+		for node := range m[domainName] {
+			nodes = append(nodes, node)
+		}
+		sort.Strings(nodes)
+
 		vertex := &topology.Vertex{
-			ID:       domainName,
+			ID:       fmt.Sprintf("block%03d", i+1),
+			Name:     domainName,
 			Vertices: make(map[string]*topology.Vertex),
 		}
-		for node := range domain {
-			vertex.Vertices[node] = &topology.Vertex{Name: node, ID: node}
+
+		for _, node := range nodes {
+			vertex.Vertices[node] = &topology.Vertex{
+				Name: node,
+				ID:   node,
+			}
 		}
 
 		blockRoot.Vertices[domainName] = vertex

pkg/translate/block_test.go

@@ -41,7 +41,8 @@ func TestToBlocks(t *testing.T) {
 			blocks: &topology.Vertex{
 				Vertices: map[string]*topology.Vertex{
 					"domain1": {
-						ID: "domain1",
+						Name: "domain1",
+						ID:   "block001",
 						Vertices: map[string]*topology.Vertex{
 							"host1": {ID: "host1", Name: "host1"},
 							"host2": {ID: "host2", Name: "host2"},
@@ -59,14 +60,16 @@ func TestToBlocks(t *testing.T) {
 			blocks: &topology.Vertex{
 				Vertices: map[string]*topology.Vertex{
 					"domain1": {
-						ID: "domain1",
+						Name: "domain1",
+						ID:   "block001",
 						Vertices: map[string]*topology.Vertex{
 							"host1": {ID: "host1", Name: "host1"},
 							"host2": {ID: "host2", Name: "host2"},
 						},
 					},
 					"domain2": {
-						ID: "domain2",
+						Name: "domain2",
+						ID:   "block002",
 						Vertices: map[string]*topology.Vertex{
 							"host3": {ID: "host3", Name: "host3"},
 						},

pkg/translate/output.go

@@ -50,7 +50,11 @@ func printBlock(wr io.Writer, block *topology.Vertex, domainVisited map[string]i
 		for _, node := range block.Vertices { //nodes within each domain
 			nodes = append(nodes, node.Name)
 		}
-		_, err := wr.Write([]byte(fmt.Sprintf("BlockName=%s Nodes=%s\n", block.ID, strings.Join(compress(nodes), ","))))
+		var comment string
+		if len(block.Name) != 0 {
+			comment = fmt.Sprintf("# %s=%s\n", block.ID, block.Name)
+		}
+		_, err := wr.Write([]byte(fmt.Sprintf("%sBlockName=%s Nodes=%s\n", comment, block.ID, strings.Join(compress(nodes), ","))))
 		if err != nil {
 			return err
 		}