diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-10-19 01:22:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-19 01:22:48 +0000 |
| commit | c4860a5ba7ae7d6d3dc5dcf365e61b68d61a8265 (patch) | |
| tree | cfd42e135ffc5571ecc63aec8cbb36819ae3b06f /tests/unit/test_get_conf.py | |
| parent | 7e0f730d0926b5efb93fb749ddf3951266df8b9b (diff) | |
| parent | 07ca3da85fdde4638a81d3be4563a01e35af5e77 (diff) | |
Merge "remove unused null value of assigned network"
Diffstat (limited to 'tests/unit/test_get_conf.py')
| -rw-r--r-- | tests/unit/test_get_conf.py | 24 |
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', |