Changeset 13705 in genesis for tools

Timestamp:

Jan 15, 2017, 10:25:04 PM (8 years ago)

Author:

rick

Message:

No dhcp allowed when interface is bridge member.

Added pre-checking validation, since it is an likely canidate for confusing and
committing the duplicates will cause the config files generation to fail.

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -219 +219 @@
         datadump[key]['autogen_bridge_member'] = datadump[key].has_key('parent')
         datadump[key]['autogen_bridge'] = datadump[key]['autogen_ifbase'].startswith('bridge')
+
+        if datadump[key].has_key('parent'):
+            if datadump[key].has_key('ip'):
+                raise ValueError("Interface bridge member cannot have IP assigned")
+            if datadump[key].has_key('dhcp') and datadump[key]['dhcp'] != False:
+                raise ValueError("Interface bridge member cannot have DHCP set")
 
         if datadump[key].has_key('ip'):