diff options
| -rw-r--r-- | openstack_dashboard/test/api_tests/tuskar_tests.py | 20 | ||||
| -rw-r--r-- | openstack_dashboard/test/test_data/tuskar_data.py | 8 |
2 files changed, 21 insertions, 7 deletions
diff --git a/openstack_dashboard/test/api_tests/tuskar_tests.py b/openstack_dashboard/test/api_tests/tuskar_tests.py index 54350d9f..b070c120 100644 --- a/openstack_dashboard/test/api_tests/tuskar_tests.py +++ b/openstack_dashboard/test/api_tests/tuskar_tests.py @@ -53,15 +53,29 @@ class TuskarApiTests(test.APITestCase): def test_resource_class_flavor_counts(self): rc = self.tuskar_resource_classes.first() + flavors = self.tuskar_flavors.list() + + tuskarclient = self.stub_tuskarclient() + tuskarclient.flavors = self.mox.CreateMockAnything() + tuskarclient.flavors.list(rc.id).AndReturn(flavors) + self.mox.ReplayAll() + for f in rc.list_flavors: - self.assertIsInstance(f, api.tuskar.ResourceClassFlavor) - self.assertEquals(7, len(rc.resource_class_flavors)) + self.assertIsInstance(f, api.tuskar.Flavor) + self.assertEquals(2, len(rc.list_flavors)) def test_resource_class_racks(self): rc = self.tuskar_resource_classes.first() + r = self.tuskar_racks.first() + + tuskarclient = self.stub_tuskarclient() + tuskarclient.racks = self.mox.CreateMockAnything() + tuskarclient.racks.get(r.id).AndReturn(r) + self.mox.ReplayAll() + for rack in rc.list_racks: self.assertIsInstance(rack, api.tuskar.Rack) - self.assertEquals(2, len(rc.list_racks)) + self.assertEquals(1, len(rc.list_racks)) def test_resource_class_nodes(self): rc = self.tuskar_resource_classes.first() diff --git a/openstack_dashboard/test/test_data/tuskar_data.py b/openstack_dashboard/test/test_data/tuskar_data.py index 6615ee88..11474c32 100644 --- a/openstack_dashboard/test/test_data/tuskar_data.py +++ b/openstack_dashboard/test/test_data/tuskar_data.py @@ -27,7 +27,7 @@ def data(TEST): TEST.tuskar_flavor_templates = TestDataContainer() flavor_template_1 = FlavorTemplate(FlavorStruct( id="1", - name='m1.tiny', + name='nano', capacities=[ Capacity(CapacityStruct( name='cpu', @@ -51,7 +51,7 @@ def data(TEST): value='0'))])) flavor_template_2 = FlavorTemplate(FlavorStruct( id="2", - name='m1.large', + name='large', capacities=[])) TEST.tuskar_flavor_templates.add(flavor_template_1, flavor_template_2) @@ -59,11 +59,11 @@ def data(TEST): TEST.tuskar_flavors = TestDataContainer() flavor_1 = Flavor(FlavorStruct( id="1", - name='m1.tiny', + name='nano', capacities=[])) flavor_2 = Flavor(FlavorStruct( id="2", - name='m1.large', + name='large', capacities=[])) TEST.tuskar_flavors.add(flavor_1, flavor_2) |