From: Tony Mack Date: Mon, 23 Jun 2008 17:29:11 +0000 (+0000) Subject: default some value types X-Git-Tag: tests-4.3-0~144 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=82b58ac3fc91eac9b75b38a16f307190b43766db;p=tests.git default some value types --- diff --git a/qaapi/qa/tests/add_test_data.py b/qaapi/qa/tests/add_test_data.py index 265257b..57c30cd 100644 --- a/qaapi/qa/tests/add_test_data.py +++ b/qaapi/qa/tests/add_test_data.py @@ -21,12 +21,18 @@ class add_test_data(Test): this_plc = lambda object: 'plcs' not in object or \ 'plcs' in object and plc['name'] in object['plcs'] or \ object['plcs'] == None - - sitelist = filter(this_plc, self.config.sites.values()) - nodelist = filter(this_plc, self.config.nodes.values()) - slicelist = filter(this_plc, self.config.slices.values()) - personlist = filter(this_plc, self.config.persons.values()) - nodegrouplist = filter(this_plc, self.config.nodegroups.values()) + + sitelist, nodelist, slicelist, personlist, nodegrouplist = [], [], [], [], [] + if isinstance(self.config.sites.values, dict): + sitelist = filter(this_plc, self.config.sites.values()) + if isinstance(self.config.nodes, dict): + nodelist = filter(this_plc, self.config.nodes.values()) + if isinstance(self.config.slices, dict): + slicelist = filter(this_plc, self.config.slices.values()) + if isinstance(self.config.persons, dict): + personlist = filter(this_plc, self.config.persons.values()) + if isinstance(self.config.nodegroups, dict): + nodegrouplist = filter(this_plc, self.config.nodegroups.values()) # Add Test site for site in sitelist: