From 95aec0a10931ecc61981dba49c93c5bea8d48960 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Tue, 5 Sep 2017 17:32:23 +0800 Subject: Eliminate hard coding about ipmi info 1. Eliminate hard coding 2. Add ipmi info in schemas 3. Add unit test Change-Id: I4561bbc9454e02fd1de2106645db341a4129245b Signed-off-by: Alex Yang --- tests/data/lab_conf/deploy_baremetal.yml | 38 ++++++++++++++++++++++++++++++++ tests/unit/config/test_schemas.py | 5 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tests/data/lab_conf/deploy_baremetal.yml (limited to 'tests') diff --git a/tests/data/lab_conf/deploy_baremetal.yml b/tests/data/lab_conf/deploy_baremetal.yml new file mode 100644 index 00000000..8f9b2644 --- /dev/null +++ b/tests/data/lab_conf/deploy_baremetal.yml @@ -0,0 +1,38 @@ +adapter: 'ipmi' +hosts: +- name: 'controller01' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.11' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' +- name: 'controller02' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.12' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' +- name: 'controller03' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.13' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' +- name: 'computer01' + roles: + - 'COMPUTER' + ipmi_ip: '192.168.1.14' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' +- name: 'computer02' + roles: + - 'COMPUTER' + ipmi_ip: '192.168.1.15' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' +disks: + daisy: 50 +daisy_passwd: 'r00tme' +daisy_ip: '10.20.0.2' +daisy_gateway: '10.20.0.1' +ceph_disk_name: '/dev/sdb' diff --git a/tests/unit/config/test_schemas.py b/tests/unit/config/test_schemas.py index 04705fda..7c7dab28 100644 --- a/tests/unit/config/test_schemas.py +++ b/tests/unit/config/test_schemas.py @@ -23,7 +23,8 @@ def conf_file_dir(data_root): @pytest.mark.parametrize('deploy_file_name', [ ('deploy_virtual1.yml'), - ('deploy_virtual_error.yml')]) + ('deploy_virtual_error.yml'), + ('deploy_baremetal.yml')]) def test_deploy_schema_validate(conf_file_dir, deploy_file_name): data = yaml.safe_load(open(os.path.join(conf_file_dir, deploy_file_name), 'r')) errors = deploy_schema_validate(data) @@ -31,3 +32,5 @@ def test_deploy_schema_validate(conf_file_dir, deploy_file_name): assert errors == [] elif deploy_file_name == 'deploy_virtual_error.yml': assert errors != [] + elif deploy_file_name == 'deploy_baremetal.yml': + assert errors == [] -- cgit 1.2.3-korg