]> git.proxmox.com Git - mirror_ifupdown2.git/commit
addons: bridge: identify a bridge with bridge-ports or bridge-vlan-aware keywords
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Thu, 22 Dec 2016 07:02:12 +0000 (23:02 -0800)
committerRoopa Prabhu <roopa@cumulusnetworks.com>
Thu, 22 Dec 2016 07:13:10 +0000 (23:13 -0800)
commit2521bd83df8005d504ce7303b23ee0e204c67311
tree1a685a5c7284877d94da023bfb12a6e90086b946
parentbca43c556c86d110d4525a64db9ea143bf39a4ab
addons: bridge: identify a bridge with bridge-ports or bridge-vlan-aware keywords

Ticket: CM-14158
Reviewed By: julien, nikhilg
Testing Done: Tested with a bridge config without bridge-ports line.

NCLU wants the ability to create a bridge without ports (to add them
later). Today we cannot specify an attribute without values. We get the
below error:
info: processing interfaces file /etc/network/interfaces
error: /etc/network/interfaces: line10: iface bridge: invalid syntax
'bridge-ports'

The error comes from a generic parser check...we will
need to add exceptions to the generic check if we allow attributes
without values.

This patch simply identifies a bridge by both the bridge-vlan-aware and
bridge-ports keyword. For vlan aware bridge it will simply work.
For old bridge driver nclu will have to specify 'bridge-vlan-aware no'
to achieve the same. nclu does not support old bridge
model today, so defering the old bridge driver discussion for later.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
addons/bridge.py