Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/302_explainabilty_query_connecti…
Browse files Browse the repository at this point in the history 
…on' into 302_explainabilty_query_connection
  • Loading branch information
@ShiriMoran
ShiriMoran committed Jan 9, 2024
2 parents 6a01bd4 + b0fbef7 commit fa41982
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 23 deletions.
88 changes: 72 additions & 16 deletions pkg/drawio/drawio_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ func TestWithParsing(t *testing.T) {
if err != nil {
fmt.Println("Error when calling CreateDrawioConnectivityMapFile():", err)
}
n = createNetworkSubnetGroupingMultiVpc()
err = CreateDrawioConnectivityMapFile(n, "subnetGroupingMultiVpc.drawio", true)
if err != nil {
fmt.Println("Error when calling CreateDrawioConnectivityMapFile():", err)
}

n2 := NewNetworkTreeNode()
NewCloudTreeNode(n2, "empty Cloud")
Expand Down Expand Up @@ -284,6 +289,7 @@ func createNetworkAllTypes() SquareTreeNodeInterface {
return network
}

// /////////////////////////////////////////////////////////////////////////////
func createZone(zones *[][]SquareTreeNodeInterface, vpc *VpcTreeNode, size int, name string) {
zone := NewZoneTreeNode(vpc, name)
subnets := make([]SquareTreeNodeInterface, size)
Expand All @@ -305,28 +311,78 @@ func createGroup(zones *[][]SquareTreeNodeInterface, vpc *VpcTreeNode, i1, i2, j
return g
}

type groupIndexes struct {
vpcIndex int
z1, z2 int
s1, s2 int
}

func createNetworkSubnetGrouping() SquareTreeNodeInterface {
groupsIndexes := []groupIndexes{
{0, 0, 0, 0, 1},
{0, 1, 1, 0, 1},
{0, 0, 2, 0, 6},
{0, 0, 2, 4, 6},
{0, 3, 3, 1, 2},
{0, 2, 3, 1, 2},
{0, 0, 4, 0, 3},
{0, 0, 5, 0, 3},

{0, 6, 7, 0, 1},
{0, 6, 6, 2, 3},
{0, 7, 8, 1, 2},
}
return createNetworkSubnetGroupingGeneric(groupsIndexes)
}

func createNetworkSubnetGroupingMultiVpc() SquareTreeNodeInterface {
groupsIndexes := []groupIndexes{
{0, 0, 3, 0, 1},
{0, 1, 4, 0, 1},
{0, 2, 5, 0, 1},
{0, 3, 6, 0, 1},

{0, 7, 8, 0, 1},
{0, 8, 9, 0, 1},

{1, 10, 12, 0, 1},
{1, 11, 13, 0, 1},
{1, 12, 14, 0, 1},

{2, 15, 16, 0, 1},
{2, 16, 17, 0, 1},
{2, 17, 18, 0, 1},
}
return createNetworkSubnetGroupingGeneric(groupsIndexes)
}

func createNetworkSubnetGroupingGeneric(groupsIndexes []groupIndexes) SquareTreeNodeInterface {
network := NewNetworkTreeNode()
zones := &[][]SquareTreeNodeInterface{}
cloud1 := NewCloudTreeNode(network, "IBM Cloud")
publicNetwork := NewPublicNetworkTreeNode(network)
vpc1 := NewVpcTreeNode(cloud1, "vpc1")
for i := 0; i < 10; i++ {
createZone(zones, vpc1, 8, fmt.Sprintf("z%d", i))
zoneIndexToVpcIndex := map[int]int{}
maxVpcIndex := 0
maxZoneIndex := 0
maxSubnetIndex := 0
for _, index := range groupsIndexes {
for z := index.z1; z <= index.z2; z++ {
zoneIndexToVpcIndex[z] = index.vpcIndex
maxVpcIndex = max(maxVpcIndex, index.vpcIndex)
maxZoneIndex = max(maxZoneIndex, index.z2)
maxSubnetIndex = max(maxSubnetIndex, index.s2)
}
}
vpcs := make([]*VpcTreeNode, maxVpcIndex+1)
for i := 0; i <= maxVpcIndex; i++ {
vpcs[i] = NewVpcTreeNode(cloud1, fmt.Sprintf("vpc%d", i))
}
for i := 0; i <= maxZoneIndex; i++ {
createZone(zones, vpcs[zoneIndexToVpcIndex[i]], maxSubnetIndex+1, fmt.Sprintf("z%d", i))
}
groups := []SquareTreeNodeInterface{
createGroup(zones, vpc1, 0, 0, 0, 1),
createGroup(zones, vpc1, 1, 1, 0, 1),
createGroup(zones, vpc1, 0, 2, 0, 6),
createGroup(zones, vpc1, 0, 2, 4, 6),
createGroup(zones, vpc1, 3, 3, 1, 2),
createGroup(zones, vpc1, 2, 3, 1, 2),
createGroup(zones, vpc1, 0, 4, 0, 3),
createGroup(zones, vpc1, 0, 5, 0, 3),

createGroup(zones, vpc1, 6, 7, 0, 1),
createGroup(zones, vpc1, 6, 6, 2, 3),
createGroup(zones, vpc1, 7, 8, 1, 2),
groups := make([]SquareTreeNodeInterface, len(groupsIndexes))
for i, index := range groupsIndexes {
groups[i] = createGroup(zones, vpcs[index.vpcIndex], index.z1, index.z2, index.s1, index.s2)
}
NewConnectivityLineTreeNode(network, groups[0], groups[len(groups)-1], true, "gconn")

Expand Down
41 changes: 34 additions & 7 deletions pkg/drawio/subnetsLayout.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,16 @@ func (ly *subnetsLayout) newGroupFromSplitMiniGroups(group *groupDataS, miniGrou

func (ly *subnetsLayout) calcZoneOrder() {
zonesScores := ly.calcZonePairScores()
zoneOrder := []TreeNodeInterface{}
var zoneOrder []TreeNodeInterface
zoneOrders := [][]TreeNodeInterface{}
for len(zonesScores) > 0 {
zoneToAdd, addToRight := chooseZoneToAdd(zonesScores, zoneOrder)
zoneToAdd, addToRight, newZoneOrder := chooseZoneToAdd(zonesScores, zoneOrder)
if newZoneOrder {
if len(zoneOrder) > 0 {
zoneOrders = append(zoneOrders, zoneOrder)
}
zoneOrder = []TreeNodeInterface{}
}
if addToRight == 1 {
zoneOrder = append(zoneOrder, zoneToAdd)
} else {
Expand All @@ -490,8 +497,28 @@ func (ly *subnetsLayout) calcZoneOrder() {
}
}
}
for i, z := range zoneOrder {
ly.zonesCol[z] = i
if len(zoneOrder) > 0 {
zoneOrders = append(zoneOrders, zoneOrder)
}
ly.setZonesCol(zoneOrders)
}

func (ly *subnetsLayout) setZonesCol(zoneOrders [][]TreeNodeInterface) {
// zoneOrders of the same VPCs must be together
// sorting the zoneOrders by their VPCs:
vpcToOrders := map[TreeNodeInterface][][]TreeNodeInterface{}
for _, order := range zoneOrders {
vpc := order[0].Parent()
vpcToOrders[vpc] = append(vpcToOrders[vpc], order)
}
i := 0
for _, vpcOrders := range vpcToOrders {
for _, order := range vpcOrders {
for _, z := range order {
ly.zonesCol[z] = i
i++
}
}
}
for miniGroup := range ly.miniGroups {
if _, ok := ly.zonesCol[miniGroup.zone]; !ok {
Expand All @@ -517,8 +544,7 @@ func (ly *subnetsLayout) calcZonePairScores() map[TreeNodeInterface]map[TreeNode
return zonesScores
}
func chooseZoneToAdd(zonesScores map[TreeNodeInterface]map[TreeNodeInterface]int,
zoneOrder []TreeNodeInterface) (zoneToAdd TreeNodeInterface,
addToRight int) {
zoneOrder []TreeNodeInterface) (zoneToAdd TreeNodeInterface, addToRight int, newZoneOrder bool) {
addToRight = 1
if len(zoneOrder) > 0 {
zonesAtEdges := []TreeNodeInterface{zoneOrder[0], zoneOrder[len(zoneOrder)-1]}
Expand All @@ -541,6 +567,7 @@ func chooseZoneToAdd(zonesScores map[TreeNodeInterface]map[TreeNodeInterface]int
}
if zoneToAdd == nil {
// in case the zoneOrder is empty. or there are no score with one of the edge zones
newZoneOrder = true
bestScore := 0
for z, friendsScore := range zonesScores {
for _, score := range friendsScore {
Expand All @@ -551,7 +578,7 @@ func chooseZoneToAdd(zonesScores map[TreeNodeInterface]map[TreeNodeInterface]int
}
}
}
return zoneToAdd, addToRight
return zoneToAdd, addToRight, newZoneOrder
}

func (ly *subnetsLayout) createMatrixes() {
Expand Down

0 comments on commit fa41982

Please sign in to comment.