sag pointer

Author: iljarotar

configdb/configdb.go

@@ -497,8 +497,8 @@ func getPortsAndBreakouts(ports values.Ports, breakouts map[string]string, platf
 	return configPorts, configBreakouts, nil
 }
 
-func getSAG(sag values.SAG, version *v.Version) (*SAG, error) {
-	if version.Branch != string(v.Branch202211) && sag.MAC != "" {
+func getSAG(sag *values.SAG, version *v.Version) (*SAG, error) {
+	if version.Branch != string(v.Branch202211) && sag != nil {
 		return nil, fmt.Errorf("sag configuration only works with sonic versions from the ec202211 branch")
 	}
 

configdb/configdb_test.go

@@ -556,16 +556,14 @@ func Test_getVRFs(t *testing.T) {
 func Test_getSAG(t *testing.T) {
 	tests := []struct {
 		name    string
-		sag     values.SAG
+		sag     *values.SAG
 		version *v.Version
 		want    *SAG
 		wantErr bool
 	}{
 		{
 			name: "wrong version",
-			sag: values.SAG{
-				MAC: "11:11:11:11:11:11",
-			},
+			sag:  &values.SAG{},
 			version: &v.Version{
 				Branch: string(v.Branch202111),
 			},
@@ -574,7 +572,7 @@ func Test_getSAG(t *testing.T) {
 		},
 		{
 			name: "empty mac",
-			sag:  values.SAG{},
+			sag:  &values.SAG{},
 			version: &v.Version{
 				Branch: string(v.Branch202211),
 			},
@@ -583,7 +581,7 @@ func Test_getSAG(t *testing.T) {
 		},
 		{
 			name: "valid",
-			sag: values.SAG{
+			sag: &values.SAG{
 				MAC: "11:11:11:11:11:11",
 			},
 			version: &v.Version{

values/values.go

@@ -106,7 +106,7 @@ type Values struct {
 	NTP                     NTP                     `yaml:"ntp"`
 	PortChannels            PortChannels            `yaml:"portchannels"`
 	Ports                   Ports                   `yaml:"ports"`
-	SAG                     SAG                     `yaml:"sag"`
+	SAG                     *SAG                    `yaml:"sag"`
 	SSHSourceranges         []string                `yaml:"ssh_sourceranges"`
 	VLANs                   []VLAN                  `yaml:"vlans"`
 	VLANSubinterfaces       []VLANSubinterface      `yaml:"vlan_subinterfaces"`