summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyu Ishimoto <ryu@midokura.jp>2011-07-07 01:04:56 +0900
committerRyu Ishimoto <ryu@midokura.jp>2011-07-07 01:04:56 +0900
commit2b553a89b34d7a3691c0952c5debda6b5ea1bb79 (patch)
treed99e11c86878450bf75fd84ea788755240a14378
parentf568d9345d19064c0024523195b17eb9e7d036ef (diff)
Added net_attrs argument for ensure_bridge/vlan methods
-rw-r--r--nova/network/l2_drivers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/network/l2_drivers.py b/nova/network/l2_drivers.py
index 1e66dcd26..e1de5cc5b 100644
--- a/nova/network/l2_drivers.py
+++ b/nova/network/l2_drivers.py
@@ -26,7 +26,7 @@ class L2Driver(object):
"""Create a bridge unless it already exists."""
raise NotImplementedError()
- def ensure_vlan(vlan_num, bridge_interface):
+ def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
"""Create a vlan unless it already exists."""
raise NotImplementedError()
@@ -38,9 +38,9 @@ class LinuxBridgeDriver(L2Driver):
"""Create a Linux bridge unless it already eixsts."""
linux_net.ensure_bridge(bridge, interface, net_attrs)
- def ensure_vlan(vlan_num, bridge_interface):
+ def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
"""Create a vlan unless it already exists."""
- return linux_net.ensure_vlan(vlan_num, bridge_interface)
+ return linux_net.ensure_vlan(vlan_num, bridge_interface, net_attrs)
class QuantumDriver(L2Driver):
@@ -50,7 +50,7 @@ class QuantumDriver(L2Driver):
"""Do nothing."""
pass
- def ensure_vlan(vlan_num, bridge_interface):
+ def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
"""Return None."""
return None