Added vrrp interfaces for gateway redundancy without vxlan

Author: mreiger

.gitignore

@@ -1 +1,2 @@
 bin
+*~

README.md

@@ -588,6 +588,10 @@ vlans:
     untagged_ports:
       - PortChannel11
     vrf: Vrf45
+    vrrp:
+      group: 1
+      priority: 66
+      ip: 10.255.1.1/24
 ```
 
 Result:
@@ -614,6 +618,12 @@ Result:
     "Vlan4000|PortChannel11": {
       "tagging_mode": "untagged"
     }
+  },
+  "VRRP_INTERFACE": {
+      "Vrrp1-v4": {
+          "parent_interface": "Vlan4000"
+      },
+      "Vrrp1-v4|10.255.1.1/24": {}
   }
 }
 ```

configdb/configdb.go

@@ -37,6 +37,7 @@ type ConfigDB struct {
 	VLANs              map[string]VLAN             `json:"VLAN,omitempty"`
 	VLANInterfaces     map[string]VLANInterface    `json:"VLAN_INTERFACE,omitempty"`
 	VLANMembers        map[string]VLANMember       `json:"VLAN_MEMBER,omitempty"`
+	VRRPInterfaces     map[string]VRRPInterface    `json:"VRRP_INTERFACE,omitempty"`
 	VLANSubinterfaces  map[string]VLANSubinterface `json:"VLAN_SUB_INTERFACE,omitempty"`
 	VRFs               map[string]VRF              `json:"VRF,omitempty"`
 	VXLANEVPN          *VXLANEVPN                  `json:"VXLAN_EVPN_NVO,omitempty"`
@@ -76,6 +77,11 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform, environment *p
 		return nil, err
 	}
 
+	vrrpInterfaces, err := getVRRPInterfaces(input.VLANs, version)
+	if err != nil {
+		return nil, err
+	}
+
 	configdb := ConfigDB{
 		ACLRules:          rules,
 		ACLTables:         tables,
@@ -112,6 +118,7 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform, environment *p
 		VLANs:              getVLANs(input.VLANs),
 		VLANInterfaces:     vlanInterfaces,
 		VLANMembers:        getVLANMembers(input.VLANs),
+		VRRPInterfaces:     vrrpInterfaces,
 		VLANSubinterfaces:  getVLANSubinterfaces(input.VLANSubinterfaces),
 		VRFs:               getVRFs(input.Interconnects, input.Ports, input.VLANs),
 		VXLANEVPN:          vxlanevpn,
@@ -576,6 +583,31 @@ func getVLANMembers(vlans []values.VLAN) map[string]VLANMember {
 	return vlanMembers
 }
 
+func getVRRPInterfaces(vlans []values.VLAN, version *v.Version) (map[string]VRRPInterface, error) {
+	vrrpInterfaces := make(map[string]VRRPInterface)
+	for _, vlan := range vlans {
+		if vlan.VRRP.Group == "" {
+			continue
+		}
+
+		if version.Branch != string(v.Branch202111) {
+			return nil, fmt.Errorf("vrrp configuration only works with sonic versions from the ec202111 branch")
+		}
+
+		vrrpInterfaces["Vrrp"+vlan.VRRP.Group+"-v4"] = VRRPInterface{
+			ParentInterface: "Vlan" + vlan.ID,
+		}
+
+		if vlan.VRRP.IP == "" {
+			continue
+		}
+
+		vrrpInterfaces["Vrrp"+vlan.VRRP.Group+"-v4|"+vlan.VRRP.IP] = VRRPInterface{}
+	}
+
+	return vrrpInterfaces, nil
+}
+
 func getVLANSubinterfaces(subinterfaces []values.VLANSubinterface) map[string]VLANSubinterface {
 	vlanSubinterfaces := make(map[string]VLANSubinterface)
 

configdb/fields.go

@@ -220,6 +220,10 @@ type VLANMember struct {
 	TaggingMode TaggingMode `json:"tagging_mode,omitempty"`
 }
 
+type VRRPInterface struct {
+	ParentInterface string `json:"parent_interface,omitempty"`
+}
+
 type VLANSubinterface struct {
 	AdminStatus AdminStatus `json:"admin_status,omitempty"`
 	VRFName     string      `json:"vrf_name,omitempty"`

tests/test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for i in 1 2 3 4
+for i in 1 2 3 4 5
 do
   test_dir=$(pwd)/tests/$i
   docker run --rm --mac-address aa:aa:aa:aa:aa:aa -v $test_dir:/etc/sonic -v $(pwd)/tests/device:/usr/share/sonic/device:ro -v $test_dir:/sonic sonic-configdb-utils:local generate -i /sonic/sonic-config.yaml -o /sonic/config_db.json

values/values.go

@@ -128,6 +128,12 @@ type VLAN struct {
 	TaggedPorts   []string `yaml:"tagged_ports"`
 	UntaggedPorts []string `yaml:"untagged_ports"`
 	VRF           string   `yaml:"vrf"`
+	VRRP          VRRP     `yaml:"vrrp"`
+}
+
+type VRRP struct {
+	Group string `yaml:"group"`
+	IP    string `yaml:"ip"`
 }
 
 type VTEP struct {