Support vpe

pkg/drawio/abstractTreeNode.go

@@ -5,7 +5,7 @@ import "strings"
 const (
 	minID      = 100
 	nextIDStep = 10
-	niVsiID    = 1
+	miniIconID = 1
 	niFipID    = 2
 	textID     = 3
 	tagID      = 4

pkg/drawio/connectivityMap.drawio.tmpl

@@ -35,14 +35,12 @@
                 <mxGeometry width="{{$node.IconSize}}" height="{{$node.IconSize}}" x="{{$node.X}}" y="{{$node.Y}}" as="geometry"/>
                 </mxCell>
             {{ end }}
+            {{ if $data.HasMiniIcon $node }}
+                <mxCell id="{{$data.IDsPrefix}}-{{$node.MiniIconID}}" value="" style="{{$data.MiniIconStyle $node}}" parent="{{$data.IDsPrefix}}-{{$node.ID}}" vertex="1">
+                <mxGeometry x="{{$data.MiniIconXOffset}}" y="{{$data.MiniIconYOffset}}" width="{{$data.MiniIconSize}}" height="{{$data.MiniIconSize}}" as="geometry"/>
+                </mxCell>
+            {{ end }}
             {{ if $node.IsNI }}
-                {{ if $node.HasVsi }}
-                    {{ if $data.ShowNIIcon }}
-                        <mxCell id="{{$data.IDsPrefix}}-{{$node.VsiID}}" value="" style="{{$data.VsiStyle}}" parent="{{$data.IDsPrefix}}-{{$node.ID}}" vertex="1">
-                        <mxGeometry x="{{$data.VSIXOffset}}" y="{{$data.VSIYOffset}}" width="{{$data.VSISize}}" height="{{$data.VSISize}}" as="geometry"/>
-                        </mxCell>
-                    {{ end }}
-                {{ end }}
                 {{ if $node.HasFip  }}
                     <mxCell id="{{$data.IDsPrefix}}-{{$node.FipID}}" value="{{$node.Fip}}" style="{{$data.FIPStyle}}" parent="{{$data.IDsPrefix}}-{{$node.ID}}" vertex="1">
                     <mxGeometry x="{{$data.FipXOffset}}" y="{{$data.FipYOffset}}" width="{{$node.IconSize}}" height="{{$node.IconSize}}" as="geometry"/>

pkg/drawio/createMapFile.go

@@ -12,17 +12,15 @@ import (
 var drawioTemplate string
 
 type drawioData struct {
-	FipXOffset int
-	FipYOffset int
-	VSIXOffset int
-	VSIYOffset int
-	VSISize    int
-	RootID     uint
-	IDsPrefix  string
-	// ShowNIIcon says if to display the NI as an NI image, or a VSI image
-	// the rule is that if we have a vsi icon, then we display the NI icon as an NI image
-	ShowNIIcon bool
-	Nodes      []TreeNodeInterface
+	FipXOffset           int
+	FipYOffset           int
+	MiniIconXOffset      int
+	MiniIconYOffset      int
+	MiniIconSize         int
+	RootID               uint
+	IDsPrefix            string
+	canTypeHaveAMiniIcon map[reflect.Type]bool
+	Nodes                []TreeNodeInterface
 }
 
 // orderNodesForDrawio() sort the nodes for the drawio canvas
@@ -52,19 +50,42 @@ func orderNodesForDrawio(nodes []TreeNodeInterface) []TreeNodeInterface {
 	return orderedNodes
 }
 
+// mini icons:
+// some icons might have mini icons (ni and resIp). the rule is:
+// if there are no vsi icon in the canvas, all the ni are displayed as vsi icon, and without mini icons
+// if there is a vsi icon in the canvas, than:
+// if the ni is connected to a vsi that has only one ni, than the ni displayed as vsi icon, with an ni mini icons
+// if the ni is connected to a vsi that has more than one ni, than the ni displayed as ni icon, and without mini icons
+// same with resIp and vpe
+
+func getCanTypeHaveMiniIcon(nodes []TreeNodeInterface) map[reflect.Type]bool {
+	typeHasMiniIcon := map[reflect.Type]bool{}
+	for _, tn := range nodes {
+		if reflect.TypeOf(tn).Elem() == reflect.TypeOf(VsiTreeNode{}) {
+			typeHasMiniIcon[reflect.TypeOf(NITreeNode{})] = true
+		}
+		if reflect.TypeOf(tn).Elem() == reflect.TypeOf(VpeTreeNode{}) {
+			typeHasMiniIcon[reflect.TypeOf(ResIPTreeNode{})] = true
+		}
+	}
+	return typeHasMiniIcon
+}
+
 func CreateDrawioConnectivityMapFile(network SquareTreeNodeInterface, outputFile string) error {
 	newLayout(network).layout()
 	allNodes := getAllNodes(network)
 	data := &drawioData{
 		fipXOffset,
 		fipYOffset,
-		vsiXOffset,
-		vsiYOffset,
-		vsiIconSize,
+		miniIconXOffset,
+		miniIconYOffset,
+		miniIconSize,
 		network.ID(),
 		idsPrefix,
-		network.HasVSIs(),
-		orderNodesForDrawio(allNodes)}
+		getCanTypeHaveMiniIcon(allNodes),
+		orderNodesForDrawio(allNodes),
+	}
+
 	return writeDrawioFile(data, outputFile)
 }