From 34f080dd8b7456248ed2e2693030cf736e097606 Mon Sep 17 00:00:00 2001 From: Dan Kenigsberg Date: Tue, 3 Jul 2012 10:53:37 +0300 Subject: [PATCH 29/40] BZ#838097 _addNetworkValidation: do not explode if STP/DNS1 option passed http://gerrit.ovirt.org/5456 has started passing all optional parameters to _addNetworkValidation, but no one is expecting them there. Change-Id: I071e6a7a53279c24d45ebec3858d9b0c0d6294ae Signed-off-by: Dan Kenigsberg Reviewed-on: http://gerrit.ovirt.org/5885 Reviewed-by: Igor Lvovsky Reviewed-on: http://gerrit.ovirt.org/6017 --- vdsm/configNetwork.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index af6c19d..961dd33 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -494,7 +494,7 @@ def validateVlanId(vlan): def _addNetworkValidation(_netinfo, bridge, vlan, bonding, nics, ipaddr, netmask, gateway, bondingOptions, bridged=True, - implicitBonding=False): + implicitBonding=False, **options): # The (relatively) new setupNetwork verb allows to specify a network on # top of an existing bonding device. The nics of this bonds are taken # implictly from current host configuration -- 1.7.7.6