summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorzhouya <zhou.ya@zte.com.cn>2017-10-12 18:55:50 +0800
committerzhouya <zhou.ya@zte.com.cn>2017-10-13 10:01:32 +0800
commit07ca3da85fdde4638a81d3be4563a01e35af5e77 (patch)
treeac4fc95082ba3dd7bf0fdad1c69721e6cb7daaed /tests/unit
parent164ffc1780a6ffd2634533849f67ed640fb0745b (diff)
remove unused null value of assigned network
change 'map' reserved keyword of python to regular variable Change-Id: I077eca363c095d0596fcd06bbad2e442050cb264 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/test_get_conf.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/unit/test_get_conf.py b/tests/unit/test_get_conf.py
index dd8480fa..4da6a521 100644
--- a/tests/unit/test_get_conf.py
+++ b/tests/unit/test_get_conf.py
@@ -32,12 +32,12 @@ def test_get_yml_para(conf_file_dir, deploy_file_name, expected):
@pytest.mark.parametrize('deploy_file_name, network_file_name, expected', [
('deploy_virtual1.yml', 'network_virtual1.yml',
- ({'ens8': [{'ip': '', 'name': 'EXTERNAL'}],
- 'ens3': [{'ip': '', 'name': 'MANAGEMENT'},
- {'ip': '', 'name': 'PUBLICAPI'},
- {'ip': '', 'name': 'STORAGE'},
- {'ip': '', 'name': 'physnet1'}],
- 'ens9': [{'ip': '', 'name': 'HEARTBEAT'}]},
+ ({'ens8': [{'name': 'EXTERNAL'}],
+ 'ens3': [{'name': 'MANAGEMENT'},
+ {'name': 'PUBLICAPI'},
+ {'name': 'STORAGE'},
+ {'name': 'physnet1'}],
+ 'ens9': [{'name': 'HEARTBEAT'}]},
['computer01', 'computer02', 'controller01', 'controller02', 'controller03'],
{'MANAGEMENT': {'cidr': '10.20.11.0/24', 'gateway': '10.20.11.1',
'ip_ranges': [{'start': '10.20.11.3',
@@ -63,12 +63,12 @@ def test_get_yml_para(conf_file_dir, deploy_file_name, expected):
{'controller01': [], 'controller02': [], 'controller03': [],
'computer01': [], 'computer02': []})),
('deploy_virtual2.yml', 'network_virtual2.yml',
- ({'ens8': [{'ip': '', 'name': 'EXTERNAL'}],
- 'ens3': [{'ip': '', 'name': 'MANAGEMENT'},
- {'ip': '', 'name': 'PUBLICAPI'},
- {'ip': '', 'name': 'STORAGE'},
- {'ip': '', 'name': 'physnet1'}],
- 'ens9': [{'ip': '', 'name': 'HEARTBEAT'}]},
+ ({'ens8': [{'name': 'EXTERNAL'}],
+ 'ens3': [{'name': 'MANAGEMENT'},
+ {'name': 'PUBLICAPI'},
+ {'name': 'STORAGE'},
+ {'name': 'physnet1'}],
+ 'ens9': [{'name': 'HEARTBEAT'}]},
['all_in_one'],
{'MANAGEMENT': {'cidr': '10.20.11.0/24', 'gateway': '10.20.11.1',
'ip_ranges': [{'start': '10.20.11.3',