add lldp time again

Author: iljarotar

README.md

@@ -13,4 +13,12 @@ sonic-confidb-utils generate
 
 Check the [template-values.yaml](template-values.yaml) file to see examples for all accepted variables.
 
-Supported SONiC Version: https://github.com/metal-stack/sonic-build
+## Supported version and limitations
+
+`sonic-configdb-utils` was only tested with our own [build](https://github.com/metal-stack/sonic-build) of SONiC.
+
+### Limitations
+
+Open source SONiC does not support configuring LLDP.
+To enable configuring the LLDP `hello_time` a patch was added to our build.
+However, for the LLDP config to become effective the `lldp` container needs to be restarted, e.g. with `systemctl restart lldp` or `config reload -y`.

configdb/configdb.go

@@ -14,17 +14,18 @@ type ConfigDB struct {
 	ACLRules           map[string]ACLRule        `json:"ACL_RULE,omitempty"`
 	ACLTables          map[string]ACLTable       `json:"ACL_TABLE,omitempty"`
 	Breakouts          map[string]BreakoutConfig `json:"BREAKOUT_CFG,omitempty"`
-	DeviceMetadata     `json:"DEVICE_METADATA,omitempty"`
-	Features           map[string]Feature        `json:"FEATURE,omitempty"`
-	Interfaces         map[string]Interface      `json:"INTERFACE,omitempty"`
+	DeviceMetadata     `json:"DEVICE_METADATA"`
+	Features           map[string]Feature   `json:"FEATURE,omitempty"`
+	Interfaces         map[string]Interface `json:"INTERFACE,omitempty"`
+	LLDP               `json:"LLDP"`
 	LoopbackInterface  map[string]struct{}       `json:"LOOPBACK_INTERFACE,omitempty"`
 	MCLAGDomains       map[string]MCLAGDomain    `json:"MCLAG_DOMAIN,omitempty"`
 	MCLAGInterfaces    map[string]MCLAGInterface `json:"MCLAG_INTERFACE,omitempty"`
 	MCLAGUniqueIPs     map[string]MCLAGUniqueIP  `json:"MCLAG_UNIQUE_IP,omitempty"`
 	MgmtInterfaces     map[string]MgmtInterface  `json:"MGMT_INTERFACE,omitempty"`
 	MgmtPorts          map[string]MgmtPort       `json:"MGMT_PORT,omitempty"`
-	MgmtVRFConfig      `json:"MGMT_VRF_CONFIG,omitempty"`
-	NTP                `json:"NTP,omitempty"`
+	MgmtVRFConfig      `json:"MGMT_VRF_CONFIG"`
+	NTP                `json:"NTP"`
 	NTPServers         map[string]struct{}      `json:"NTP_SERVER,omitempty"`
 	Ports              map[string]Port          `json:"PORT,omitempty"`
 	PortChannels       map[string]PortChannel   `json:"PORTCHANNEL,omitempty"`
@@ -34,7 +35,7 @@ type ConfigDB struct {
 	VLANInterfaces     map[string]VLANInterface `json:"VLAN_INTERFACE,omitempty"`
 	VLANMembers        map[string]VLANMember    `json:"VLAN_MEMBER,omitempty"`
 	VRFs               map[string]VRF           `json:"VRF,omitempty"`
-	VXLANEVPN          `json:"VXLAN_EVPN_NVO,omitempty"`
+	VXLANEVPN          `json:"VXLAN_EVPN_NVO"`
 	VXLANTunnels       map[string]VXLANTunnel `json:"VXLAN_TUNNEL,omitempty"`
 	VXLANTunnelMap     `json:"VXLAN_TUNNEL_MAP,omitempty"`
 }
@@ -66,6 +67,11 @@ func GenerateConfigDB(input *values.Values, platform *p.Platform) (*ConfigDB, er
 			},
 		},
 		Interfaces: getInterfaces(input.Ports, input.BGPPorts),
+		LLDP: LLDP{
+			Global: LLDPGlobal{
+				HelloTime: fmt.Sprintf("%d", input.LLDPHelloTime),
+			},
+		},
 		LoopbackInterface: map[string]struct{}{
 			"Loopback0": {},
 			"Loopback0|" + input.LoopbackAddress + "/32": {},

configdb/fields.go

@@ -80,6 +80,14 @@ const (
 	LACPKeyModeAuto LACPKeyMode = "auto"
 )
 
+type LLDP struct {
+	Global LLDPGlobal `json:"GLOBAL"`
+}
+
+type LLDPGlobal struct {
+	HelloTime string `json:"hello_time,omitempty"`
+}
+
 type MCLAGDomain struct {
 	MCLAGSystemID string `json:"mclag_system_id,omitempty"`
 	PeerIP        string `json:"peer_ip,omitempty"`

template-values.yaml

@@ -15,6 +15,7 @@
 #     vrf: VrfMpls
 
 # hostname: leaf01
+# lldp_hello_time: 10
 # loopback_address: 10.7.7.7
 
 # mclag:

tests/1/expected.json

@@ -163,6 +163,11 @@
       "vrf_name": "VrfInternet"
     }
   },
+  "LLDP": {
+    "GLOBAL": {
+      "hello_time": "10"
+    }
+  },
   "LOOPBACK_INTERFACE": {
     "Loopback0": {},
     "Loopback0|10.7.7.7/32": {}

tests/1/sonic-config.yaml

@@ -16,6 +16,7 @@ interconnects:
     vrf: VrfInternet
 
 hostname: leaf01
+lldp_hello_time: 10
 loopback_address: 10.7.7.7
 
 mclag:

tests/2/expected.json

@@ -158,6 +158,11 @@
       "ipv6_use_link_local_only": "enable"
     }
   },
+  "LLDP": {
+    "GLOBAL": {
+      "hello_time": "10"
+    }
+  },
   "LOOPBACK_INTERFACE": {
     "Loopback0": {},
     "Loopback0|10.7.7.7/32": {}

tests/2/sonic-config.yaml

@@ -9,6 +9,7 @@ docker_routing_config_mode: split
 frr_mgmt_framework_config: false
 
 hostname: leaf01
+lldp_hello_time: 10
 loopback_address: 10.7.7.7
 
 mgmtif_gateway: 10.7.10.1

tests/3/expected.json

@@ -229,6 +229,11 @@
       "ipv6_use_link_local_only": "enable"
     }
   },
+  "LLDP": {
+    "GLOBAL": {
+      "hello_time": "10"
+    }
+  },
   "LOOPBACK_INTERFACE": {
     "Loopback0": {},
     "Loopback0|10.7.7.7/32": {}

tests/3/sonic-config.yaml

@@ -17,6 +17,7 @@ interconnects:
     vrf: VrfInternet
 
 hostname: leaf01
+lldp_hello_time: 10
 loopback_address: 10.7.7.7
 
 mclag: