From: liang gao <jean.gaoliang@huawei.com>
Date: Mon, 1 Aug 2016 07:24:31 +0000 (+0000)
Subject: Updated armband
X-Git-Tag: colorado.1.rc1~196
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=be9ed6a61db4ee7713934bf4a4fdd424a5ea93f2;p=armband.git

Updated armband
Project: yardstick  fe46800c17c055ee337dddb2e2de00d6db128cda

Bugfix: Only add keyword "external_network" to the first network

In test case yaml file, when vm need three networks and enable
floating ip true, it should only add keyword "external_network"
to the first one.

'networks': {'test': {'cidr': '10.0.1.0/24', 'external_network':
'admin_floating_net'}, 'test3': {'cidr': '10.0.3.0/24'},
'test2': {'cidr': '10.0.2.0/24'}}

JIRA:YARDSTICK-309

Change-Id: I1126955749b598b8c5460ac75843c1939b4f8443
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---

diff --git a/upstream/yardstick b/upstream/yardstick
index f29d7858..fe46800c 160000
--- a/upstream/yardstick
+++ b/upstream/yardstick
@@ -1 +1 @@
-Subproject commit f29d785861ae0021ffe35b054ab77379253abb8b
+Subproject commit fe46800c17c055ee337dddb2e2de00d6db128cda