From e7fb2ecfc4ddb8ee727b53335201e231003686b3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 15 Nov 2006 17:25:06 +0000 Subject: [PATCH] too numerous changes to detail can run in shell mode from empty databases still need to check for slice deletions --- TestPeers.py | 316 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 250 insertions(+), 66 deletions(-) diff --git a/TestPeers.py b/TestPeers.py index c42f7910..f5cd4ee8 100755 --- a/TestPeers.py +++ b/TestPeers.py @@ -14,6 +14,32 @@ ### ############################## +# support reloading without wiping everything off +# dunno how to do (defvar plc) + +## we use indexes 1 and 2 +try: + dir(plc) +except: + plc=[None,None,None] +## the server objects +try: + dir(s) +except: + s=[None,None,None] +## the authentication objects +## our user +try: + dir(a) +except: + a=[None,None,None] +## the builtin root user for bootstrapping +try: + dir(aa) +except: + aa=[None,None,None] + +#################### import xmlrpclib import os @@ -24,7 +50,8 @@ plc1={ 'name':'plc1 in federation', 'builtin_admin_password':'root', 'peer_admin_name':'plc1@planet-lab.org', 'peer_admin_password':'peer', - 'nodename':'n11.plc1.org' + 'nodename':'n11.plc1.org', + 'plainname' : 'one', } plc2={ 'name':'plc2 in federation', 'hostname':'planetlab-devbox.inria.fr', @@ -33,29 +60,26 @@ plc2={ 'name':'plc2 in federation', 'builtin_admin_password':'root', 'peer_admin_name':'plc2@planet-lab.org', 'peer_admin_password':'peer', - 'nodename':'n21.plc2.org' + 'nodename':'n21.plc2.org', + 'plainname' : 'two', } -## we use indexes 1 and 2 -plc=[None,None,None] -# the server objects -s=[None,None,None] -# the authentication objects -a=[None,None,None] -aa=[None,None,None] - +#################### def peer_index(i): return 3-i -### cant use digits in slice login name -def plain_name (i): - if i==1: - return 'one' - elif i==2: - return 'two' - else: - raise Exception,"Unexpected input in plain_name" +def site_name (i): + return 'site'+str(i) + +def slice_name (i): + global plc + return "slice"+str(i) +def full_slice_name (i): + global plc + return plc[i]['plainname']+'_'+slice_name(i) + +#################### def test00_init (args=[1,2]): global plc,s,a,aa ## have you loaded this file already (support for reload) @@ -86,6 +110,89 @@ def test00_print (args=[1,2]): print 'aa[%d]'%i, aa[i] print 'a[%d]'%i, a[i] +def check_nodes (en,ef,args=[1,2]): + global plc,s,a + for i in args: + n=len(s[i].GetNodes(a[i])) + f=len(s[i].GetForeignNodes(a[i])) + print '%02d: Checking connection: got %d local nodes & %d foreign nodes'%(i,n,f) + assert n==en + assert f==ef + +# expected : local slices, foreign slices +def check_slices (els,efs,args=[1,2]): + global plc,s,a + for i in args: + ls=len(s[i].GetSlices(a[i])) + fs=len(s[i].GetForeignSlices(a[i])) + print '%02d: Checking connection: got %d local slices & %d foreign slices'%(i,ls,fs) + assert els==ls + assert efs==fs + +def show_nodes (i,node_ids): + for message,nodes in [ ['LOC',s[i].GetNodes(a[i],node_ids)], + ['FOR',s[i].GetForeignNodes(a[i],node_ids)] ]: + if nodes: + print '[%s:%d] : '%(message,len(nodes)), + for node in nodes: + print node['hostname']+' ', + print '' + +# expected : nodes on local slice +def check_local_slice_nodes (eln, args=[1,2]): + global plc,s,a + for i in args: + lname=full_slice_name(i) + ls=s[i].GetSlices(a[i],[lname])[0] + lsn=ls['node_ids'] + print '%02d: local slice (%s) on nodes '%(i,lname),lsn + assert len(lsn)==eln + show_nodes (i,lsn) + +# expected : nodes on foreign slice +def check_foreign_slice_nodes (efn, args=[1,2]): + global plc,s,a + for i in args: + peer=peer_index(i) + fname=full_slice_name(peer) + fs=s[i].GetForeignSlices(a[i],[fname])[0] + fsn=fs['node_ids'] + print '%02d: foreign slice (%s) on nodes '%(i,fname),fsn + assert len(fsn)==efn + show_nodes (i,fsn) + +def check_conf_files (args=[1,2]): + global plc,s,a + for i in args: + nodename=plc[i]['nodename'] + ndict= s[i].GetSlivers(a[i],[nodename])[0] + assert ndict['hostname'] == nodename + conf_files = ndict['conf_files'] + print '%02d: %d conf_files in GetSlivers for node %s'%(i,len(conf_files),nodename) + for conf_file in conf_files: + print 'source=',conf_file['source'],'|', + print 'dest=',conf_file['dest'],'|', + print 'enabled=',conf_file['enabled'],'|', + print '' + +import pprint +pp = pprint.PrettyPrinter(indent=3) + +def check_slivers (esn,args=[1,2]): + global plc,s,a + for i in args: + nodename=plc[i]['nodename'] + ndict= s[i].GetSlivers(a[i],[nodename])[0] + assert ndict['hostname'] == nodename + slivers = ndict['slivers'] + assert len(slivers) == esn + print '%02d: %d slivers in GetSlivers for node %s'%(i,len(slivers),nodename) + for sliver in slivers: + print '>>slivername = ',sliver['name'] + pp.pprint(sliver) + + +#################### def test00_admin (args=[1,2]): global plc,s,a for i in args: @@ -103,18 +210,19 @@ def test00_enable (args=[1,2]): s[i].AddRoleToPerson(aa[i],'admin',plc[i]['peer_admin_id']) print '%02d: enabled+admin on account %d:%s'%(i,plc[i]['peer_admin_id'],plc[i]['peer_admin_name']) -def test01_check (args=[1,2]): - global plc,s,a - for i in args: - n=len(s[i].GetNodes(aa[i])) - f=len(s[i].GetForeignNodes(a[i])) - print '%02d: Checking connection: got %d local nodes & %d foreign nodes'%(i,n,f) - def test01_node (args=[1,2]): global plc,s,a for i in args: n=s[i].AddNode(a[i],1,{'hostname': plc[i]['nodename']}) print '%02d: Added node %d %s'%(i,n,plc[i]['nodename']) + plc[i]['node_id']=n + +def test01_delnode (args=[1,2]): + global plc,s,a + for i in args: + retcod=s[i].DeleteNode(a[i],plc[i]['node_id']) + print '%02d: Deleted node %d, got %s'%(i,plc[i]['node_id'],retcod) + plc[i]['node_id']=None def test01_peer_person (args=[1,2]): global plc,s,a @@ -122,8 +230,7 @@ def test01_peer_person (args=[1,2]): peer=peer_index(i) person_id = s[i].AddPerson (a[i], {'first_name':'Peering(plain passwd)', 'last_name':plc[peer]['name'], 'role_ids':[3000], 'email':plc[peer]['peer_admin_name'],'password':plc[peer]['peer_admin_password']}) - print '02%d:Created person %d as the peer person'%(i,person_id) hostname=plc[i]['nodename'] - + print '%02d:Created person %d as the peer person'%(i,person_id) plc[i]['peer_person_id']=person_id def test01_peer (args=[1,2]): @@ -140,26 +247,27 @@ def test01_peer_passwd (args=[1,2]): global plc,s,a for i in args: # using an ad-hoc local command for now - never could get quotes to reach sql.... - os.system("ssh root@%s new_plc_api/person-password.sh %d"%(plc[i]['hostname'],plc[i]['peer_person_id'])) - print "Attempted to set passwd for person_id=%d in DB%d"%(plc[i]['peer_person_id'],i) + print "Attempting to set passwd for person_id=%d in DB%d"%(plc[i]['peer_person_id'],i), + retcod=os.system("ssh root@%s new_plc_api/person-password.sh %d"%(plc[i]['hostname'],plc[i]['peer_person_id'])) + print 'got',retcod def test02_refresh (args=[1,2]): global plc,s,a for i in args: - print '%02d: Refreshing peer'%(i) - s[i].RefreshPeer(a[i],plc[i]['peer_id']) + print '%02d: Refreshing peer'%(i), + retcod=s[i].RefreshPeer(a[i],plc[i]['peer_id']) + print ' got ',retcod def test03_site (args=[1,2]): global plc,s,a for i in args: peer=peer_index(i) ### create a site (required for creating a slice) - sitename="site"+str(i) + sitename=site_name(i) abbrev_name="abbr"+str(i) - plain=plain_name(i) site_id=s[i].AddSite (a[i], {'name':plc[i]['name'], 'abbreviated_name': abbrev_name, - 'login_base': plain, + 'login_base': plc[i]['plainname'], 'is_public': True, 'url': 'http://%s.com/'%abbrev_name, 'max_slices':10}) @@ -172,12 +280,12 @@ def test03_slice (args=[1,2]): global plc,s,a for i in args: peer=peer_index(i) - plain=plain_name(i) + plain=full_slice_name(i) ### create a slice - slice_name="slic"+str(i) - slice_id=s[i].AddSlice (a[i],{'name':'%s_%s'%(plain,slice_name), - 'description':'slice %s_%s on plc %s'%(plain,slice_name,plc[i]['name']), - 'url':'http://planet-lab.org/%s'%slice_name, + name=slice_name(i) + slice_id=s[i].AddSlice (a[i],{'name':plain, + 'description':'slice %s on plc %s'%(plain,plc[i]['name']), + 'url':'http://planet-lab.org/%s'%name, 'max_nodes':100, 'instanciation':'plc-instantiated', }) @@ -185,39 +293,115 @@ def test03_slice (args=[1,2]): plc[i]['slice_id']=slice_id -def test04_nodeslice (args=[1,2]): +def test04_node_slice (is_local, args=[1,2]): global plc,s,a for i in args: peer=peer_index(i) - ### add node to it - hostname=plc[peer]['nodename'] + if is_local: + hostname=plc[i]['nodename'] + else: + hostname=plc[peer]['nodename'] s[i].AddSliceToNodes (a[i], plc[i]['slice_id'],[hostname]) - print '%02d: added local node %s'%(i,hostname) + print '%02d: added in slice %d local node %s'%(i,plc[i]['slice_id'],hostname) -def catch_up (args=[1,2]): - for i in args: - plc[i]['peer_admin_id']=3 - plc[i]['peer_person_id']=4 - plc[i]['peer_id']=1 - plc[i]['slice_id']=1 +def test04_lnode_slice (args=[1,2]): + test04_node_slice (True,args) -### -def test_all (args=[1,2]): - test00_init (args) - test00_print (args) - test00_admin (args) - test00_enable (args) - test01_check (args) - test01_node (args) - test01_peer_person (args) - test01_peer (args) - test01_peer_passwd (args) - test01_check (args) - test02_refresh (args) - test01_check (args) - test03_site (args) - test03_slice (args) - test04_nodeslice (args) +def test04_fnode_slice (args=[1,2]): + test04_node_slice (False,args) + +#################### +def test_all_init (): + test00_init () + test00_print () + test00_admin () + test00_enable () + check_nodes (0,0,) + test01_peer_person () + test01_peer () + test01_peer_passwd () + + test03_site () + test03_slice () + +def test_all_nodes (): + # create one node on each site + test01_node () + check_nodes (1,0,) + test02_refresh () + check_nodes (1,1,) + + # check deletions + test01_delnode ([2]) + check_nodes (1,1,[1]) + check_nodes (0,1,[2]) + test02_refresh () + check_nodes (1,0,[1]) + check_nodes (0,1,[2]) + + # recreate + test01_node ([2]) + check_nodes (1,0,[1]) + check_nodes (1,1,[2]) + test02_refresh () + check_nodes (1,1,) + + # make sure node indexes differ + test01_delnode([2]) + test01_node ([2]) + test01_delnode([2]) + test01_node ([2]) + test01_delnode([2]) + test01_node ([2]) + test02_refresh () + check_nodes (1,1,) + +def test_all_slices (): + # each site has 3 local slices and 1 foreign slice + check_slices (3,1) + # no slice has any node yet + check_local_slice_nodes(0) + check_foreign_slice_nodes(0) + + # insert one local node in local slice on plc1 + test04_lnode_slice ([1]) + # of course the change is only local + check_local_slice_nodes (1,[1]) + check_local_slice_nodes (0,[2]) + check_foreign_slice_nodes(0) + + # refreshing + test02_refresh () + # remember that foreign slices only know about LOCAL nodes + # so refreshing does not do anything + check_local_slice_nodes (1,[1]) + check_local_slice_nodes (0,[2]) + check_foreign_slice_nodes(0) + + # now we add a foreign node into local slice + test04_fnode_slice ([1]) + check_local_slice_nodes (2,[1]) + check_foreign_slice_nodes (0,[1]) + check_local_slice_nodes (0,[2]) + check_foreign_slice_nodes (0,[2]) + + # refreshing + test02_refresh () + # remember that foreign slices only know about LOCAL nodes + # so this does not do anything + check_local_slice_nodes (2,[1]) + check_foreign_slice_nodes (0,[1]) + check_local_slice_nodes (0,[2]) + check_foreign_slice_nodes (1,[2]) + + check_slivers(3,[1]) + check_slivers(3,[2]) + + +def test_all (): + test_all_init () + test_all_nodes () + test_all_slices () if __name__ == '__main__': test_all() -- 2.47.0