From 7e230c962869e3ad889a9654dcfe7a749dd00765 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 14 Feb 2013 10:36:26 +0100 Subject: [PATCH] Cleaning TestSuite.py . --- testbeds/senslab/tests/TestSuite.py | 213 ++++++++++++++-------------- 1 file changed, 109 insertions(+), 104 deletions(-) diff --git a/testbeds/senslab/tests/TestSuite.py b/testbeds/senslab/tests/TestSuite.py index ca90163a..870a4092 100644 --- a/testbeds/senslab/tests/TestSuite.py +++ b/testbeds/senslab/tests/TestSuite.py @@ -6,17 +6,15 @@ # ########################################################################### #LDAP import -from sfa.senslab.LDAPapi import * +from sfa.senslab.LDAPapi import LDAPapi import ldap.modlist as modlist -import ldap as L + #logger sfa from sfa.util.sfalogging import logger #OAR imports from datetime import datetime -from dateutil import tz -from time import strftime,gmtime from sfa.senslab.OARrestapi import OARrestapi #Test slabdriver @@ -24,7 +22,7 @@ from sfa.senslab.slabdriver import SlabDriver from sfa.util.config import Config - +import os import sys @@ -53,7 +51,7 @@ def parse_options(): else: if option[0] == '-': value_list.append(option[1:]) - print "value_list",value_list + print "value_list", value_list return valid_options_dict @@ -61,67 +59,67 @@ def parse_options(): def TestLdap(job_id = None): logger.setLevelDebug() - ldap = LDAPapi() - ret = ldap.conn.connect(bind=True) - ldap.conn.close() - print "TEST ldap.conn.connect(bind=True)" , ret + ldap_server = LDAPapi() + ret = ldap_server.conn.connect(bind=True) + ldap_server.conn.close() + print "TEST ldap_server.conn.connect(bind=True)" , ret - ret = ldap.conn.connect(bind=False) - ldap.conn.close() - print "TEST ldap.conn.connect(bind=False)", ret + ret = ldap_server.conn.connect(bind=False) + ldap_server.conn.close() + print "TEST ldap_server.conn.connect(bind=False)", ret - ret = ldap.LdapSearch() - print "TEST ldap.LdapSearch ALL",ret + ret = ldap_server.LdapSearch() + print "TEST ldap_server.LdapSearch ALL", ret - ret = ldap.LdapSearch('(uid=avakian)', []) - print "\r\n TEST ldap.LdapSearch ids = avakian",ret + ret = ldap_server.LdapSearch('(uid=avakian)', []) + print "\r\n TEST ldap_server.LdapSearch ids = avakian", ret - password = ldap.generate_password() - print "\r\n TEST generate_password ",password + password = ldap_server.generate_password() + print "\r\n TEST generate_password ", password - maxi = ldap.find_max_uidNumber() + maxi = ldap_server.find_max_uidNumber() print "\r\n TEST find_max_uidNumber " , maxi data = {} data['last_name'] = "Drake" - data['first_name']="Tim" - data['givenName']= data['first_name'] + data['first_name'] = "Tim" + data['givenName'] = data['first_name'] data['mail'] = "robin@arkham.fr" - record={} + record = {} record['hrn'] = 'senslab.drake' record['last_name'] = "Drake" - record['first_name']="Tim" + record['first_name'] = "Tim" record['mail'] = "robin@arkham.fr" - login = ldap.generate_login(data) + login = ldap_server.generate_login(data) print "\r\n Robin \tgenerate_login ", ret, login - ret = ldap.LdapAddUser(data) + ret = ldap_server.LdapAddUser(data) print "\r\n Robin \tLdapAddUser ", ret req_ldap = '(uid=' + login + ')' - ret = ldap.LdapSearch(req_ldap, []) - print "\r\n Robin \tldap.LdapSearch ids = %s %s"%(login,ret ) + ret = ldap_server.LdapSearch(req_ldap, []) + print "\r\n Robin \tldap_server.LdapSearch ids = %s %s" % (login, ret) password = "Thridrobin" - enc = ldap.encrypt_password(password) + enc = ldap_server.encrypt_password(password) print "\r\n Robin \tencrypt_password ", enc - ret = ldap.LdapModifyUser(record, {'userPassword':enc}) + ret = ldap_server.LdapModifyUser(record, {'userPassword':enc}) print "\r\n Robin \tChange password LdapModifyUser ", ret - #dn = 'uid=' + login + ',' + ldap.baseDN - #ret = ldap.LdapDelete(dn) + #dn = 'uid=' + login + ',' + ldap_server.baseDN + #ret = ldap_server.LdapDelete(dn) #print "\r\n Robin \tLdapDelete ", ret datanight = {} datanight['last_name'] = "Grayson" - datanight['first_name']="Dick" - datanight['givenName']= datanight['first_name'] + datanight['first_name'] = "Dick" + datanight['givenName'] = datanight['first_name'] datanight['mail'] = "nightwing@arkham.fr" @@ -131,19 +129,19 @@ def TestLdap(job_id = None): record_night['first_name'] = datanight['first_name'] record_night['mail'] = datanight['mail'] - ret = ldap.LdapFindUser(record_night) - print "\r\n Nightwing \tldap.LdapFindUser %s : %s"%(record_night,ret) + ret = ldap_server.LdapFindUser(record_night) + print "\r\n Nightwing \tldap_server.LdapFindUser %s : %s" % (record_night, ret) - #ret = ldap.LdapSearch('(uid=grayson)', []) - #print "\r\n Nightwing \tldap.LdapSearch ids = %s %s"%('grayson',ret ) + #ret = ldap_server.LdapSearch('(uid=grayson)', []) + #print "\r\n Nightwing \tldap_server.LdapSearch ids = %s %s" %('grayson',ret ) - ret = ldap.LdapAddUser(datanight) + ret = ldap_server.LdapAddUser(datanight) print "\r\n Nightwing \tLdapAddUser ", ret - ret = ldap.LdapResetPassword(record_night) - print "\r\n Nightwing \tLdapResetPassword de %s : %s "%(record_night,ret) + ret = ldap_server.LdapResetPassword(record_night) + print "\r\n Nightwing \tLdapResetPassword de %s : %s" % (record_night, ret) - ret = ldap.LdapDeleteUser(record_night) + ret = ldap_server.LdapDeleteUser(record_night) print "\r\n Nightwing \tLdapDeleteUser ", ret @@ -153,7 +151,7 @@ def TestLdap(job_id = None): #record_avakian['first_name'] = 'sandrine' #record_avakian['mail'] = 'sandrine.avakian@inria.fr' #pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwSUkJ+cr3xM47h8lFkIXJoJhg4wHakTaLJmgTXkzvUmQsQeFB2MjUZ6WAelMXj/EFz2+XkK+bcWNXwfbrLptJQ+XwGpPZlu9YV/kzO63ghVrAyEg0+p7Pn1TO9f1ZYg4R6JfP/3qwH1AsE+X3PNpIewsuEIKwd2wUCJDf5RXJTpl39GizcBFemrRqgs0bdqAN/vUT9YvtWn8fCYR5EfJHVXOK8P1KmnbuGZpk7ryz21pDMlgw13+8aYB+LPkxdv5zG54A5c6o9N3zOCblvRFWaNBqathS8y04cOYWPmyu+Q0Xccwi7vM3Ktm8RoJw+raQNwsmneJOm6KXKnjoOQeiQ== savakian@sfa2.grenoble.senslab.info" - #ret = ldap.LdapModifyUser(record_night, {'sshPublicKey':pubkey}) + #ret = ldap_server.LdapModifyUser(record_night, {'sshPublicKey':pubkey}) #print "\r\n Sandrine \tChange pubkey LdapModifyUser ", ret #record_myslice = {} @@ -168,10 +166,10 @@ def TestLdap(job_id = None): #password = "ReptileFight" - #enc = ldap.encrypt_password(password) + #enc = ldap_server.encrypt_password(password) #print "\r\n sandrine \tencrypt_password ", enc - #ret = ldap.LdapModifyUser(record_avakian, {'userPassword':enc}) + #ret = ldap_server.LdapModifyUser(record_avakian, {'userPassword':enc}) #print "\r\n sandrine \tChange password LdapModifyUser ", ret return @@ -187,10 +185,10 @@ def get_stuff(oar, uri): headers['content-length'] = '0' #seems that it does not work if we don't add this - conn = httplib.HTTPConnection(oar.oarserver['ip'],oar.oarserver['port']) - conn.request("GET",uri,data , headers ) + conn = httplib.HTTPConnection(oar.oarserver['ip'], oar.oarserver['port']) + conn.request("GET", uri, data , headers ) resp = ( conn.getresponse()).read() - #logger.debug("OARrestapi: \t GETRequestToOARRestAPI resp %s" %( resp)) + conn.close() @@ -202,7 +200,7 @@ def get_stuff(oar, uri): def TestOAR(job_id = None): print "JOB_ID", job_id - if isinstance(job_id,list) : + if isinstance(job_id, list) : if len(job_id) >= 1: job_id = job_id[0] else: @@ -212,43 +210,42 @@ def TestOAR(job_id = None): print "JOB_ID", job_id oar = OARrestapi() jobs = oar.parser.SendRequest("GET_reserved_nodes", username = 'avakian') - print "\r\n OAR GET_reserved_nodes ",jobs + print "\r\n OAR GET_reserved_nodes ", jobs - jobs = oar.parser.SendRequest("GET_jobs") - print "\r\n OAR GET_jobs ",jobs + print "\r\n OAR GET_jobs ", jobs jobs = oar.parser.SendRequest("GET_jobs_id", job_id, 'avakian') - print "\r\n OAR GET_jobs_id ",jobs + print "\r\n OAR GET_jobs_id ", jobs uri = '/oarapi/jobs/details.json?state=Running,Waiting,Launching&user=avakian' - raw_json = get_stuff(oar,uri) - print "\r\nOAR ", uri, raw_json, "\r\n KKK \t",raw_json.keys() + raw_json = get_stuff(oar, uri) + print "\r\nOAR ", uri, raw_json, "\r\n KKK \t", raw_json.keys() uri = '/oarapi/jobs/' + job_id +'.json' - raw_json = get_stuff(oar,uri) - print "\r\n OAR ",uri,raw_json, "\r\n KKK \t",raw_json.keys() + raw_json = get_stuff(oar, uri) + print "\r\n OAR ", uri, raw_json, "\r\n KKK \t", raw_json.keys() uri = '/oarapi/jobs/' + job_id + '/resources.json' - raw_json = get_stuff(oar,uri) - print "\r\n OAR ",uri, raw_json, "\r\n KKK \t",raw_json.keys() + raw_json = get_stuff(oar, uri) + print "\r\n OAR ", uri, raw_json, "\r\n KKK \t", raw_json.keys() time_format = "%Y-%m-%d %H:%M:%S" - server_timestamp,server_tz = oar.parser.SendRequest("GET_timezone") + server_timestamp, server_tz = oar.parser.SendRequest("GET_timezone") - print "\r\n OAR GetTimezone ",server_timestamp, server_tz + print "\r\n OAR GetTimezone ", server_timestamp, server_tz print(datetime.fromtimestamp(int(server_timestamp)).strftime('%Y-%m-%d %H:%M:%S')) uri = '/oarapi/resources/full.json' - raw_json = get_stuff(oar,uri) - print "\r\n OAR ",uri, raw_json, "\r\n KKK \t",raw_json.keys() + raw_json = get_stuff(oar, uri) + print "\r\n OAR ", uri, raw_json, "\r\n KKK \t", raw_json.keys() uri = '/oarapi/jobs.json?user=avakian' - raw_json = get_stuff(oar,uri) - print "\r\nOAR ", uri, raw_json, "\r\n KKK \t",raw_json.keys() + raw_json = get_stuff(oar, uri) + print "\r\nOAR ", uri, raw_json, "\r\n KKK \t", raw_json.keys() return @@ -256,17 +253,18 @@ def TestOAR(job_id = None): def TestSlabDriver(job_id = None): if job_id is None: job_id = 1 - if isinstance(job_id,list) and len(job_id) == 1: - job_id = job_id[0] + + if isinstance(job_id, list) and len(job_id) == 1: + job_id = job_id[0] slabdriver = SlabDriver(Config()) nodes = slabdriver.GetReservedNodes() - print " \r\n \r\n GetReservedNodes" ,nodes + print " \r\n \r\n GetReservedNodes", nodes sl = slabdriver.GetSlices(slice_filter='senslab.avakian_slice', slice_filter_type='slice_hrn') print "\r\n \r\nGetSlices", sl[0] - sl = slabdriver.GetSlices(slice_filter='529', slice_filter_type='record_id_user') + sl = slabdriver.GetSlices(slice_filter='20', slice_filter_type='record_id_user') print "\r\n \r\nGetSlices", sl sl = slabdriver.GetSlices() @@ -278,70 +276,77 @@ def TestSlabDriver(job_id = None): leases = slabdriver.GetLeases(login='avakian') print "\r\n \r\n GetLeases", leases - - -def TestSfi(arg = None): - import os - print " ================= SFI.PY RESOURCES =============" - listing = os.system("sfi.py list senslab") +def TestSfi(filename = None): + + if filename is None: + filename = "/home/savakian/flab-sfa/test_rspec/my_lyon_nodes.rspec" + print " ================= SFI.PY RESOURCES =============", \ + os.system("sfi.py list senslab") - print - resources = os.system("sfi.py resources") + print os.system("sfi.py resources") - print - slab = os.system("sfi.py resources -r slab") + print os.system("sfi.py resources -r slab") - print - resourcesall = os.system("sfi.py resources -l all") + print os.system("sfi.py resources -l all") - print "================= SFI.PY RESOURCES -R SLAB -L ALL =============" - slaball = os.system("sfi.py resources -r slab -l all") - filename = "/home/savakian/flab-sfa/avakian_adv.rspec" + print "================ SFI.PY RESOURCES -R SLAB -L ALL ============\r\n", \ + os.system("sfi.py resources -r slab -l all") + + print "================ WRITING sfi.py resources -l all ===========\r\n", \ + filename + + filename = filename.split(".")[0]+"_out.rspec" rspecfile = open(filename,"w") r = os.popen("sfi.py resources -l all") for i in r.readlines(): rspecfile.write(i) rspecfile.close() - print " ================= SFI.PY SHOW SLICE =============" - slices_rec = os.system("sfi.py resources senslab.avakian_slice") + print " ================= SFI.PY SHOW SLICE ============= \r\n", \ + os.system("sfi.py resources senslab.avakian_slice") - print " ================= SFI.PY SHOW USER =============" - show_slice = os.system("sfi.py show senslab.avakian_slice") + print " ================= SFI.PY SHOW USER =============\r\n", \ + os.system("sfi.py show senslab.avakian_slice") - print " ================= SFI.PY SHOW NODE =============" - show = os.system("sfi.py show senslab.avakian") + print " ================= SFI.PY SHOW NODE =============\r\n", \ + os.system("sfi.py show senslab.avakian") - print " ================= SFI.PY SLICES =============" - show_node = os.system("sfi.py show senslab.node6.devlille.senslab.info") + print " ================= SFI.PY SLICES =============\r\n", \ + os.system("sfi.py show senslab.node6.devlille.senslab.info") - print " ================= SFI.PY LIST SLICE =============" - slices = os.system("sfi.py slices") + print " ================= SFI.PY LIST SLICE =============\r\n", \ + os.system("sfi.py slices") - print " ================= SFI.PY STATUS SLICE =============" - status_slice = os.system("sfi.py status senslab.avakian_slice") + print " ================= SFI.PY STATUS SLICE =============\r\n", \ + os.system("sfi.py status senslab.avakian_slice") - print " ================= SFI.PY DELETE SLICE =============" - status_slice = os.system("sfi.py delete senslab.avakian_slice") + print " ================= SFI.PY DELETE SLICE =============\r\n", \ + os.system("sfi.py delete senslab.avakian_slice") - print " ================= SFI.PY CREATE SLICE =============" - create = os.system("sfi.py create senslab.avakian_slice /home/savakian/flab-sfa/rspec_sfa.rspec") + print " ================= SFI.PY CREATE SLICE =============\r\n", \ + os.system("sfi.py create senslab.avakian_slice \ + /home/savakian/flab-sfa/test_rspec/my_lyon_nodes.rspec") def TestSQL(arg = None): - from sfa.storage.model import make_record, RegRecord, RegAuthority, RegUser, RegSlice, RegKey + from sfa.storage.model import make_record, RegSlice from sfa.storage.alchemy import dbsession from sqlalchemy.orm.collections import InstrumentedList from sqlalchemy.orm import joinedload solo_query_slice_list = dbsession.query(RegSlice).options(joinedload('reg_researchers')).filter_by(hrn='senslab.avakian_slice').first() - print "\r\n \r\n =========== query_slice_list RegSlice joinedload('reg_researchers') senslab.avakian first \r\n \t ",solo_query_slice_list.__dict__ + print "\r\n \r\n =========== query_slice_list RegSlice \ + joinedload('reg_researchers') senslab.avakian first \r\n \t ", \ + solo_query_slice_list.__dict__ query_slice_list = dbsession.query(RegSlice).options(joinedload('reg_researchers')).all() - print "\r\n \r\n =========== query_slice_list RegSlice joinedload('reg_researchers') ALL \r\n \t", query_slice_list[0].__dict__ + print "\r\n \r\n =========== query_slice_list RegSlice \ + joinedload('reg_researchers') ALL \r\n \t", \ + query_slice_list[0].__dict__ + return_slicerec_dictlist = [] record = query_slice_list[0] print "\r\n \r\n =========== \r\n \t", record @@ -353,7 +358,7 @@ def TestSQL(arg = None): #del tmp['reg_researchers']['_sa_instance_state'] return_slicerec_dictlist.append(tmp) - print "\r\n \r\n =========== \r\n \t",return_slicerec_dictlist + print "\r\n \r\n =========== \r\n \t", return_slicerec_dictlist def RunAll( arg ): -- 2.47.0