1 files changed, 16 insertions, 15 deletions
diff --git a/tuskar_ui/infrastructure/resource_management/nodes/tests.py b/tuskar_ui/infrastructure/resource_management/nodes/tests.py
index f0d09851..0f059d26 100644
--- a/tuskar_ui/infrastructure/resource_management/nodes/tests.py
+++ b/tuskar_ui/infrastructure/resource_management/nodes/tests.py
@@ -42,22 +42,22 @@ class NodeViewTests(test.BaseAdminViewTests):
         self.assertItemsEqual(unracked_nodes_table, unracked_baremetal_nodes)
 
     @test.create_stubs({
-        tuskar.TuskarNode: ('get', 'running_virtual_machines', 'list_flavors'),
-        tuskar.Rack: ('get',),
         tuskar.BaremetalNode: ('get',),
+        tuskar.TuskarNode: ('list', 'running_virtual_machines',
+                            'list_flavors'),
+        tuskar.Rack: ('get',),
     })
     def test_detail_node(self):
-        tuskar_node = self.tuskar_nodes.first()
-        tuskar_node.request = self.request
-        rack = self.tuskar_racks.first()
         baremetal_node = self.baremetal_nodes.first()
+        tuskar_nodes = self.tuskar_nodes.list()
+        rack = self.tuskar_racks.first()
 
-        tuskar.TuskarNode.get(mox.IsA(http.HttpRequest),
-                              tuskar_node.id).AndReturn(tuskar_node)
-        tuskar.Rack.get(mox.IsA(http.HttpRequest),
-                        rack.id).AndReturn(rack)
         tuskar.BaremetalNode.get(mox.IsA(http.HttpRequest),
                                  baremetal_node.id).AndReturn(baremetal_node)
+        tuskar.TuskarNode.list(None).AndReturn(tuskar_nodes)
+        tuskar.Rack.get(None, rack.id).AndReturn(rack)
+        tuskar.BaremetalNode.get(None,
+                                 baremetal_node.id).AndReturn(baremetal_node)
         self.mox.ReplayAll()
 
         tuskar.TuskarNode.running_virtual_machines = []
@@ -65,23 +65,24 @@ class NodeViewTests(test.BaseAdminViewTests):
 
         url = urlresolvers.reverse(
             'horizon:infrastructure:resource_management:nodes:detail',
-            args=[tuskar_node.id])
+            args=[baremetal_node.id])
         res = self.client.get(url)
         self.assertTemplateUsed(
             res, 'infrastructure/resource_management/nodes/detail.html')
 
-    @test.create_stubs({tuskar.TuskarNode: ('get',)})
+    @test.create_stubs({tuskar.BaremetalNode: ('get',)})
     def test_detail_node_exception(self):
-        tuskar_node = self.tuskar_nodes.first()
+        baremetal_node = self.baremetal_nodes.first()
 
-        tuskar.TuskarNode.get(mox.IsA(http.HttpRequest),
-                              tuskar_node.id).AndRaise(self.exceptions.tuskar)
+        tuskar.BaremetalNode.get(
+            mox.IsA(http.HttpRequest),
+            baremetal_node.id).AndRaise(self.exceptions.tuskar)
 
         self.mox.ReplayAll()
 
         url = urlresolvers.reverse(
             'horizon:infrastructure:resource_management:nodes:detail',
-            args=[tuskar_node.id])
+            args=[baremetal_node.id])
         res = self.client.get(url)
 
         self.assertRedirectsNoFollow(