diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2007-10-23 12:58:18 -0400 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2007-10-23 12:58:18 -0400 |
commit | 81ba366a938bca7a14426feea913e791002edfa9 (patch) | |
tree | aa0d15854266be4b7cfe5585edda9a2ae1eaa4a5 | |
parent | 695c92d9ffb75d113f07d84b3851e64d6b9b7a97 (diff) | |
download | third_party-cobbler-81ba366a938bca7a14426feea913e791002edfa9.tar.gz third_party-cobbler-81ba366a938bca7a14426feea913e791002edfa9.tar.xz third_party-cobbler-81ba366a938bca7a14426feea913e791002edfa9.zip |
Some more work on removing the API refs in util...
-rw-r--r-- | cobbler/utils.py | 6 | ||||
-rw-r--r-- | tests/tests.py | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cobbler/utils.py b/cobbler/utils.py index 157974e..4579438 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -262,7 +262,7 @@ def grab_tree(api_handle, obj): """ Climb the tree and get every node. """ - settings = api_handle.BootAPI().settings() + settings = api_handle.settings() results = [ obj ] parent = obj.get_parent() while parent is not None: @@ -277,8 +277,8 @@ def blender(api_handle,remove_hashes, root_obj): of that point on the tree, and produce a merged hash containing consolidated data. """ - settings = api_handle.BootAPI().settings() - tree = grab_tree(root_obj) + settings = api_handle.settings() + tree = grab_tree(api_handle, root_obj) tree.reverse() # start with top of tree, override going down results = {} for node in tree: diff --git a/tests/tests.py b/tests/tests.py index 4fe7a5d..9f4fe9c 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -314,7 +314,7 @@ class Utilities(BootTest): # above it's actual profile. This should NOT be present in the # actual object, which we have not modified yet. - data = utils.blender(False, system2) + data = utils.blender(self.api, False, system2) self.assertTrue(data["repos"] == ["testrepo"]) self.assertTrue(self.api.profiles().find(system2.profile).repos == "<<inherit>>") @@ -336,7 +336,7 @@ class Utilities(BootTest): self.api.sync() self.api.sync() - data = utils.blender(False, system2) + data = utils.blender(self.api, False, system2) self.assertTrue("testrepo" in data["repos"]) self.assertTrue("testrepo2" in data["repos"]) self.assertTrue(len(data["repos"]) == 2) @@ -380,7 +380,7 @@ class Utilities(BootTest): profile2.set_ksmeta({"canyouseethis" : "yes" }) self.assertTrue(self.api.profiles().add(profile2)) system2 = self.api.systems().find("foo2") - data = utils.blender(False, system2) + data = utils.blender(self.api, False, system2) self.assertTrue(data.has_key("ks_meta")) self.assertTrue(data["ks_meta"].has_key("canyouseethis")) @@ -391,7 +391,7 @@ class Utilities(BootTest): profile.set_ksmeta({"canyouseethisalso" : "yes" }) self.assertTrue(self.api.profiles().add(profile)) system2 = self.api.systems().find("foo2") - data = utils.blender(False, system2) + data = utils.blender(self.api, False, system2) self.assertTrue(data.has_key("ks_meta")) self.assertTrue(data["ks_meta"].has_key("canyouseethisalso")) @@ -401,7 +401,7 @@ class Utilities(BootTest): distro.set_ksmeta({"alsoalsowik" : "moose" }) self.assertTrue(self.api.distros().add(distro)) system2 = self.api.systems().find("foo2") - data = utils.blender(False, system2) + data = utils.blender(self.api, False, system2) self.assertTrue(data.has_key("ks_meta")) self.assertTrue(data["ks_meta"].has_key("alsoalsowik")) |