- loadables = ['plcs', 'sites', 'nodes', 'slices', 'persons']
- config = Config()
- for loadable in loadables:
- if loadable in confdata and loadable in ['plcs']:
- setattr(self, loadable, PLCs(config, confdata[loadable]).dict('name'))
- elif loadable in confdata and loadable in ['nodes']:
- setattr(self, loadable, Nodes(config, confdata[loadable]).dict('hostname'))
- elif loadable in confdata and loadable in ['sites']:
- setattr(self, loadable, Sites(confdata[loadable]).dict('login_base'))
- elif loadable in confdata and loadable in ['slices']:
- setattr(self, loadable, Slices(confdata[loadable]).dict('name'))
- elif loadable in confdata and loadable in ['persons']:
- setattr(self, loadable, Persons(confdata[loadable]).dict('email'))
-
-
+ loadables = ['plcs', 'sites', 'nodes', 'nodegroups', 'slices', 'persons']
+ config = Config(logdir = self.logdir)
+ for element in confdata.keys():
+ if element in ['plcs'] and confdata.has_key(element):
+ setattr(self, element, PLCs(config, confdata[element]).dict('name'))
+ setattr(config, element, PLCs(config, confdata[element]).dict('name'))
+ elif element in ['nodes'] and confdata.has_key(element):
+ setattr(self, element, Nodes(config, confdata[element]).dict('hostname'))
+ setattr(config, element, Nodes(config, confdata[element]).dict('hostname'))
+ elif element in ['nodegroups'] and confdata.has_key(element):
+ setattr(self, element, Table(confdata[element]).dict('name'))
+ setattr(config, element, Table(confdata[element]).dict('name'))
+ elif element in ['sites'] and confdata.has_key(element):
+ setattr(self, element, Sites(confdata[element]).dict('login_base'))
+ setattr(config, element, Sites(confdata[element]).dict('login_base'))
+ elif element in ['slices'] and confdata.has_key(element):
+ setattr(self, element, Slices(config, confdata[element]).dict('name'))
+ setattr(config, element, Slices(config, confdata[element]).dict('name'))
+ elif element in ['persons'] and confdata.has_key(element):
+ setattr(self, element, Persons(confdata[element]).dict('email'))
+ setattr(config, element, Persons(confdata[element]).dict('email'))
+ elif element in ['node_tests'] and confdata.has_key(element):
+ setattr(self, element, TestScripts(confdata[element]).dict('name'))
+ setattr(config, element, TestScripts(confdata[element]).dict('name'))
+ elif element in ['slice_tests'] and confdata.has_key(element):
+ setattr(self, element, TestScripts(confdata[element]).dict('name'))
+ setattr(config, element, TestScripts(confdata[element]).dict('name'))
+
+ def archive_scripts(self, prefix):
+ valid_prefix = ['slice', 'node']
+ if prefix not in valid_prefix:
+ raise "Error. Invalid prefix %s. Must be in %s" % (prefix, valid_prefix)
+
+ scripts_dir = self.path + os.sep + 'tests' +os.sep + prefix + os.sep
+ workdir = '/tmp' + os.sep
+ archive_path = workdir + os.sep + prefix + os.sep
+ archive_filename = prefix + ".tar.gz"
+
+ if self.verbose:
+ utils.header("Creating/Updating %s archive %s" % (prefix, archive_path + archive_filename), logfile = self.logfile)
+ utils.commands("mkdir -p %(archive_path)s" % locals(), logfile = self.logfile)
+ utils.commands("cp -Rf %(scripts_dir)s* %(archive_path)s" % locals(), logfile = self.logfile)
+ tar_cmd = "cd %(workdir)s && tar -czf %(workdir)s/%(archive_filename)s %(prefix)s" % locals()
+ utils.commands(tar_cmd, logfile = self.logfile)
+ return (archive_filename, workdir+archive_filename)
+
+ def archive_slice_tests(self):
+ return self.archive_scripts('slice')
+
+ def archive_node_tests(self):
+ return self.archive_scripts('node')