diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-10-12 14:02:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-12 14:02:15 +0000 |
| commit | f5ff4ff13a1ab3b45454268f1871a2ba5c4cd944 (patch) | |
| tree | e56b265fb1232800c43f4f917eb99d68a4ce0ac5 /apex/tests/test_apex_inventory.py | |
| parent | 6ddb7d379156ba03c9c4bdcb01679d6727cb4dd6 (diff) | |
| parent | dbfb8214328d08c0f8bd967b422476b1a503a001 (diff) | |
Merge "Updates to Inventory object" into stable/euphrates
Diffstat (limited to 'apex/tests/test_apex_inventory.py')
| -rw-r--r-- | apex/tests/test_apex_inventory.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/apex/tests/test_apex_inventory.py b/apex/tests/test_apex_inventory.py index 87e7d50b..71979465 100644 --- a/apex/tests/test_apex_inventory.py +++ b/apex/tests/test_apex_inventory.py @@ -15,7 +15,7 @@ from nose.tools import ( assert_raises) from apex import Inventory -from apex.inventory.inventory import InventoryException +from apex.inventory.inventory import ApexInventoryException from apex.tests.constants import ( TEST_CONFIG_DIR, TEST_DUMMY_CONFIG @@ -47,14 +47,17 @@ class TestInventory: for f in inventory_files: i = Inventory(os.path.join(files_dir, f)) assert_equal(i.dump_instackenv_json(), None) + i['nodes'][0]['arch'] = 'aarch64' + i = Inventory(i) + assert_equal(i['nodes'][0]['arch'], 'aarch64') def test_inventory_invalid_ha_count(self): - assert_raises(InventoryException, Inventory, + assert_raises(ApexInventoryException, Inventory, os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt.yaml'), virtual=True, ha=True) def test_inventory_invalid_noha_count(self): - assert_raises(InventoryException, Inventory, + assert_raises(ApexInventoryException, Inventory, os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt-1-node.yaml'), virtual=True, ha=False) @@ -64,7 +67,7 @@ class TestInventory: virtual=True, ha=False) assert_equal(i.dump_instackenv_json(), None) - def test_exception(self): - e = InventoryException("test") - print(e) - assert_is_instance(e, InventoryException) + def test_get_node_counts(self): + i = Inventory(os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt.yaml'), + virtual=True, ha=False) + assert_equal(i.get_node_counts(), (1, 1)) |