From ca7b8665dce213c51ae1e15dceede7cc9fba97c1 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 5 Oct 2017 15:17:53 -0400 Subject: Updates to Inventory object - moved get_node_counts over from overcloud/deploy.py - added more test coverage Change-Id: I7774bebb99169aa1da0f07cb2cfc0c1d197af5ca Signed-off-by: Dan Radez --- apex/tests/test_apex_inventory.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'apex/tests/test_apex_inventory.py') 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)) -- cgit 1.2.3-korg