summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhifeng.jiang <jiang.zhifeng@zte.com.cn>2016-09-25 11:18:53 +0800
committerzhifeng.jiang <jiang.zhifeng@zte.com.cn>2016-09-25 11:18:53 +0800
commit1a8a2f7da01a8ead5f6c0e697f8737a895ccd451 (patch)
tree8b9896c6fbb5b9787690385a57d6d88ed95acc88
parentc4292f93f53f88a48cc3693b464dcdff6a9a0850 (diff)
Bugfix: Get private ip wrong in iperf vm test.
Change-Id: I92c937eaadf5adfa4a8eced5b95af26612d7c523 Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
-rw-r--r--func/driver.py2
-rw-r--r--tests/driver_test.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/func/driver.py b/func/driver.py
index 88d673fa..bcda0ce1 100644
--- a/func/driver.py
+++ b/func/driver.py
@@ -49,7 +49,7 @@ class Driver:
def get_special_var_json(self, role, roles, benchmark_detail, pip_dict):
special_json = {}
index = roles.index(role) + 1
- private_ip = pip_dict[0][1][0] if pip_dict[0][1][0] else 'NONE'
+ private_ip = pip_dict[0][1] if pip_dict[0][1][0] else 'NONE'
map(lambda x: special_json.update({'ip' + str(index): x}), role[1])\
if benchmark_detail and (role[0] == '1-server') else None
map(lambda x: special_json.update({'privateip' + str(index): private_ip}), role[1])\
diff --git a/tests/driver_test.py b/tests/driver_test.py
index 9162ca16..83c69c82 100644
--- a/tests/driver_test.py
+++ b/tests/driver_test.py
@@ -35,13 +35,13 @@ class TestClass:
[('1-server', ['10.20.0.13']), ('2-host', ['10.20.0.15'])],
"iperf_vm.yaml",
[('duration', 20), ('protocol', 'tcp'), ('bandwidthGbps', 0)],
- [("10.20.0.13", [None]), ("10.20.0.15", [None])],
+ [('1-server', '10.10.17.4'), ('2-host', '10.10.17.5')],
{}],
[{'Dest_dir': 'results',
'ip1': '10.20.0.13',
'ip2': '',
'installer': 'joid',
- 'privateip1': 'NONE',
+ 'privateip1': '10.10.17.4',
'workingdir': '/home',
'fname': 'iperf_vm.yaml',
'username': 'ubuntu',
@@ -53,7 +53,7 @@ class TestClass:
'ip1': '10.20.0.13',
'ip2': '',
'installer': 'joid',
- 'privateip1': 'NONE',
+ 'privateip1': '10.10.17.4',
'workingdir': '/home',
'fname': 'iperf_vm.yaml',
'username': 'ubuntu',