X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSite.py;h=343978b38a9399ce3b1adaf9a1d6cf17713dd6ec;hb=9e5cba850b98b3b1fb5c9f51b94523eb29689d98;hp=9a9aa3b474f2697e7730b45ca2ebf6e34cba9bc0;hpb=0e2b411bfd11bc046d25c6eb9d6ec24b17904e04;p=tests.git diff --git a/system/TestSite.py b/system/TestSite.py index 9a9aa3b..343978b 100644 --- a/system/TestSite.py +++ b/system/TestSite.py @@ -1,3 +1,6 @@ +# Thierry Parmentelat +# Copyright (C) 2010 INRIA +# import os.path import datetime import time @@ -10,53 +13,50 @@ from TestKey import TestKey class TestSite: - def __init__ (self,test_plc,site_spec): - self.test_plc=test_plc - self.site_spec=site_spec + def __init__ (self, test_plc, site_spec): + self.test_plc = test_plc + self.site_spec = site_spec def name(self): return self.site_spec['site_fields']['login_base'] def create_site (self): - print self.test_plc.auth_root() - self.test_plc.server.AddSite(self.test_plc.auth_root(), - self.site_spec['site_fields']) - self.test_plc.server.AddSiteAddress(self.test_plc.auth_root(),self.name(), - self.site_spec['address_fields']) + print(self.test_plc.auth_root()) + self.test_plc.apiserver.AddSite(self.test_plc.auth_root(), + self.site_spec['site_fields']) + self.test_plc.apiserver.AddSiteAddress(self.test_plc.auth_root(), + self.name(), + self.site_spec['address_fields']) def create_users (self): for user_spec in self.site_spec['users']: - test_user=TestUser(self.test_plc,self,user_spec) + test_user = TestUser(self.test_plc, self, user_spec) test_user.create_user() test_user.add_keys() def delete_site (self): - print self.test_plc.auth_root() - self.test_plc.server.DeleteSite(self.test_plc.auth_root(),self.name()) + print(self.test_plc.auth_root()) + self.test_plc.apiserver.DeleteSite(self.test_plc.auth_root(), self.name()) return True def delete_users(self): for user_spec in self.site_spec['users']: - test_user=TestUser(self.test_plc,self,user_spec) + test_user = TestUser(self.test_plc, self, user_spec) test_user.delete_user() - def locate_user (self,username): + def locate_user (self, username): for user in self.site_spec['users']: if user['name'] == username: return user if user['user_fields']['email'] == username: return user - raise Exception,"Cannot locate user %s"%username + raise Exception("Cannot locate user {}".format(username)) - def locate_node (self,nodename): + def locate_node (self, nodename): for node in self.site_spec['nodes']: if node['name'] == nodename: return node - raise Exception,"Cannot locate node %s"%nodename + raise Exception("Cannot locate node {}".format(nodename)) - def start_nodes (self,options): - for node_spec in self.site_spec['nodes']: - TestNode(self.test_plc, self, node_spec).start_node(options) - return True