Remove vlan_members variable and always add members

This variable was a remainder from the template and doesn't make sense
to me. If tagged or untagged ports are added to a vlan they should be
added to the config.

Author: iljarotar

README.md

@@ -529,7 +529,7 @@ Result:
 }
 ```
 
-### vlans and vlan_members
+### vlans
 
 Example:
 
@@ -546,8 +546,6 @@ vlans:
     untagged_ports:
       - PortChannel11
     vrf: Vrf45
-
-vlan_members: true
 ```
 
 Result:

configdb/configdb.go

@@ -94,7 +94,7 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform, currentDeviceM
 		SAG:                getSAG(input.SAG),
 		VLANs:              getVLANs(input.VLANs),
 		VLANInterfaces:     getVLANInterfaces(input.VLANs),
-		VLANMembers:        getVLANMembers(input.VLANs, input.VLANMembers),
+		VLANMembers:        getVLANMembers(input.VLANs),
 		VRFs:               getVRFs(input.Interconnects, input.Ports, input.VLANs),
 		VXLANEVPN:          vxlanevpn,
 		VXLANTunnels:       vxlanTunnel,
@@ -489,22 +489,16 @@ func getVLANInterfaces(vlans []values.VLAN) map[string]VLANInterface {
 		}
 
 		vlanInterfaces["Vlan"+vlan.ID] = vlanInterface
-
 		if vlan.IP == "" {
 			continue
 		}
-
 		vlanInterfaces["Vlan"+vlan.ID+"|"+vlan.IP] = VLANInterface{}
 	}
 
 	return vlanInterfaces
 }
 
-func getVLANMembers(vlans []values.VLAN, addVlanMembers bool) map[string]VLANMember {
-	if !addVlanMembers {
-		return nil
-	}
-
+func getVLANMembers(vlans []values.VLAN) map[string]VLANMember {
 	vlanMembers := make(map[string]VLANMember)
 
 	for _, vlan := range vlans {

tests/1/sonic-config.yaml

@@ -101,8 +101,6 @@ vlans:
     vrf: Vrf45
   - id: 4001
 
-vlan_members: true
-
 vteps:
   - vni: 103999
     vlan: Vlan3999

tests/2/sonic-config.yaml

@@ -55,5 +55,3 @@ vlans:
       - 10.9.8.6
     ip: 10.9.7.0
   - id: 4001
-
-vlan_members: true

tests/3/sonic-config.yaml

@@ -46,8 +46,6 @@ vlans:
       - Ethernet47
   - id: 4009
 
-vlan_members: true
-
 vteps:
   - vni: 104009
     vlan: Vlan4009

values/values.go

@@ -108,7 +108,6 @@ type Values struct {
 	Ports                   Ports                   `yaml:"ports"`
 	SAG                     SAG                     `yaml:"sag"`
 	SSHSourceranges         []string                `yaml:"ssh_sourceranges"`
-	VLANMembers             bool                    `yaml:"vlan_members"`
 	VLANs                   []VLAN                  `yaml:"vlans"`
 	VTEPs                   []VTEP                  `yaml:"vteps"`
 }