disallow sag on vlan interfaces if sonic version is not from branch 202211

Author: iljarotar

configdb/configdb.go

@@ -71,6 +71,11 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform, environment *p
 		return nil, err
 	}
 
+	vlanInterfaces, err := getVLANInterfaces(input.VLANs, version)
+	if err != nil {
+		return nil, err
+	}
+
 	configdb := ConfigDB{
 		ACLRules:          rules,
 		ACLTables:         tables,
@@ -105,7 +110,7 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform, environment *p
 		PortChannelMembers: getPortChannelMembers(input.PortChannels.List),
 		SAG:                sag,
 		VLANs:              getVLANs(input.VLANs),
-		VLANInterfaces:     getVLANInterfaces(input.VLANs),
+		VLANInterfaces:     vlanInterfaces,
 		VLANMembers:        getVLANMembers(input.VLANs),
 		VLANSubinterfaces:  getVLANSubinterfaces(input.VLANSubinterfaces),
 		VRFs:               getVRFs(input.Interconnects, input.Ports, input.VLANs),
@@ -493,7 +498,7 @@ func getPortsAndBreakouts(ports values.Ports, breakouts map[string]string, platf
 }
 
 func getSAG(sag values.SAG, version *v.Version) (*SAG, error) {
-	if version.Branch != string(v.Branch202211) {
+	if version.Branch != string(v.Branch202211) && sag.MAC != "" {
 		return nil, fmt.Errorf("sag configuration only works with sonic versions from the ec202211 branch")
 	}
 
@@ -521,15 +526,23 @@ func getVLANs(vlans []values.VLAN) map[string]VLAN {
 	return configVLANs
 }
 
-func getVLANInterfaces(vlans []values.VLAN) map[string]VLANInterface {
+func getVLANInterfaces(vlans []values.VLAN, version *v.Version) (map[string]VLANInterface, error) {
 	vlanInterfaces := make(map[string]VLANInterface)
 
 	for _, vlan := range vlans {
 		var vlanInterface VLANInterface
 
+		if version.Branch != string(v.Branch202211) && vlan.SAG != nil {
+			return nil, fmt.Errorf("sag only works for sonic builds from branch 202211")
+		}
+		var sag string
+		if vlan.SAG != nil {
+			sag = strconv.FormatBool(*vlan.SAG)
+		}
+
 		if vlan.VRF != "" {
 			vlanInterface = VLANInterface{
-				StaticAnycastGateway: strconv.FormatBool(vlan.SAG),
+				StaticAnycastGateway: sag,
 				VRFName:              vlan.VRF,
 			}
 		}
@@ -541,7 +554,7 @@ func getVLANInterfaces(vlans []values.VLAN) map[string]VLANInterface {
 		vlanInterfaces["Vlan"+vlan.ID+"|"+vlan.IP] = VLANInterface{}
 	}
 
-	return vlanInterfaces
+	return vlanInterfaces, nil
 }
 
 func getVLANMembers(vlans []values.VLAN) map[string]VLANMember {

tests/1/expected.json

@@ -582,11 +582,6 @@
     "PortChannel01|Ethernet4": {},
     "PortChannel01|Ethernet5": {}
   },
-  "SAG": {
-    "GLOBAL": {
-      "gateway_mac": "bb:bb:bb:bb:bb:bb"
-    }
-  },
   "VLAN": {
     "Vlan4000": {
       "dhcp_servers": [
@@ -601,7 +596,6 @@
   },
   "VLAN_INTERFACE": {
     "Vlan4000": {
-      "static_anycast_gateway": "true",
       "vrf_name": "Vrf45"
     },
     "Vlan4000|10.9.7.0": {},

tests/1/sonic-config.yaml

@@ -87,9 +87,6 @@ ports:
       vrf: VrfInternet
     - name: Ethernet120
 
-sag:
-  mac: bb:bb:bb:bb:bb:bb
-
 ssh_sourceranges:
   - 10.1.23.1/30
 
@@ -99,7 +96,6 @@ vlans:
       - 10.9.8.7
       - 10.9.8.6
     ip: 10.9.7.0
-    sag: true
     tagged_ports:
       - PortChannel01
     untagged_ports:

tests/4/expected.json

@@ -642,13 +642,21 @@
       "speed": "1000"
     }
   },
+  "SAG": {
+    "GLOBAL": {
+      "gateway_mac": "bb:bb:bb:bb:bb:bb"
+    }
+  },
   "VLAN": {
     "Vlan4000": {
       "vlanid": "4000"
     }
   },
   "VLAN_INTERFACE": {
-    "Vlan4000": {},
+    "Vlan4000": {
+      "static_anycast_gateway": "true",
+      "vrf_name": "Vrf45"
+    },
     "Vlan4000|10.255.1.1/24": {}
   },
   "VLAN_SUB_INTERFACE": {
@@ -657,5 +665,8 @@
       "vrf_name": "Vrf45"
     },
     "Ethernet0.1000|1.2.3.0/24": {}
+  },
+  "VRF": {
+    "Vrf45": {}
   }
 }

tests/4/sonic-config.yaml

@@ -15,6 +15,9 @@ ntp:
     - 162.159.200.1
     - 162.159.200.123
 
+sag:
+  mac: bb:bb:bb:bb:bb:bb
+
 vlan_subinterfaces:
   - cidr: 1.2.3.0/24
     port: Ethernet0
@@ -24,3 +27,5 @@ vlan_subinterfaces:
 vlans:
   - id: 4000
     ip: 10.255.1.1/24
+    sag: true
+    vrf: Vrf45

values/values.go

@@ -124,7 +124,7 @@ type VLAN struct {
 	DHCPServers   []string `yaml:"dhcp_servers"`
 	ID            string   `yaml:"id"`
 	IP            string   `yaml:"ip"`
-	SAG           bool     `yaml:"sag"`
+	SAG           *bool    `yaml:"sag"`
 	TaggedPorts   []string `yaml:"tagged_ports"`
 	UntaggedPorts []string `yaml:"untagged_ports"`
 	VRF           string   `yaml:"vrf"`