Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: client/tests/kvm/kvm_vm.py

Issue 3554003: Merge remote branch 'cros/upstream' into tempbranch3 (Closed) Base URL: http://git.chromium.org/git/autotest.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/tests/kvm/kvm_test_utils.py ('k') | client/tests/kvm/scripts/unattended.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/kvm/kvm_vm.py
diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index bdc9aabcff2ae65f6bf6116ee54feb5923129dd1..135d08ebd8270040bfeb50aa4e5ae1132ccecfbc 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -235,9 +235,10 @@ class VM:
return cmd
def add_nic(help, vlan, model=None, mac=None, netdev_id=None):
- cmd = " -net nic,vlan=%d" % vlan
if has_option(help, "netdev"):
- cmd +=",netdev=%s" % netdev_id
+ cmd = " -net nic,netdev=%s" % netdev_id
+ else:
+ cmd = " -net nic,vlan=%d" % vlan
if model: cmd += ",model=%s" % model
if mac: cmd += ",macaddr='%s'" % mac
return cmd
« no previous file with comments | « client/tests/kvm/kvm_test_utils.py ('k') | client/tests/kvm/scripts/unattended.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698