Make interconnects an array instead of a map

Author: iljarotar

configdb/configdb.go

@@ -219,7 +219,7 @@ func getFeatures(features map[string]values.Feature) map[string]Feature {
 	return configFeatures
 }
 
-func getInterfaces(ports values.Ports, bgpPorts []string, interconnects map[string]values.Interconnect) map[string]Interface {
+func getInterfaces(ports values.Ports, bgpPorts []string, interconnects []values.Interconnect) map[string]Interface {
 	interfaces := make(map[string]Interface)
 
 	for _, port := range ports.List {
@@ -523,7 +523,7 @@ func getVLANMembers(vlans []values.VLAN, addVlanMembers bool) map[string]VLANMem
 	return vlanMembers
 }
 
-func getVRFs(interconnects map[string]values.Interconnect, ports values.Ports, vlans []values.VLAN) map[string]VRF {
+func getVRFs(interconnects []values.Interconnect, ports values.Ports, vlans []values.VLAN) map[string]VRF {
 	vrfs := make(map[string]VRF)
 
 	for _, interconnect := range interconnects {

configdb/configdb_test.go

@@ -15,7 +15,7 @@ func Test_getInterfaces(t *testing.T) {
 		name          string
 		ports         values.Ports
 		bgpPorts      []string
-		interconnects map[string]values.Interconnect
+		interconnects []values.Interconnect
 		want          map[string]Interface
 	}{
 		{
@@ -123,8 +123,8 @@ func Test_getInterfaces(t *testing.T) {
 		},
 		{
 			name: "interconnect without unnumbered interfaces",
-			interconnects: map[string]values.Interconnect{
-				"internet": {
+			interconnects: []values.Interconnect{
+				{
 					UnnumberedInterfaces: []string{},
 					VNI:                  "104000",
 					VRF:                  "VrfInternet",
@@ -134,8 +134,8 @@ func Test_getInterfaces(t *testing.T) {
 		},
 		{
 			name: "interconnect with unnumbered interfaces",
-			interconnects: map[string]values.Interconnect{
-				"internet": {
+			interconnects: []values.Interconnect{
+				{
 					UnnumberedInterfaces: []string{
 						"Ethernet0",
 						"Ethernet1",
@@ -440,15 +440,15 @@ func Test_getPortsAndBreakouts(t *testing.T) {
 func Test_getVRFs(t *testing.T) {
 	tests := []struct {
 		name          string
-		interconnects map[string]values.Interconnect
+		interconnects []values.Interconnect
 		ports         values.Ports
 		vlans         []values.VLAN
 		want          map[string]VRF
 	}{
 		{
 			name: "no ports or vlans to add",
-			interconnects: map[string]values.Interconnect{
-				"mpls": {
+			interconnects: []values.Interconnect{
+				{
 					VNI: "1",
 					VRF: "Vrf40",
 				},
@@ -465,8 +465,8 @@ func Test_getVRFs(t *testing.T) {
 		},
 		{
 			name: "duplicates are not added",
-			interconnects: map[string]values.Interconnect{
-				"mpls": {
+			interconnects: []values.Interconnect{
+				{
 					VNI: "1",
 					VRF: "Vrf40",
 				},
@@ -491,8 +491,8 @@ func Test_getVRFs(t *testing.T) {
 		},
 		{
 			name: "new vrfs are added",
-			interconnects: map[string]values.Interconnect{
-				"mpls": {
+			interconnects: []values.Interconnect{
+				{
 					VNI: "1",
 					VRF: "Vrf40",
 				},

tests/1/sonic-config.yaml

@@ -15,11 +15,9 @@ features:
 frr_mgmt_framework_config: false
 
 interconnects:
-  mpls:
-    vni: 104010
+  - vni: 104010
     vrf: VrfMpls
-  internet:
-    vrf: VrfInternet
+  - vrf: VrfInternet
 
 hostname: leaf01
 lldp_hello_time: 10

values/values.go

@@ -96,7 +96,7 @@ type Values struct {
 	Features                map[string]Feature      `yaml:"features"`
 	FRRMgmtFrameworkConfig  bool                    `yaml:"frr_mgmt_framework_config"`
 	Hostname                string                  `yaml:"hostname"`
-	Interconnects           map[string]Interconnect `yaml:"interconnects"`
+	Interconnects           []Interconnect          `yaml:"interconnects"`
 	LLDPHelloTime           int                     `yaml:"lldp_hello_time"`
 	LoopbackAddress         string                  `yaml:"loopback_address"`
 	MCLAG                   MCLAG                   `yaml:"mclag"`