address review comments

Author: iljarotar

configdb/configdb.go

@@ -268,15 +268,14 @@ func getLLDP(interval int) *LLDP {
 }
 
 func getLoopbackInterface(loopback string) map[string]struct{} {
-	loopbackInterface := map[string]struct{}{
-		"Loopback0": {},
+	if loopback == "" {
+		return nil
 	}
 
-	if loopback != "" {
-		loopbackInterface[fmt.Sprintf("Loopback0|%s/32", loopback)] = struct{}{}
+	return map[string]struct{}{
+		"Loopback0":                              {},
+		fmt.Sprintf("Loopback0|%s/32", loopback): {},
 	}
-
-	return loopbackInterface
 }
 
 func getMCLAGDomains(mclag values.MCLAG) map[string]MCLAGDomain {
@@ -564,7 +563,11 @@ func getVRFs(interconnects map[string]values.Interconnect, ports values.Ports, v
 }
 
 func getVXLAN(vtep values.VTEP, loopback string) (*VXLANEVPN, map[string]VXLANTunnel, VXLANTunnelMap) {
-	if !vtep.AddVTEP && len(vtep.VXLANTunnelMaps) == 0 {
+	if !vtep.Enabled && len(vtep.VXLANTunnelMaps) == 0 {
+		return nil, nil, nil
+	}
+
+	if loopback == "" {
 		return nil, nil, nil
 	}
 

tests/2/sonic-config.yaml

@@ -57,4 +57,4 @@ vlans:
   - id: 4001
 
 vtep:
-  add_vtep: true
+  enabled: true

tests/3/expected.json

@@ -187,9 +187,6 @@
       "vrf_name": "VrfInternet"
     }
   },
-  "LOOPBACK_INTERFACE": {
-    "Loopback0": {}
-  },
   "MGMT_PORT": {
     "eth0": {
       "admin_status": "up",
@@ -719,13 +716,5 @@
   },
   "VRF": {
     "VrfInternet": {}
-  },
-  "VXLAN_EVPN_NVO": {
-    "nvo": {
-      "source_vtep": "vtep"
-    }
-  },
-  "VXLAN_TUNNEL": {
-    "vtep": {}
   }
 }

tests/3/sonic-config.yaml

@@ -45,4 +45,4 @@ vlans:
   - id: 4009
 
 vtep:
-  add_vtep: true
+  enabled: true

values/values.go

@@ -123,7 +123,7 @@ type VLAN struct {
 }
 
 type VTEP struct {
-	AddVTEP         bool             `yaml:"add_vtep"`
+	Enabled         bool             `yaml:"enabled"`
 	VXLANTunnelMaps []VXLANTunnelMap `yaml:"vxlan_tunnel_maps"`
 }