summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-11-19 17:27:58 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-11-19 17:27:58 -0500
commit7c377ed5b87a98634e90bf3b8ec17d897b78f868 (patch)
tree1cbaab6446eb7f0334b5a85c12a5df9f6959e998
parentae6931d147f93ad443957ca9828b3f88202f7e7a (diff)
downloadcobbler-7c377ed5b87a98634e90bf3b8ec17d897b78f868.tar.gz
cobbler-7c377ed5b87a98634e90bf3b8ec17d897b78f868.tar.xz
cobbler-7c377ed5b87a98634e90bf3b8ec17d897b78f868.zip
Update tests for field changes
-rw-r--r--cobbler/test_basic.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/cobbler/test_basic.py b/cobbler/test_basic.py
index b3786d18..092b8006 100644
--- a/cobbler/test_basic.py
+++ b/cobbler/test_basic.py
@@ -404,20 +404,20 @@ class MultiNIC(BootTest):
system = self.api.new_system()
self.assertTrue(system.set_name("nictest"))
self.assertTrue(system.set_profile("testprofile0"))
- self.assertTrue(system.set_hostname("zero","eth0"))
+ self.assertTrue(system.set_dns_name("zero","eth0"))
self.assertTrue(system.set_mac_address("EE:FF:DD:CC:DD:CC","eth1"))
self.assertTrue(system.set_ip_address("127.0.0.5","eth2"))
self.assertTrue(system.set_dhcp_tag("zero","eth3"))
self.assertTrue(system.set_virt_bridge("zero","eth4"))
- self.assertTrue(system.set_gateway("192.168.1.25","eth4"))
+ self.assertTrue(system.set_gateway("192.168.1.25") # is global
self.assertTrue(system.set_mac_address("AA:AA:BB:BB:CC:CC","eth4"))
- self.assertTrue(system.set_hostname("fooserver","eth4"))
+ self.assertTrue(system.set_dns_name("fooserver","eth4"))
self.assertTrue(system.set_dhcp_tag("red","eth4"))
self.assertTrue(system.set_ip_address("192.168.1.26","eth4"))
self.assertTrue(system.set_subnet("255.255.255.0","eth4"))
self.assertTrue(system.set_dhcp_tag("tag2","eth5"))
self.assertTrue(self.api.add_system(system))
- self.assertTrue(self.api.find_system(hostname="fooserver"))
+ self.assertTrue(self.api.find_system(dns_name="fooserver"))
self.assertTrue(self.api.find_system(mac_address="EE:FF:DD:CC:DD:CC"))
self.assertTrue(self.api.find_system(ip_address="127.0.0.5"))
self.assertTrue(self.api.find_system(virt_bridge="zero"))
@@ -433,14 +433,14 @@ class MultiNIC(BootTest):
# and we didn't accidentally fill in any other fields elsewhere
self.assertTrue(system.interfaces.has_key("eth4"))
+ self.assertTrue(system.gateway == "192.168.1.25")
for (name,intf) in system.interfaces.iteritems():
if name == "eth4": # xmlrpc dicts must have string keys, so we must also
- self.assertTrue(intf["gateway"] == "192.168.1.25")
self.assertTrue(intf["virt_bridge"] == "zero")
self.assertTrue(intf["subnet"] == "255.255.255.0")
self.assertTrue(intf["mac_address"] == "AA:AA:BB:BB:CC:CC")
self.assertTrue(intf["ip_address"] == "192.168.1.26")
- self.assertTrue(intf["hostname"] == "fooserver")
+ self.assertTrue(intf["dns_name"] == "fooserver")
self.assertTrue(intf["dhcp_tag"] == "red")
class Utilities(BootTest):