From: Thierry Parmentelat Date: Tue, 5 Dec 2006 16:45:33 +0000 (+0000) Subject: various changes in the test suite X-Git-Tag: pycurl-7_13_1~209 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=adfd0635f929b5d5d28adc16f0abdcaa818404df;p=plcapi.git various changes in the test suite --- diff --git a/TestPeers-m.ref b/TestPeers-m.ref index 27e1a61e..0b35f64a 100644 --- a/TestPeers-m.ref +++ b/TestPeers-m.ref @@ -1,48 +1,49 @@ -1 keys, 1 sites, 1 persons, 1 nodes, 1 slices & 1 nodes/slice fast_flag True +1 sites, 1 persons, 1 nodes & 1 slices +1 keys/person, 1 nodes/slice & 1 persons/slice +fast_flag True ==================== ('INIT',) +++ timer start -initializing s[1] https://lurch.cs.princeton.edu:443/PLCAPI/ -initialized aa[1] {'Username': 'root@plc1.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -initialized a[1] {'Username': 'peer1@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} -initializing s[2] https://planetlab-devbox.inria.fr:443/PLCAPI/ -initialized aa[2] {'Username': 'root@plc2.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -initialized a[2] {'Username': 'peer2@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} -s[1] -aa[1] {'Username': 'root@plc1.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -a[1] {'Username': 'peer1@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} -s[2] -aa[2] {'Username': 'root@plc2.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -a[2] {'Username': 'peer2@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} +initializing s[1]=>https://lurch.cs.princeton.edu:443/PLCAPI/ +initializing s[2]=>https://planetlab-devbox.inria.fr:443/PLCAPI/ +==================== s[1] +root@plc1.org connected using password authentication +==================== s[2] +root@plc2.org connected using password authentication +==================== 01:== created peer admin account 3, peer1@planet-lab.org - peer 02:== created peer admin account 3, peer2@planet-lab.org - peer 01:== enabled+admin on account 3:peer1@planet-lab.org 02:== enabled+admin on account 3:peer2@planet-lab.org -01:Created person 4 as the peer person -02:Created person 4 as the peer person +01:== Created person 4 as the peer person +02:== Created person 4 as the peer person 01:Created peer 1 PLEASE manually set password for person_id=4 in DB1 02:Created peer 1 PLEASE manually set password for person_id=4 in DB2 -Attempting to set passwd for person_id=4 in DB1UPDATE 1 +Attempting to remotely set passwd for person_id=4 in DB1UPDATE 1 -> system returns 0 -Attempting to set passwd for person_id=4 in DB2UPDATE 1 +Attempting to remotely set passwd for person_id=4 in DB2UPDATE 1 -> system returns 0 -+++ 12.84 seconds ellapsed (12.84) ++++ 13.12 seconds ellapsed (13.12) 01:== Created site 2 with max_slices=1 02:== Created site 2 with max_slices=1 === refresh after site creation -+++ 15.74 seconds ellapsed (2.90) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 1, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 1, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 18.07 seconds ellapsed (2.33) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 1, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 1, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 19.69 seconds ellapsed (1.62) -+++ 19.69 seconds ellapsed (0.00) ++++ 16.01 seconds ellapsed (2.90) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 1 new_sites 1 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.0015709400177 process-nodes 0.01016497612 process-persons 0.0181679725647 process-sa 0.0244410037994 process-sat 0.00323104858398 process-sites 0.0225780010223 process-slices 0.016086101532 time_all 1.46237778664 time_gather 0.0495820045471 time_process 0.0962498188019 time_transmit 1.31654596329 } ++++ 18.30 seconds ellapsed (2.29) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 1 new_sites 1 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00185799598694 process-nodes 0.0128209590912 process-persons 0.0220720767975 process-sa 0.0303659439087 process-sat 0.00436782836914 process-sites 0.0277030467987 process-slices 0.0204560756683 time_all 1.48308610916 time_gather 0.0390231609344 time_process 0.119657039642 time_transmit 1.32440590858 } ++++ 19.93 seconds ellapsed (1.63) ++++ 19.93 seconds ellapsed (0.00) === refresh before persons&keys creation -+++ 20.63 seconds ellapsed (0.94) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 22.88 seconds ellapsed (2.25) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 24.48 seconds ellapsed (1.60) ++++ 20.87 seconds ellapsed (0.94) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00145983695984 process-nodes 0.0100522041321 process-persons 0.00783586502075 process-sa 0.0243010520935 process-sat 0.00351691246033 process-sites 0.00650906562805 process-slices 0.0161161422729 time_all 1.44089603424 time_gather 0.0477969646454 time_process 0.0698010921478 time_transmit 1.32329797745 } ++++ 23.13 seconds ellapsed (2.26) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00183701515198 process-nodes 0.0126488208771 process-persons 0.00958895683289 process-sa 0.0302908420563 process-sat 0.00439715385437 process-sites 0.00828003883362 process-slices 0.0199620723724 time_all 1.44788098335 time_gather 0.038724899292 time_process 0.0870180130005 time_transmit 1.32213807106 } ++++ 24.72 seconds ellapsed (1.59) 01: Checking keys: got 0 local (e=0) & 0 foreign (e=0) 02: Checking keys: got 0 local (e=0) & 0 foreign (e=0) 01: Checking persons: got 4 local (e=4) & 1 foreign (e=1) @@ -57,206 +58,232 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 01: Checking persons: got 5 local (e=5) & 1 foreign (e=1) 02: Checking persons: got 5 local (e=5) & 1 foreign (e=1) === refresh after persons&keys creation -+++ 31.44 seconds ellapsed (6.96) -01:== Refreshing peer got {'new_keys': 1, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 1, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 33.71 seconds ellapsed (2.27) -02:== Refreshing peer got {'new_keys': 1, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 1, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 35.36 seconds ellapsed (1.65) ++++ 31.67 seconds ellapsed (6.95) +01:== Refreshing peer Result: { new_keys 1 new_nodes 0 new_persons 1 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.0172338485718 process-nodes 0.00593304634094 process-persons 0.0187880992889 process-sa 0.0231449604034 process-sat 0.00200200080872 process-sites 0.00349807739258 process-slices 0.0140678882599 time_all 4.60034990311 time_gather 0.0343518257141 time_process 0.0846779346466 time_transmit 4.48132014275 } ++++ 37.09 seconds ellapsed (5.42) +02:== Refreshing peer Result: { new_keys 1 new_nodes 0 new_persons 1 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.0197248458862 process-nodes 0.0126869678497 process-persons 0.0241780281067 process-sa 0.0305328369141 process-sat 0.00451707839966 process-sites 0.00474309921265 process-slices 0.0204250812531 time_all 1.48342108727 time_gather 0.0356318950653 time_process 0.11682009697 time_transmit 1.33096909523 } ++++ 38.72 seconds ellapsed (1.62) 01: Checking keys: got 1 local (e=1) & 1 foreign (e=1) 02: Checking keys: got 1 local (e=1) & 1 foreign (e=1) 01: Checking persons: got 5 local (e=5) & 2 foreign (e=2) 02: Checking persons: got 5 local (e=5) & 2 foreign (e=2) -+++ 37.45 seconds ellapsed (2.09) ++++ 40.81 seconds ellapsed (2.10) ==================== ('RESETTING NODES',) 01:== Cleaning all nodes 02:== Cleaning all nodes === refresh cleaned nodes -+++ 38.39 seconds ellapsed (0.94) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 40.67 seconds ellapsed (2.28) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 42.28 seconds ellapsed (1.61) ++++ 41.75 seconds ellapsed (0.94) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00118589401245 process-nodes 0.00571298599243 process-persons 0.00749015808105 process-sa 0.0233278274536 process-sat 0.00202298164368 process-sites 0.0035400390625 process-slices 0.0141680240631 time_all 1.54066085815 time_gather 0.034873008728 time_process 0.0574588775635 time_transmit 1.44832897186 } ++++ 44.12 seconds ellapsed (2.36) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00138902664185 process-nodes 0.0126528739929 process-persons 0.00959014892578 process-sa 0.0301959514618 process-sat 0.00441002845764 process-sites 0.00859093666077 process-slices 0.020525932312 time_all 1.45996809006 time_gather 0.0386600494385 time_process 0.0873670578003 time_transmit 1.33394098282 } ++++ 45.72 seconds ellapsed (1.60) 01: Checking nodes: got 0 local (e=0) & 0 foreign (e=0) 02: Checking nodes: got 0 local (e=0) & 0 foreign (e=0) ==================== ('CREATING NODES',) -01:== Added node 1 n101.plc1.org -02:== Added node 1 n202.plc2.org +01:== Added node 1 n1-001.plc1.org +02:== Added node 1 n2-001.plc2.org 01: Checking nodes: got 1 local (e=1) & 0 foreign (e=0) 02: Checking nodes: got 1 local (e=1) & 0 foreign (e=0) === refresh after node creation -+++ 46.10 seconds ellapsed (3.82) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 1, 'new_slice_attribute_types': 0} -+++ 48.40 seconds ellapsed (2.30) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 1, 'new_slice_attribute_types': 0} -+++ 50.02 seconds ellapsed (1.63) ++++ 49.58 seconds ellapsed (3.87) +01:== Refreshing peer Result: { new_keys 0 new_nodes 1 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00176405906677 process-nodes 0.0375220775604 process-persons 0.0076379776001 process-sa 0.0249078273773 process-sat 0.00370001792908 process-sites 0.00375390052795 process-slices 0.0163190364838 time_all 1.47417998314 time_gather 0.0452589988708 time_process 0.0956149101257 time_transmit 1.33330607414 } ++++ 51.88 seconds ellapsed (2.30) +02:== Refreshing peer Result: { new_keys 0 new_nodes 1 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00148797035217 process-nodes 0.0390949249268 process-persons 0.00937008857727 process-sa 0.0294539928436 process-sat 0.00249314308167 process-sites 0.00442409515381 process-slices 0.0180158615112 time_all 1.47150182724 time_gather 0.0270562171936 time_process 0.104351997375 time_transmit 1.34009361267 } ++++ 53.50 seconds ellapsed (1.61) 01: Checking nodes: got 1 local (e=1) & 1 foreign (e=1) 02: Checking nodes: got 1 local (e=1) & 1 foreign (e=1) 02:== Deleted node 1, returns 1 02: Checking nodes: got 0 local (e=0) & 1 foreign (e=1) === refresh after deletion on plc2 -+++ 51.38 seconds ellapsed (1.36) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': -1, 'new_slice_attribute_types': 0} -+++ 53.64 seconds ellapsed (2.26) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 55.26 seconds ellapsed (1.61) ++++ 54.86 seconds ellapsed (1.36) +01:== Refreshing peer Result: { new_keys 0 new_nodes -1 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00120401382446 process-nodes 0.0244960784912 process-persons 0.0077338218689 process-sa 0.0234031677246 process-sat 0.0020170211792 process-sites 0.00355792045593 process-slices 0.0145390033722 time_all 1.4554708004 time_gather 0.0340828895569 time_process 0.0769648551941 time_transmit 1.34442305565 } ++++ 57.14 seconds ellapsed (2.28) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00145602226257 process-nodes 0.00787496566772 process-persons 0.00971817970276 process-sa 0.0304899215698 process-sat 0.00435185432434 process-sites 0.00473093986511 process-slices 0.0213270187378 time_all 1.44526910782 time_gather 0.0283801555634 time_process 0.079962015152 time_transmit 1.3369269371 } ++++ 58.72 seconds ellapsed (1.59) 01: Checking nodes: got 1 local (e=1) & 0 foreign (e=0) 02: Checking nodes: got 0 local (e=0) & 1 foreign (e=1) ==================== ('ADD on plc2 for different indexes',) -02:== Added node 3 n202.plc2.org +02:== Added node 3 n2-001.plc2.org 01: Checking nodes: got 1 local (e=1) & 0 foreign (e=0) 02: Checking nodes: got 1 local (e=1) & 1 foreign (e=1) === refresh after re-creation on plc2 -+++ 57.41 seconds ellapsed (2.15) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 1, 'new_slice_attribute_types': 0} -+++ 59.69 seconds ellapsed (2.28) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 61.27 seconds ellapsed (1.58) ++++ 60.88 seconds ellapsed (2.16) +01:== Refreshing peer Result: { new_keys 0 new_nodes 1 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00121903419495 process-nodes 0.0316081047058 process-persons 0.00795984268188 process-sa 0.0252768993378 process-sat 0.00360918045044 process-sites 0.00362586975098 process-slices 0.0173499584198 time_all 1.45788693428 time_gather 0.0357649326324 time_process 0.0906589031219 time_transmit 1.33146309853 } ++++ 63.16 seconds ellapsed (2.28) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00142788887024 process-nodes 0.00840711593628 process-persons 0.00998687744141 process-sa 0.0295989513397 process-sat 0.0024790763855 process-sites 0.00442600250244 process-slices 0.0191519260406 time_all 1.41593885422 time_gather 0.0276079177856 time_process 0.0754878520966 time_transmit 1.31284308434 } ++++ 64.71 seconds ellapsed (1.55) 01: Checking nodes: got 1 local (e=1) & 1 foreign (e=1) 02: Checking nodes: got 1 local (e=1) & 1 foreign (e=1) -+++ 62.22 seconds ellapsed (0.95) ++++ 65.67 seconds ellapsed (0.95) ==================== ('RESETTING SLICES TEST',) 01:== Cleaning all nodes 01:==== Cleaning node 1 02:== Cleaning all nodes 02:==== Cleaning node 3 -01:== Added node 4 n101.plc1.org -02:== Added node 4 n202.plc2.org +01:== Added node 4 n1-001.plc1.org +02:== Added node 4 n2-001.plc2.org 01:== Cleaning all slices -01:==== Cleaning slice 3 +01:==== Cleaned slice 3 02:== Cleaning all slices -02:==== Cleaning slice 3 +02:==== Cleaned slice 3 === refresh After slices init -+++ 67.98 seconds ellapsed (5.76) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 70.20 seconds ellapsed (2.22) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 71.76 seconds ellapsed (1.56) ++++ 71.41 seconds ellapsed (5.75) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00122904777527 process-nodes 0.00610995292664 process-persons 0.00736212730408 process-sa 0.0162868499756 process-sat 0.0019998550415 process-sites 0.00336098670959 process-slices 0.0141441822052 time_all 1.38616299629 time_gather 0.0349071025848 time_process 0.0505020618439 time_transmit 1.30075383186 } ++++ 73.62 seconds ellapsed (2.21) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.0014660358429 process-nodes 0.00757813453674 process-persons 0.0102028846741 process-sa 0.0202159881592 process-sat 0.0025839805603 process-sites 0.00413298606873 process-slices 0.017914056778 time_all 1.39171290398 time_gather 0.0265161991119 time_process 0.0641059875488 time_transmit 1.30109071732 } ++++ 75.14 seconds ellapsed (1.53) ==================== ('CREATING SLICES on plc1',) 01:== created slice 4 - max nodes=1 01:== Attached person user1-1@plc1.org to slice oneone_slice1 01: Checking slices: got 3 local (e=3) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 0 foreign (e=0) === refresh after slice created on plc1 -+++ 76.11 seconds ellapsed (4.35) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 78.34 seconds ellapsed (2.23) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 1, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 79.94 seconds ellapsed (1.61) ++++ 79.50 seconds ellapsed (4.36) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00122690200806 process-nodes 0.00667810440063 process-persons 0.0078809261322 process-sa 0.0164999961853 process-sat 0.00199604034424 process-sites 0.00364995002747 process-slices 0.0147371292114 time_all 1.38982915878 time_gather 0.0334949493408 time_process 0.0526790618896 time_transmit 1.30365514755 } ++++ 81.71 seconds ellapsed (2.21) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 1 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00143599510193 process-nodes 0.00790691375732 process-persons 0.00950193405151 process-sa 0.0204141139984 process-sat 0.00246000289917 process-sites 0.00430393218994 process-slices 0.0678989887238 time_all 1.44577980042 time_gather 0.0270490646362 time_process 0.113933801651 time_transmit 1.30479693413 } ++++ 83.30 seconds ellapsed (1.58) 01: Checking slices: got 3 local (e=3) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 1 foreign (e=1) 01: local slice oneone_slice1 (e=0) on nodes [] 02: foreign slice oneone_slice1 (e=0) on nodes [] ==================== ('ADDING LOCAL NODES IN SLICES',) -01:== added in slice oneone_slice1 local ['n101.plc1.org'] +01:== added in slice oneone_slice1 local ['n1-001.plc1.org'] 01: local slice oneone_slice1 (e=1) on nodes [4] -[LOC:1] : n101.plc1.org +[LOC:1] : n1-001.plc1.org 02: foreign slice oneone_slice1 (e=0) on nodes [] === refresh After local nodes were added on plc1 -+++ 86.43 seconds ellapsed (6.49) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 88.65 seconds ellapsed (2.23) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 90.23 seconds ellapsed (1.58) ++++ 90.19 seconds ellapsed (6.90) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00120306015015 process-nodes 0.00608897209167 process-persons 0.00739192962646 process-sa 0.0165917873383 process-sat 0.00199317932129 process-sites 0.00332498550415 process-slices 0.0143330097198 time_all 1.38976883888 time_gather 0.0338981151581 time_process 0.0509369373322 time_transmit 1.30493378639 } ++++ 92.40 seconds ellapsed (2.21) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00149583816528 process-nodes 0.00801515579224 process-persons 0.00969886779785 process-sa 0.0205948352814 process-sat 0.0025269985199 process-sites 0.00440216064453 process-slices 0.0280621051788 time_all 1.40673112869 time_gather 0.0274710655212 time_process 0.0748081207275 time_transmit 1.30445194244 } ++++ 93.94 seconds ellapsed (1.54) 01: local slice oneone_slice1 (e=1) on nodes [4] -[LOC:1] : n101.plc1.org +[LOC:1] : n1-001.plc1.org 02: foreign slice oneone_slice1 (e=1) on nodes [2] -[FOR:1] : n101.plc1.org +[FOR:1] : n1-001.plc1.org ==================== ('ADDING FOREIGN NODES IN SLICES',) -01:== added in slice oneone_slice1 foreign ['n201.plc2.org'] +01:== added in slice oneone_slice1 foreign ['n2-001.plc2.org'] 01: local slice oneone_slice1 (e=2) on nodes [4, 3] -[LOC:1] : n101.plc1.org -[FOR:1] : n201.plc2.org +[LOC:1] : n1-001.plc1.org +[FOR:1] : n2-001.plc2.org 02: foreign slice oneone_slice1 (e=1) on nodes [2] -[FOR:1] : n101.plc1.org +[FOR:1] : n1-001.plc1.org === refresh After foreign nodes were added in plc1 -+++ 94.84 seconds ellapsed (4.60) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 97.07 seconds ellapsed (2.23) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 98.68 seconds ellapsed (1.62) ++++ 98.57 seconds ellapsed (4.63) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.0012218952179 process-nodes 0.00635004043579 process-persons 0.00762510299683 process-sa 0.0165657997131 process-sat 0.00199699401855 process-sites 0.00346517562866 process-slices 0.0148739814758 time_all 1.3924138546 time_gather 0.0356738567352 time_process 0.0521080493927 time_transmit 1.30463194847 } ++++ 100.79 seconds ellapsed (2.21) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00145792961121 process-nodes 0.00792908668518 process-persons 0.00959491729736 process-sa 0.0204808712006 process-sat 0.00243997573853 process-sites 0.00443601608276 process-slices 0.0225651264191 time_all 1.42615890503 time_gather 0.0271830558777 time_process 0.0689158439636 time_transmit 1.33006000519 } ++++ 102.35 seconds ellapsed (1.57) 01: local slice oneone_slice1 (e=2) on nodes [4, 3] -[LOC:1] : n101.plc1.org -[FOR:1] : n201.plc2.org +[LOC:1] : n1-001.plc1.org +[FOR:1] : n2-001.plc2.org 02: foreign slice oneone_slice1 (e=2) on nodes [2, 4] -[LOC:1] : n201.plc2.org -[FOR:1] : n101.plc1.org -01: 1 slivers (exp. 1) in GetSlivers for node n101.plc1.org +[LOC:1] : n2-001.plc2.org +[FOR:1] : n1-001.plc1.org +01: 1 slivers (exp. 1) in GetSlivers for node n1-001.plc1.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1166088952, + 'expires': 1166540014, 'instantiation': 'plc-instantiated', 'keys': [{'key_type': 'ssh', 'key': 'ssh-rsa 11key4plc11 user1-key1'}], 'name': 'oneone_slice1', 'slice_id': 4} -02: 1 slivers (exp. 1) in GetSlivers for node n201.plc2.org +02: 1 slivers (exp. 1) in GetSlivers for node n2-001.plc2.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1166088952, + 'expires': 1166540014, 'instantiation': 'plc-instantiated', 'keys': [{'key_type': 'ssh', 'key': 'ssh-rsa 11key4plc11 user1-key1'}], 'name': 'oneone_slice1', 'slice_id': 4} ==================== ('DELETING FOREIGN NODES FROM SLICES',) -01:== deleted in slice oneone_slice1 foreign ['n201.plc2.org'] +01:== deleted in slice oneone_slice1 foreign ['n2-001.plc2.org'] 01: local slice oneone_slice1 (e=1) on nodes [4] -[LOC:1] : n101.plc1.org +[LOC:1] : n1-001.plc1.org 02: foreign slice oneone_slice1 (e=2) on nodes [2, 4] -[LOC:1] : n201.plc2.org -[FOR:1] : n101.plc1.org -01: 1 slivers (exp. 1) in GetSlivers for node n101.plc1.org +[LOC:1] : n2-001.plc2.org +[FOR:1] : n1-001.plc1.org +01: 1 slivers (exp. 1) in GetSlivers for node n1-001.plc1.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1166088952, + 'expires': 1166540014, 'instantiation': 'plc-instantiated', 'keys': [{'key_type': 'ssh', 'key': 'ssh-rsa 11key4plc11 user1-key1'}], 'name': 'oneone_slice1', 'slice_id': 4} === refresh After foreign nodes were removed on plc1 -+++ 106.13 seconds ellapsed (7.45) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 108.36 seconds ellapsed (2.23) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 109.94 seconds ellapsed (1.59) ++++ 109.80 seconds ellapsed (7.45) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00120997428894 process-nodes 0.00605583190918 process-persons 0.00739622116089 process-sa 0.0164680480957 process-sat 0.0019998550415 process-sites 0.00332117080688 process-slices 0.0143389701843 time_all 1.3897061348 time_gather 0.0342829227448 time_process 0.0508031845093 time_transmit 1.30462002754 } ++++ 112.01 seconds ellapsed (2.21) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00144410133362 process-nodes 0.00824093818665 process-persons 0.0099618434906 process-sa 0.020565032959 process-sat 0.00250911712646 process-sites 0.00445604324341 process-slices 0.0304629802704 time_all 1.40989398956 time_gather 0.02681183815 time_process 0.0776560306549 time_transmit 1.30542612076 } ++++ 113.55 seconds ellapsed (1.54) 01: local slice oneone_slice1 (e=1) on nodes [4] -[LOC:1] : n101.plc1.org +[LOC:1] : n1-001.plc1.org 02: foreign slice oneone_slice1 (e=1) on nodes [2] -[FOR:1] : n101.plc1.org +[FOR:1] : n1-001.plc1.org ==================== ('DELETING LOCAL NODES FROM SLICES',) -01:== deleted in slice oneone_slice1 local ['n101.plc1.org'] +01:== deleted in slice oneone_slice1 local ['n1-001.plc1.org'] 01: local slice oneone_slice1 (e=0) on nodes [] 02: foreign slice oneone_slice1 (e=1) on nodes [2] -[FOR:1] : n101.plc1.org +[FOR:1] : n1-001.plc1.org === refresh After local nodes were removed on plc1 -+++ 114.56 seconds ellapsed (4.61) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 116.79 seconds ellapsed (2.23) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 118.37 seconds ellapsed (1.59) ++++ 118.15 seconds ellapsed (4.60) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00125503540039 process-nodes 0.00641703605652 process-persons 0.0145869255066 process-sa 0.0166440010071 process-sat 0.00203990936279 process-sites 0.00365209579468 process-slices 0.0150680541992 time_all 1.39929103851 time_gather 0.0359230041504 time_process 0.0596730709076 time_transmit 1.30369496346 } ++++ 120.37 seconds ellapsed (2.22) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00142502784729 process-nodes 0.00817012786865 process-persons 0.00985383987427 process-sa 0.0204150676727 process-sat 0.0024631023407 process-sites 0.0044538974762 process-slices 0.023265838623 time_all 1.40432691574 time_gather 0.026976108551 time_process 0.0700578689575 time_transmit 1.30729293823 } ++++ 121.91 seconds ellapsed (1.54) 01: local slice oneone_slice1 (e=0) on nodes [] 02: foreign slice oneone_slice1 (e=0) on nodes [] ==================== ('CHECKING SLICES CLEAN UP',) 01:== Cleaning all slices -01:==== Cleaning slice 4 +01:==== Cleaned slice 4 01: Checking slices: got 2 local (e=2) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 1 foreign (e=1) === refresh After slices clenaup -+++ 123.79 seconds ellapsed (5.41) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 126.02 seconds ellapsed (2.23) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': -1, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 127.61 seconds ellapsed (1.60) ++++ 127.34 seconds ellapsed (5.43) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.00126099586487 process-nodes 0.00644707679749 process-persons 0.00776815414429 process-sa 0.0165190696716 process-sat 0.00201892852783 process-sites 0.00350999832153 process-slices 0.0149049758911 time_all 1.39111590385 time_gather 0.0350680351257 time_process 0.0524380207062 time_transmit 1.30360984802 } ++++ 129.55 seconds ellapsed (2.21) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices -1 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.00148296356201 process-nodes 0.00837802886963 process-persons 0.0178740024567 process-sa 0.0205547809601 process-sat 0.00251507759094 process-sites 0.00459504127502 process-slices 0.0365350246429 time_all 1.42143321037 time_gather 0.0268039703369 time_process 0.0919461250305 time_transmit 1.30268311501 } ++++ 131.11 seconds ellapsed (1.56) 01: Checking slices: got 2 local (e=2) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 0 foreign (e=0) -+++ 129.50 seconds ellapsed (1.89) -01:== created SliceAttributeType = 20 -02:== created SliceAttributeType = 20 ++++ 132.99 seconds ellapsed (1.89) +01:== created SliceAttributeType = 21 +02:== created SliceAttributeType = 21 === refresh after SliceAttributeType creation -+++ 131.39 seconds ellapsed (1.90) -01:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 1} -+++ 134.05 seconds ellapsed (2.65) -02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 1} -+++ 135.63 seconds ellapsed (1.58) -+++ 135.63 seconds ellapsed (0.00) ++++ 134.88 seconds ellapsed (1.89) +01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 1 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } ++++ ellapsed: { process-keys 0.0012149810791 process-nodes 0.00603008270264 process-persons 0.00729703903198 process-sa 0.0162410736084 process-sat 0.0156400203705 process-sites 0.00341296195984 process-slices 0.0141589641571 time_all 1.40134620667 time_gather 0.0346279144287 time_process 0.0640051364899 time_transmit 1.30271315575 } ++++ 137.10 seconds ellapsed (2.22) +02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 1 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } ++++ ellapsed: { process-keys 0.0014500617981 process-nodes 0.00757098197937 process-persons 0.00922107696533 process-sa 0.0201618671417 process-sat 0.0135889053345 process-sites 0.00412797927856 process-slices 0.0178730487823 time_all 1.4060690403 time_gather 0.0272459983826 time_process 0.0740060806274 time_transmit 1.30481696129 } ++++ 138.64 seconds ellapsed (1.54) ++++ 138.64 seconds ellapsed (0.00) 01:============================== DUMPING 01: SITES 1 None pl Thierry plc1 Central [] @@ -270,19 +297,19 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 2 None root@plc1.org keys: [] sites: [1] 3 None peer1@planet-lab.org keys: [] sites: [] 4 None peer2@planet-lab.org keys: [] sites: [] -6 None user1-1@plc1.org keys: [1] sites: [] 5 1 root@plc2.org keys: [] sites: [1] +6 None user1-1@plc1.org keys: [1] sites: [] 7 1 user2-1@plc2.org keys: [2] sites: [] 01: NODES -4 None n101.plc1.org sls= [] site= 2 -3 1 n201.plc2.org sls= [] site= 3 +3 1 n2-001.plc2.org sls= [] site= 3 +4 None n1-001.plc1.org sls= [] site= 2 01: SLICES 1 None pl_conf nodes= [] persons= [] --- sas= [1, 2, 3] pl_conf crp= 1 ---- 'expires': 1166088823 +--- 'expires': 1166539915 2 None pl_conf_vserverslice nodes= [] persons= [] --- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 ---- 'expires': 1166088823 +--- 'expires': 1166539915 01: Slice Attribute Types 1 None type 20 Type of slice (e.g. vserver) 2 None system 10 Is a default system slice (1) or not (0 or unset) @@ -300,32 +327,33 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 14 None net2_avg 10 Average bandwidth over routes exempt from node bandwidth limits (bps) 15 None net2_share 10 Number of bandwidth shares over routes exempt from node bandwidth limits 16 None disk_max 10 Disk quota (1k disk blocks) -17 None plc_slice_type 20 Type of slice rspec to be created -18 None plc_agent_version 10 Version of PLC agent (slice creation service) software to be deployed -19 None plc_ticket_pubkey 10 Public key used to verify PLC-signed tickets -20 None sat_1 10 custom sat on plc1 -21 1 sat_2 10 custom sat on plc2 +17 None proper_op 10 Proper operation (e.g. bind_socket) +18 None plc_slice_type 20 Type of slice rspec to be created +19 None plc_agent_version 10 Version of PLC agent (slice creation service) software to be deployed +20 None plc_ticket_pubkey 10 Public key used to verify PLC-signed tickets +21 None sat_1 10 custom sat on plc1 +22 1 sat_2 10 custom sat on plc2 01: Slice Attributes -1 None plc_agent_version AT_id: 18 ---- v= 1.0 sl= 1 n= None -2 None plc_slice_type AT_id: 17 +1 None plc_slice_type AT_id: 18 --- v= VServerSlice sl= 1 n= None -3 None plc_ticket_pubkey AT_id: 19 ---- v= MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIUaG0IE/V4tHb2XeAdV37JvAS -h3YmxVpFFAYbjI3i2rcNFYGbjRxaBxQbLMVVI1vNCcgqVZTxDcHJKWRGJHwD6LTK -s57VXANFQNMnFVmp6DiA/5xnf40UYpyvzmw90AY4I3IURgeoEMXKdBsAfccGv+fw -AHiU1HxVVV3ClJZlkwIDAQAB +2 None plc_agent_version AT_id: 19 +--- v= 1.0 sl= 1 n= None +3 None plc_ticket_pubkey AT_id: 20 +--- v= MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOTQoURmv9XRWJRN9lKuXEqZOV +MQXuc2SAqECNNQkFnhUF27NnSZ9NO8AJe3jJ5eKvFcIwFRawgKlzn1oJAjXdzRgU +5DWB0UfsqL3rr55ASuEK3SNnBXnTLY7xst9Zc96FedTpEzbbarVTLHJ87+NYWPZ5 +N5Jb/oqO06jQbGqEJQIDAQAB sl= 1 n= None -4 None disk_max AT_id: 16 ---- v= 5000000 sl= 2 n= None -5 None cpu_share AT_id: 7 +4 None cpu_share AT_id: 7 --- v= 32 sl= 2 n= None -6 None plc_slice_type AT_id: 17 +5 None plc_slice_type AT_id: 18 --- v= VServerSlice sl= 2 n= None +6 None disk_max AT_id: 16 +--- v= 5000000 sl= 2 n= None 01: SLIVERS -01: SLIVERS for : hostname n201.plc2.org +01: SLIVERS for : hostname n2-001.plc2.org 01: 31 config files -01: SLIVERS for : hostname n101.plc1.org +01: SLIVERS for : hostname n1-001.plc1.org 01: 31 config files 01:============================== END DUMP 02:============================== DUMPING @@ -341,19 +369,19 @@ sl= 1 n= None 2 None root@plc2.org keys: [] sites: [1] 3 None peer2@planet-lab.org keys: [] sites: [] 4 None peer1@planet-lab.org keys: [] sites: [] -6 None user2-1@plc2.org keys: [1] sites: [] 5 1 root@plc1.org keys: [] sites: [1] +6 None user2-1@plc2.org keys: [1] sites: [] 7 1 user1-1@plc1.org keys: [2] sites: [] 02: NODES -4 None n201.plc2.org sls= [] site= 2 -2 1 n101.plc1.org sls= [] site= 3 +2 1 n1-001.plc1.org sls= [] site= 3 +4 None n2-001.plc2.org sls= [] site= 2 02: SLICES 1 None pl_conf nodes= [] persons= [] --- sas= [1, 2, 3] pl_conf crp= 1 ---- 'expires': 1166088824 +--- 'expires': 1166539917 2 None pl_conf_vserverslice nodes= [] persons= [] --- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 ---- 'expires': 1166088824 +--- 'expires': 1166539917 02: Slice Attribute Types 1 None type 20 Type of slice (e.g. vserver) 2 None system 10 Is a default system slice (1) or not (0 or unset) @@ -371,34 +399,35 @@ sl= 1 n= None 14 None net2_avg 10 Average bandwidth over routes exempt from node bandwidth limits (bps) 15 None net2_share 10 Number of bandwidth shares over routes exempt from node bandwidth limits 16 None disk_max 10 Disk quota (1k disk blocks) -17 None plc_slice_type 20 Type of slice rspec to be created -18 None plc_agent_version 10 Version of PLC agent (slice creation service) software to be deployed -19 None plc_ticket_pubkey 10 Public key used to verify PLC-signed tickets -20 None sat_2 10 custom sat on plc2 -21 1 sat_1 10 custom sat on plc1 +17 None proper_op 10 Proper operation (e.g. bind_socket) +18 None plc_slice_type 20 Type of slice rspec to be created +19 None plc_agent_version 10 Version of PLC agent (slice creation service) software to be deployed +20 None plc_ticket_pubkey 10 Public key used to verify PLC-signed tickets +21 None sat_2 10 custom sat on plc2 +22 1 sat_1 10 custom sat on plc1 02: Slice Attributes -1 None plc_agent_version AT_id: 18 ---- v= 1.0 sl= 1 n= None -2 None plc_slice_type AT_id: 17 +1 None plc_slice_type AT_id: 18 --- v= VServerSlice sl= 1 n= None -3 None plc_ticket_pubkey AT_id: 19 ---- v= MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzNBijHgrh8Md4VsdyvB2JscUz -T9eiCmZ+nWFPq7WgH8BVHYg7ltu5cuUU6R2KkjvwPSlK6NASdZaowlqp2TjHJodA -myoh6CQQwuyzb+EWxfkBq3cv3uYWnpR2rJBtHtgQbmSDT6cxyZz8KVXcYTztfxTh -hfcSi5YPSiWRE7xh1wIDAQAB +2 None plc_agent_version AT_id: 19 +--- v= 1.0 sl= 1 n= None +3 None plc_ticket_pubkey AT_id: 20 +--- v= MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGjlDHVbuu0BzdY89N2WTFf8H1 +uoZwZQIr8NzGI0hycHkiKdJl/n9X8GjPBZ1v7d+ncO7nMjP5gZkKsjHOx1BbP/sQ +Pn3zhbqkkVztBa9QAfBl6t2DHwI/s5wk31e06NkEB1l6rqpAiQ590wDHE9HlMHkJ +XzSGaMQWqjiOjo+2jQIDAQAB sl= 1 n= None -4 None disk_max AT_id: 16 ---- v= 5000000 sl= 2 n= None -5 None cpu_share AT_id: 7 +4 None cpu_share AT_id: 7 --- v= 32 sl= 2 n= None -6 None plc_slice_type AT_id: 17 +5 None plc_slice_type AT_id: 18 --- v= VServerSlice sl= 2 n= None +6 None disk_max AT_id: 16 +--- v= 5000000 sl= 2 n= None 02: SLIVERS -02: SLIVERS for : hostname n101.plc1.org +02: SLIVERS for : hostname n1-001.plc1.org 02: 31 config files -02: SLIVERS for : hostname n201.plc2.org +02: SLIVERS for : hostname n2-001.plc2.org 02: 31 config files 02:============================== END DUMP -+++ 144.41 seconds ellapsed (8.78) ++++ 147.47 seconds ellapsed (8.83) ==================== ('END',) -+++ 144.41 seconds ellapsed (0.00) ++++ 147.47 seconds ellapsed (0.00) diff --git a/TestPeers-n.ref b/TestPeers-n.ref index 67c77486..c114fe18 100644 --- a/TestPeers-n.ref +++ b/TestPeers-n.ref @@ -1,35 +1,30 @@ -2 keys, 4 sites, 4 persons, 5 nodes & 4 slices -2 keys/person, 5 nodes/slice & 8 persons/slice +4 sites, 4 persons, 5 nodes & 4 slices +2 keys/person, 3 nodes/slice & 6 persons/slice fast_flag False ==================== ('INIT',) +++ timer start -initializing s[1] https://lurch.cs.princeton.edu:443/PLCAPI/ -initialized aa[1] {'Username': 'root@plc1.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -initialized a[1] {'Username': 'peer1@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} -initializing s[2] https://planetlab-devbox.inria.fr:443/PLCAPI/ -initialized aa[2] {'Username': 'root@plc2.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -initialized a[2] {'Username': 'peer2@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} -s[1] -aa[1] {'Username': 'root@plc1.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -a[1] {'Username': 'peer1@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} -s[2] -aa[2] {'Username': 'root@plc2.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'root'} -a[2] {'Username': 'peer2@planet-lab.org', 'AuthMethod': 'password', 'Role': 'admin', 'AuthString': 'peer'} +initializing s[1]=>https://lurch.cs.princeton.edu:443/PLCAPI/ +initializing s[2]=>https://planetlab-devbox.inria.fr:443/PLCAPI/ +==================== s[1] +root@plc1.org connected using password authentication +==================== s[2] +root@plc2.org connected using password authentication +==================== 01:== created peer admin account 3, peer1@planet-lab.org - peer 02:== created peer admin account 3, peer2@planet-lab.org - peer 01:== enabled+admin on account 3:peer1@planet-lab.org 02:== enabled+admin on account 3:peer2@planet-lab.org -01:Created person 4 as the peer person -02:Created person 4 as the peer person +01:== Created person 4 as the peer person +02:== Created person 4 as the peer person 01:Created peer 1 PLEASE manually set password for person_id=4 in DB1 02:Created peer 1 PLEASE manually set password for person_id=4 in DB2 -Attempting to set passwd for person_id=4 in DB1UPDATE 1 +Attempting to remotely set passwd for person_id=4 in DB1UPDATE 1 -> system returns 0 -Attempting to set passwd for person_id=4 in DB2UPDATE 1 +Attempting to remotely set passwd for person_id=4 in DB2UPDATE 1 -> system returns 0 -+++ 13.05 seconds ellapsed (13.05) ++++ 12.88 seconds ellapsed (12.88) 01:== Created site 2 with max_slices=4 02:== Created site 2 with max_slices=4 01:== Created site 3 with max_slices=4 @@ -39,22 +34,22 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 01:== Created site 5 with max_slices=4 02:== Created site 5 with max_slices=4 === refresh after site creation -+++ 24.59 seconds ellapsed (11.54) ++++ 24.45 seconds ellapsed (11.57) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 1 new_sites 4 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.53231501579 time_gather 0.0437541007996 time_process 0.164775848389 time_transmit 1.3237850666 } -+++ 26.94 seconds ellapsed (2.35) ++++ ellapsed: { process-keys 0.00155901908875 process-nodes 0.010470867157 process-persons 0.0185129642487 process-sa 0.0246031284332 process-sat 0.00358200073242 process-sites 0.0394949913025 process-slices 0.016263961792 time_all 1.62891793251 time_gather 0.0435748100281 time_process 0.114496946335 time_transmit 1.47084617615 } ++++ 26.90 seconds ellapsed (2.45) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 1 new_sites 4 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.58680510521 time_gather 0.0349020957947 time_process 0.197776079178 time_transmit 1.35412693024 } -+++ 28.66 seconds ellapsed (1.72) -+++ 28.66 seconds ellapsed (0.00) ++++ ellapsed: { process-keys 0.00187611579895 process-nodes 0.0133719444275 process-persons 0.020674943924 process-sa 0.0301170349121 process-sat 0.00438904762268 process-sites 0.0452039241791 process-slices 0.0204548835754 time_all 1.52406406403 time_gather 0.0348598957062 time_process 0.136100053787 time_transmit 1.35310411453 } ++++ 28.56 seconds ellapsed (1.66) ++++ 28.56 seconds ellapsed (0.00) === refresh before persons&keys creation -+++ 32.41 seconds ellapsed (3.75) ++++ 32.29 seconds ellapsed (3.74) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.51098799706 time_gather 0.0452809333801 time_process 0.108983039856 time_transmit 1.35672402382 } -+++ 34.75 seconds ellapsed (2.34) ++++ ellapsed: { process-keys 0.00156497955322 process-nodes 0.0104970932007 process-persons 0.00765085220337 process-sa 0.0247361660004 process-sat 0.00374507904053 process-sites 0.00435709953308 process-slices 0.0161409378052 time_all 1.47064113617 time_gather 0.044891834259 time_process 0.0687031745911 time_transmit 1.35704612732 } ++++ 34.60 seconds ellapsed (2.30) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.53021216393 time_gather 0.0360291004181 time_process 0.14048910141 time_transmit 1.3536939621 } -+++ 36.41 seconds ellapsed (1.66) ++++ ellapsed: { process-keys 0.00184607505798 process-nodes 0.013571023941 process-persons 0.00975489616394 process-sa 0.0302619934082 process-sat 0.00393199920654 process-sites 0.00552105903625 process-slices 0.0209059715271 time_all 1.58150005341 time_gather 0.0357310771942 time_process 0.0858271121979 time_transmit 1.45994186401 } ++++ 36.32 seconds ellapsed (1.72) 01: Checking keys: got 0 local (e=0) & 0 foreign (e=0) 02: Checking keys: got 0 local (e=0) & 0 foreign (e=0) 01: Checking persons: got 4 local (e=4) & 1 foreign (e=1) @@ -106,52 +101,52 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 01: Checking persons: got 8 local (e=8) & 1 foreign (e=1) 02: Checking persons: got 8 local (e=8) & 1 foreign (e=1) === refresh after persons&keys creation -+++ 59.18 seconds ellapsed (22.77) ++++ 59.19 seconds ellapsed (22.87) 01:== Refreshing peer Result: { new_keys 8 new_nodes 0 new_persons 4 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.78520703316 time_gather 0.0463678836823 time_process 0.286010026932 time_transmit 1.45282912254 } -+++ 61.79 seconds ellapsed (2.61) ++++ ellapsed: { process-keys 0.0524909496307 process-nodes 0.010959148407 process-persons 0.0508358478546 process-sa 0.0248889923096 process-sat 0.00364899635315 process-sites 0.0043249130249 process-slices 0.0189311504364 time_all 1.6573741436 time_gather 0.0458860397339 time_process 0.166090011597 time_transmit 1.44539809227 } ++++ 61.66 seconds ellapsed (2.48) 02:== Refreshing peer Result: { new_keys 8 new_nodes 0 new_persons 4 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.8553981781 time_gather 0.0377640724182 time_process 0.350681066513 time_transmit 1.46695303917 } -+++ 63.78 seconds ellapsed (1.99) ++++ ellapsed: { process-keys 0.0574140548706 process-nodes 0.013659954071 process-persons 0.0580461025238 process-sa 0.0303900241852 process-sat 0.00436592102051 process-sites 0.00515985488892 process-slices 0.0311930179596 time_all 1.70401287079 time_gather 0.0378189086914 time_process 0.200240850449 time_transmit 1.46595311165 } ++++ 63.51 seconds ellapsed (1.85) 01: Checking keys: got 8 local (e=8) & 8 foreign (e=8) 02: Checking keys: got 8 local (e=8) & 8 foreign (e=8) 01: Checking persons: got 8 local (e=8) & 5 foreign (e=5) 02: Checking persons: got 8 local (e=8) & 5 foreign (e=5) -+++ 66.17 seconds ellapsed (2.39) ++++ 65.89 seconds ellapsed (2.38) ==================== ('RESETTING NODES',) 01:== Cleaning all nodes 02:== Cleaning all nodes === refresh cleaned nodes -+++ 67.11 seconds ellapsed (0.94) ++++ 66.82 seconds ellapsed (0.93) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.68751502037 time_gather 0.0444610118866 time_process 0.178684949875 time_transmit 1.46436905861 } -+++ 69.62 seconds ellapsed (2.51) ++++ ellapsed: { process-keys 0.00185108184814 process-nodes 0.00616002082825 process-persons 0.0157868862152 process-sa 0.0232000350952 process-sat 0.00203609466553 process-sites 0.00411987304688 process-slices 0.0157220363617 time_all 1.59080410004 time_gather 0.0366079807281 time_process 0.0688869953156 time_transmit 1.48530912399 } ++++ 69.23 seconds ellapsed (2.41) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.74660205841 time_gather 0.0371038913727 time_process 0.242964982986 time_transmit 1.46653318405 } -+++ 71.50 seconds ellapsed (1.88) ++++ ellapsed: { process-keys 0.00214004516602 process-nodes 0.0134718418121 process-persons 0.0120680332184 process-sa 0.0304310321808 process-sat 0.00448417663574 process-sites 0.00514912605286 process-slices 0.0309438705444 time_all 2.10713481903 time_gather 0.0373950004578 time_process 0.0987000465393 time_transmit 1.97103977203 } ++++ 71.47 seconds ellapsed (2.24) 01: Checking nodes: got 0 local (e=0) & 0 foreign (e=0) 02: Checking nodes: got 0 local (e=0) & 0 foreign (e=0) ==================== ('CREATING NODES',) -01:== Added node 1 n101.plc1.org -02:== Added node 1 n201.plc2.org -01:== Added node 2 n102.plc1.org -02:== Added node 2 n202.plc2.org -01:== Added node 3 n103.plc1.org -02:== Added node 3 n203.plc2.org -01:== Added node 4 n104.plc1.org -02:== Added node 4 n204.plc2.org -01:== Added node 5 n105.plc1.org -02:== Added node 5 n205.plc2.org +01:== Added node 1 n1-001.plc1.org +02:== Added node 1 n2-001.plc2.org +01:== Added node 2 n1-002.plc1.org +02:== Added node 2 n2-002.plc2.org +01:== Added node 3 n1-003.plc1.org +02:== Added node 3 n2-003.plc2.org +01:== Added node 4 n1-004.plc1.org +02:== Added node 4 n2-004.plc2.org +01:== Added node 5 n1-005.plc1.org +02:== Added node 5 n2-005.plc2.org 01: Checking nodes: got 5 local (e=5) & 0 foreign (e=0) 02: Checking nodes: got 5 local (e=5) & 0 foreign (e=0) === refresh after node creation -+++ 83.15 seconds ellapsed (11.65) ++++ 83.01 seconds ellapsed (11.54) 01:== Refreshing peer Result: { new_keys 0 new_nodes 5 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.81052184105 time_gather 0.0459451675415 time_process 0.288089036942 time_transmit 1.47648763657 } -+++ 85.79 seconds ellapsed (2.63) ++++ ellapsed: { process-keys 0.00183010101318 process-nodes 0.100928068161 process-persons 0.00936484336853 process-sa 0.0243570804596 process-sat 0.00203609466553 process-sites 0.00439500808716 process-slices 0.0169079303741 time_all 1.68103098869 time_gather 0.0455260276794 time_process 0.159830093384 time_transmit 1.47567486763 } ++++ 85.51 seconds ellapsed (2.50) 02:== Refreshing peer Result: { new_keys 0 new_nodes 5 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.92083191872 time_gather 0.0368890762329 time_process 0.349598884583 time_transmit 1.5343439579 } -+++ 87.84 seconds ellapsed (2.05) ++++ ellapsed: { process-keys 0.00229406356812 process-nodes 0.117465019226 process-persons 0.0119669437408 process-sa 0.0303339958191 process-sat 0.0025589466095 process-sites 0.00539302825928 process-slices 0.0215051174164 time_all 1.86327695847 time_gather 0.0301141738892 time_process 0.191529035568 time_transmit 1.64163374901 } ++++ 87.51 seconds ellapsed (2.00) 01: Checking nodes: got 5 local (e=5) & 5 foreign (e=5) 02: Checking nodes: got 5 local (e=5) & 5 foreign (e=5) 02:== Deleted node 1, returns 1 @@ -160,21 +155,21 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 02:== Deleted node 4, returns 1 02:== Deleted node 5, returns 1 ==================== ('2 extra del/add cycles on plc2 for different indexes',) -02:== Added node 11 n201.plc2.org -02:== Added node 12 n202.plc2.org -02:== Added node 13 n203.plc2.org -02:== Added node 14 n204.plc2.org -02:== Added node 15 n205.plc2.org +02:== Added node 11 n2-001.plc2.org +02:== Added node 12 n2-002.plc2.org +02:== Added node 13 n2-003.plc2.org +02:== Added node 14 n2-004.plc2.org +02:== Added node 15 n2-005.plc2.org 02:== Deleted node 11, returns 1 02:== Deleted node 12, returns 1 02:== Deleted node 13, returns 1 02:== Deleted node 14, returns 1 02:== Deleted node 15, returns 1 -02:== Added node 16 n201.plc2.org -02:== Added node 17 n202.plc2.org -02:== Added node 18 n203.plc2.org -02:== Added node 19 n204.plc2.org -02:== Added node 20 n205.plc2.org +02:== Added node 16 n2-001.plc2.org +02:== Added node 17 n2-002.plc2.org +02:== Added node 18 n2-003.plc2.org +02:== Added node 19 n2-004.plc2.org +02:== Added node 20 n2-005.plc2.org 02:== Deleted node 16, returns 1 02:== Deleted node 17, returns 1 02:== Deleted node 18, returns 1 @@ -182,34 +177,34 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 02:== Deleted node 20, returns 1 02: Checking nodes: got 0 local (e=0) & 5 foreign (e=5) === refresh after deletion on plc2 -+++ 95.90 seconds ellapsed (8.06) ++++ 95.57 seconds ellapsed (8.06) 01:== Refreshing peer Result: { new_keys 0 new_nodes -5 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.76638698578 time_gather 0.0375680923462 time_process 0.250076055527 time_transmit 1.47874283791 } -+++ 98.49 seconds ellapsed (2.59) ++++ ellapsed: { process-keys 0.00184297561646 process-nodes 0.0854408740997 process-persons 0.00984406471252 process-sa 0.0238749980927 process-sat 0.0020489692688 process-sites 0.00434899330139 process-slices 0.0166540145874 time_all 1.65642786026 time_gather 0.0370190143585 time_process 0.144064903259 time_transmit 1.47534394264 } ++++ 98.04 seconds ellapsed (2.47) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.79944801331 time_gather 0.0346529483795 time_process 0.284554958344 time_transmit 1.48024010658 } -+++ 100.42 seconds ellapsed (1.94) ++++ ellapsed: { process-keys 0.00224113464355 process-nodes 0.017117023468 process-persons 0.0121049880981 process-sa 0.0296969413757 process-sat 0.00251984596252 process-sites 0.00532793998718 process-slices 0.0213191509247 time_all 1.60131502151 time_gather 0.0347230434418 time_process 0.0903401374817 time_transmit 1.47625184059 } ++++ 99.78 seconds ellapsed (1.74) 01: Checking nodes: got 5 local (e=5) & 0 foreign (e=0) 02: Checking nodes: got 0 local (e=0) & 5 foreign (e=5) ==================== ('ADD on plc2 for different indexes',) -02:== Added node 21 n201.plc2.org -02:== Added node 22 n202.plc2.org -02:== Added node 23 n203.plc2.org -02:== Added node 24 n204.plc2.org -02:== Added node 25 n205.plc2.org +02:== Added node 21 n2-001.plc2.org +02:== Added node 22 n2-002.plc2.org +02:== Added node 23 n2-003.plc2.org +02:== Added node 24 n2-004.plc2.org +02:== Added node 25 n2-005.plc2.org 01: Checking nodes: got 5 local (e=5) & 0 foreign (e=0) 02: Checking nodes: got 5 local (e=5) & 5 foreign (e=5) === refresh after re-creation on plc2 -+++ 103.97 seconds ellapsed (3.55) ++++ 103.29 seconds ellapsed (3.51) 01:== Refreshing peer Result: { new_keys 0 new_nodes 5 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.82585000992 time_gather 0.0428400039673 time_process 0.287154197693 time_transmit 1.49585580826 } -+++ 106.62 seconds ellapsed (2.64) ++++ ellapsed: { process-keys 0.00182199478149 process-nodes 0.103384017944 process-persons 0.00986814498901 process-sa 0.0246789455414 process-sat 0.0020649433136 process-sites 0.00427293777466 process-slices 0.0175800323486 time_all 1.67928814888 time_gather 0.0424699783325 time_process 0.163680076599 time_transmit 1.47313809395 } ++++ 105.78 seconds ellapsed (2.49) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.81237101555 time_gather 0.0299639701843 time_process 0.287971019745 time_transmit 1.49443602562 } -+++ 108.56 seconds ellapsed (1.95) ++++ ellapsed: { process-keys 0.00224995613098 process-nodes 0.0180230140686 process-persons 0.0125858783722 process-sa 0.0317511558533 process-sat 0.00248599052429 process-sites 0.00570201873779 process-slices 0.0228300094604 time_all 1.62406802177 time_gather 0.0297570228577 time_process 0.0956399440765 time_transmit 1.49867105484 } ++++ 107.54 seconds ellapsed (1.76) 01: Checking nodes: got 5 local (e=5) & 5 foreign (e=5) 02: Checking nodes: got 5 local (e=5) & 5 foreign (e=5) -+++ 109.84 seconds ellapsed (1.28) ++++ 108.81 seconds ellapsed (1.27) ==================== ('RESETTING SLICES TEST',) 01:== Cleaning all nodes 01:==== Cleaning node 1 @@ -223,28 +218,28 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 02:==== Cleaning node 23 02:==== Cleaning node 24 02:==== Cleaning node 25 -01:== Added node 16 n101.plc1.org -02:== Added node 26 n201.plc2.org -01:== Added node 17 n102.plc1.org -02:== Added node 27 n202.plc2.org -01:== Added node 18 n103.plc1.org -02:== Added node 28 n203.plc2.org -01:== Added node 19 n104.plc1.org -02:== Added node 29 n204.plc2.org -01:== Added node 20 n105.plc1.org -02:== Added node 30 n205.plc2.org +01:== Added node 16 n1-001.plc1.org +02:== Added node 26 n2-001.plc2.org +01:== Added node 17 n1-002.plc1.org +02:== Added node 27 n2-002.plc2.org +01:== Added node 18 n1-003.plc1.org +02:== Added node 28 n2-003.plc2.org +01:== Added node 19 n1-004.plc1.org +02:== Added node 29 n2-004.plc2.org +01:== Added node 20 n1-005.plc1.org +02:== Added node 30 n2-005.plc2.org 01:== Cleaning all slices -01:==== Cleaning slice 3 +01:==== Cleaned slice 3 02:== Cleaning all slices -02:==== Cleaning slice 3 +02:==== Cleaned slice 3 === refresh After slices init -+++ 127.25 seconds ellapsed (17.41) ++++ 126.15 seconds ellapsed (17.34) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.76366019249 time_gather 0.0377299785614 time_process 0.224427223206 time_transmit 1.50150299072 } -+++ 129.84 seconds ellapsed (2.58) ++++ ellapsed: { process-keys 0.00184297561646 process-nodes 0.0143740177155 process-persons 0.00953602790833 process-sa 0.0170118808746 process-sat 0.00209188461304 process-sites 0.00454211235046 process-slices 0.0171310901642 time_all 1.60582995415 time_gather 0.0376689434052 time_process 0.0665409564972 time_transmit 1.50162005424 } ++++ 128.58 seconds ellapsed (2.42) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.75789785385 time_gather 0.029687166214 time_process 0.263741016388 time_transmit 1.46446967125 } -+++ 131.73 seconds ellapsed (1.89) ++++ ellapsed: { process-keys 0.0022599697113 process-nodes 0.00960516929626 process-persons 0.011883020401 process-sa 0.0210602283478 process-sat 0.00252795219421 process-sites 0.0129978656769 process-slices 0.021500825882 time_all 1.57813096046 time_gather 0.0365180969238 time_process 0.0818469524384 time_transmit 1.4597659111 } ++++ 130.29 seconds ellapsed (1.71) ==================== ('CREATING SLICES on plc1',) 01:== created slice 4 - max nodes=5 01:== Attached person user1-1@plc1.org to slice oneone_slice1 @@ -252,30 +247,30 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 01:== Attached person user1-3@plc1.org to slice oneone_slice1 01:== Attached person user1-4@plc1.org to slice oneone_slice1 01:== created slice 5 - max nodes=5 -01:== Attached person user1-1@plc1.org to slice onetwo_slice2 01:== Attached person user1-2@plc1.org to slice onetwo_slice2 01:== Attached person user1-3@plc1.org to slice onetwo_slice2 01:== Attached person user1-4@plc1.org to slice onetwo_slice2 +01:== Attached person user1-1@plc1.org to slice onetwo_slice2 01:== created slice 6 - max nodes=5 -01:== Attached person user1-1@plc1.org to slice onethree_slice3 -01:== Attached person user1-2@plc1.org to slice onethree_slice3 01:== Attached person user1-3@plc1.org to slice onethree_slice3 01:== Attached person user1-4@plc1.org to slice onethree_slice3 +01:== Attached person user1-1@plc1.org to slice onethree_slice3 +01:== Attached person user1-2@plc1.org to slice onethree_slice3 01:== created slice 7 - max nodes=5 +01:== Attached person user1-4@plc1.org to slice onefour_slice4 01:== Attached person user1-1@plc1.org to slice onefour_slice4 01:== Attached person user1-2@plc1.org to slice onefour_slice4 01:== Attached person user1-3@plc1.org to slice onefour_slice4 -01:== Attached person user1-4@plc1.org to slice onefour_slice4 01: Checking slices: got 6 local (e=6) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 0 foreign (e=0) === refresh after slice created on plc1 -+++ 153.48 seconds ellapsed (21.75) ++++ 151.92 seconds ellapsed (21.63) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.74248790741 time_gather 0.039745092392 time_process 0.219425916672 time_transmit 1.48331689835 } -+++ 156.04 seconds ellapsed (2.56) ++++ ellapsed: { process-keys 0.00180101394653 process-nodes 0.00750803947449 process-persons 0.00933790206909 process-sa 0.0172719955444 process-sat 0.00207591056824 process-sites 0.00408601760864 process-slices 0.0177590847015 time_all 1.58699893951 time_gather 0.0390739440918 time_process 0.0598618984222 time_transmit 1.488063097 } ++++ 154.32 seconds ellapsed (2.40) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 4 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.9096159935 time_gather 0.0304329395294 time_process 0.369858026505 time_transmit 1.50932502747 } -+++ 158.08 seconds ellapsed (2.04) ++++ ellapsed: { process-keys 0.002445936203 process-nodes 0.0099401473999 process-persons 0.0121188163757 process-sa 0.0218098163605 process-sat 0.00253510475159 process-sites 0.00548911094666 process-slices 0.136568069458 time_all 1.69194889069 time_gather 0.0305349826813 time_process 0.19091796875 time_transmit 1.47049593925 } ++++ 156.14 seconds ellapsed (1.82) 01: Checking slices: got 6 local (e=6) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 4 foreign (e=4) 01: local slice oneone_slice1 (e=0) on nodes [] @@ -287,107 +282,107 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 02: foreign slice onethree_slice3 (e=0) on nodes [] 02: foreign slice onefour_slice4 (e=0) on nodes [] ==================== ('ADDING LOCAL NODES IN SLICES',) -01:== added in slice oneone_slice1 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01:== added in slice onetwo_slice2 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01:== added in slice onethree_slice3 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01:== added in slice onefour_slice4 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01: local slice oneone_slice1 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onetwo_slice2 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onethree_slice3 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onefour_slice4 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org +01:== added in slice oneone_slice1 local ['n1-001.plc1.org', 'n1-002.plc1.org', 'n1-003.plc1.org'] +01:== added in slice onetwo_slice2 local ['n1-002.plc1.org', 'n1-003.plc1.org', 'n1-004.plc1.org'] +01:== added in slice onethree_slice3 local ['n1-003.plc1.org', 'n1-004.plc1.org', 'n1-005.plc1.org'] +01:== added in slice onefour_slice4 local ['n1-004.plc1.org', 'n1-005.plc1.org', 'n1-001.plc1.org'] +01: local slice oneone_slice1 (e=3) on nodes [16, 17, 18] +[LOC:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +01: local slice onetwo_slice2 (e=3) on nodes [17, 18, 19] +[LOC:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +01: local slice onethree_slice3 (e=3) on nodes [18, 19, 20] +[LOC:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +01: local slice onefour_slice4 (e=3) on nodes [16, 19, 20] +[LOC:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org 02: foreign slice oneone_slice1 (e=0) on nodes [] 02: foreign slice onetwo_slice2 (e=0) on nodes [] 02: foreign slice onethree_slice3 (e=0) on nodes [] 02: foreign slice onefour_slice4 (e=0) on nodes [] === refresh After local nodes were added on plc1 -+++ 179.19 seconds ellapsed (21.10) ++++ 176.50 seconds ellapsed (20.36) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.72503185272 time_gather 0.0388669967651 time_process 0.213292837143 time_transmit 1.47287201881 } -+++ 181.73 seconds ellapsed (2.54) ++++ ellapsed: { process-keys 0.0017991065979 process-nodes 0.00754809379578 process-persons 0.0093879699707 process-sa 0.0174939632416 process-sat 0.00205397605896 process-sites 0.00405693054199 process-slices 0.0175569057465 time_all 1.5920279026 time_gather 0.0383169651031 time_process 0.0599069595337 time_transmit 1.49380397797 } ++++ 178.90 seconds ellapsed (2.40) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.82426786423 time_gather 0.0306141376495 time_process 0.319747924805 time_transmit 1.47390580177 } -+++ 183.71 seconds ellapsed (1.98) -01: local slice oneone_slice1 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onetwo_slice2 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onethree_slice3 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onefour_slice4 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice oneone_slice1 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onetwo_slice2 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onethree_slice3 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onefour_slice4 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org ++++ ellapsed: { process-keys 0.00224208831787 process-nodes 0.00960993766785 process-persons 0.0122408866882 process-sa 0.0218920707703 process-sat 0.00257611274719 process-sites 0.00524306297302 process-slices 0.0391719341278 time_all 1.61974692345 time_gather 0.0305759906769 time_process 0.0929889678955 time_transmit 1.49618196487 } ++++ 180.65 seconds ellapsed (1.75) +01: local slice oneone_slice1 (e=3) on nodes [16, 17, 18] +[LOC:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +01: local slice onetwo_slice2 (e=3) on nodes [17, 18, 19] +[LOC:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +01: local slice onethree_slice3 (e=3) on nodes [18, 19, 20] +[LOC:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +01: local slice onefour_slice4 (e=3) on nodes [16, 19, 20] +[LOC:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice oneone_slice1 (e=3) on nodes [8, 6, 7] +[FOR:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +02: foreign slice onetwo_slice2 (e=3) on nodes [8, 9, 7] +[FOR:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +02: foreign slice onethree_slice3 (e=3) on nodes [8, 9, 10] +[FOR:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice onefour_slice4 (e=3) on nodes [9, 10, 6] +[FOR:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org ==================== ('ADDING FOREIGN NODES IN SLICES',) -01:== added in slice oneone_slice1 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01:== added in slice onetwo_slice2 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01:== added in slice onethree_slice3 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01:== added in slice onefour_slice4 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01: local slice oneone_slice1 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -01: local slice onetwo_slice2 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -01: local slice onethree_slice3 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -01: local slice onefour_slice4 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -02: foreign slice oneone_slice1 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onetwo_slice2 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onethree_slice3 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onefour_slice4 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org +01:== added in slice oneone_slice1 foreign ['n2-001.plc2.org', 'n2-002.plc2.org', 'n2-003.plc2.org'] +01:== added in slice onetwo_slice2 foreign ['n2-002.plc2.org', 'n2-003.plc2.org', 'n2-004.plc2.org'] +01:== added in slice onethree_slice3 foreign ['n2-003.plc2.org', 'n2-004.plc2.org', 'n2-005.plc2.org'] +01:== added in slice onefour_slice4 foreign ['n2-004.plc2.org', 'n2-005.plc2.org', 'n2-001.plc2.org'] +01: local slice oneone_slice1 (e=6) on nodes [16, 17, 18, 11, 12, 13] +[LOC:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +[FOR:3] : n2-001.plc2.org n2-002.plc2.org n2-003.plc2.org +01: local slice onetwo_slice2 (e=6) on nodes [17, 18, 19, 12, 13, 14] +[LOC:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +[FOR:3] : n2-002.plc2.org n2-003.plc2.org n2-004.plc2.org +01: local slice onethree_slice3 (e=6) on nodes [18, 19, 20, 13, 14, 15] +[LOC:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +[FOR:3] : n2-003.plc2.org n2-004.plc2.org n2-005.plc2.org +01: local slice onefour_slice4 (e=6) on nodes [16, 19, 20, 11, 14, 15] +[LOC:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +[FOR:3] : n2-001.plc2.org n2-004.plc2.org n2-005.plc2.org +02: foreign slice oneone_slice1 (e=3) on nodes [8, 6, 7] +[FOR:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +02: foreign slice onetwo_slice2 (e=3) on nodes [8, 9, 7] +[FOR:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +02: foreign slice onethree_slice3 (e=3) on nodes [8, 9, 10] +[FOR:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice onefour_slice4 (e=3) on nodes [9, 10, 6] +[FOR:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org === refresh After foreign nodes were added in plc1 -+++ 204.19 seconds ellapsed (20.48) ++++ 199.71 seconds ellapsed (19.06) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.80476403236 time_gather 0.0411069393158 time_process 0.226280927658 time_transmit 1.53737616539 } -+++ 206.82 seconds ellapsed (2.63) ++++ ellapsed: { process-keys 0.00189900398254 process-nodes 0.0077600479126 process-persons 0.00953102111816 process-sa 0.0177381038666 process-sat 0.00208306312561 process-sites 0.0111238956451 process-slices 0.0174179077148 time_all 1.61287212372 time_gather 0.0403590202332 time_process 0.0675640106201 time_transmit 1.50494909286 } ++++ 202.14 seconds ellapsed (2.43) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.88829112053 time_gather 0.0308990478516 time_process 0.342664003372 time_transmit 1.51472806931 } -+++ 208.84 seconds ellapsed (2.02) -01: local slice oneone_slice1 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -01: local slice onetwo_slice2 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -01: local slice onethree_slice3 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -01: local slice onefour_slice4 (e=10) on nodes [16, 17, 18, 19, 20, 11, 12, 13, 14, 15] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -[FOR:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -02: foreign slice oneone_slice1 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onetwo_slice2 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onethree_slice3 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onefour_slice4 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: 4 slivers (exp. 4) in GetSlivers for node n101.plc1.org ++++ ellapsed: { process-keys 0.00226902961731 process-nodes 0.0106799602509 process-persons 0.0129039287567 process-sa 0.0225200653076 process-sat 0.00256204605103 process-sites 0.0136530399323 process-slices 0.0387148857117 time_all 1.66683101654 time_gather 0.0309088230133 time_process 0.103314876556 time_transmit 1.53260731697 } ++++ 203.95 seconds ellapsed (1.80) +01: local slice oneone_slice1 (e=6) on nodes [16, 17, 18, 11, 12, 13] +[LOC:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +[FOR:3] : n2-001.plc2.org n2-002.plc2.org n2-003.plc2.org +01: local slice onetwo_slice2 (e=6) on nodes [17, 18, 19, 12, 13, 14] +[LOC:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +[FOR:3] : n2-002.plc2.org n2-003.plc2.org n2-004.plc2.org +01: local slice onethree_slice3 (e=6) on nodes [18, 19, 20, 13, 14, 15] +[LOC:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +[FOR:3] : n2-003.plc2.org n2-004.plc2.org n2-005.plc2.org +01: local slice onefour_slice4 (e=6) on nodes [16, 19, 20, 11, 14, 15] +[LOC:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +[FOR:3] : n2-001.plc2.org n2-004.plc2.org n2-005.plc2.org +02: foreign slice oneone_slice1 (e=6) on nodes [8, 6, 7, 26, 27, 28] +[LOC:3] : n2-001.plc2.org n2-002.plc2.org n2-003.plc2.org +[FOR:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +02: foreign slice onetwo_slice2 (e=6) on nodes [8, 9, 7, 27, 28, 29] +[LOC:3] : n2-002.plc2.org n2-003.plc2.org n2-004.plc2.org +[FOR:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +02: foreign slice onethree_slice3 (e=6) on nodes [8, 9, 10, 28, 29, 30] +[LOC:3] : n2-003.plc2.org n2-004.plc2.org n2-005.plc2.org +[FOR:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice onefour_slice4 (e=6) on nodes [9, 10, 6, 26, 29, 30] +[LOC:3] : n2-001.plc2.org n2-004.plc2.org n2-005.plc2.org +[FOR:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +01: 2 slivers (exp. 2) in GetSlivers for node n1-001.plc1.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1166452572, + 'expires': 1166544616, 'instantiation': 'plc-instantiated', 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, @@ -407,55 +402,15 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 'key_type': 'ssh'}], 'name': 'oneone_slice1', 'slice_id': 4} ->>slivername = onetwo_slice2 +>>slivername = onefour_slice4 { 'attributes': [], - 'expires': 1166452569, + 'expires': 1166544631, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, { 'key': 'ssh-rsa 11key4plc11 user4-key2', - 'key_type': 'ssh'}], - 'name': 'onetwo_slice2', - 'slice_id': 5} ->>slivername = onethree_slice3 -{ 'attributes': [], - 'expires': 1166452581, - 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key2', - 'key_type': 'ssh'}], - 'name': 'onethree_slice3', - 'slice_id': 6} ->>slivername = onefour_slice4 -{ 'attributes': [], - 'expires': 1166452586, - 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', + { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, @@ -466,17 +421,13 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onefour_slice4', 'slice_id': 7} -02: 4 slivers (exp. 4) in GetSlivers for node n201.plc2.org +02: 2 slivers (exp. 2) in GetSlivers for node n2-001.plc2.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1166452572, + 'expires': 1166544616, 'instantiation': 'plc-instantiated', 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, @@ -496,53 +447,9 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 'key_type': 'ssh'}], 'name': 'oneone_slice1', 'slice_id': 4} ->>slivername = onetwo_slice2 -{ 'attributes': [], - 'expires': 1166452569, - 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key2', - 'key_type': 'ssh'}], - 'name': 'onetwo_slice2', - 'slice_id': 5} ->>slivername = onethree_slice3 -{ 'attributes': [], - 'expires': 1166452581, - 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key2', - 'key_type': 'ssh'}], - 'name': 'onethree_slice3', - 'slice_id': 6} >>slivername = onefour_slice4 { 'attributes': [], - 'expires': 1166452586, + 'expires': 1166544631, 'instantiation': 'plc-instantiated', 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, @@ -563,34 +470,34 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 'name': 'onefour_slice4', 'slice_id': 7} ==================== ('DELETING FOREIGN NODES FROM SLICES',) -01:== deleted in slice oneone_slice1 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01:== deleted in slice onetwo_slice2 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01:== deleted in slice onethree_slice3 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01:== deleted in slice onefour_slice4 foreign ['n201.plc2.org', 'n202.plc2.org', 'n203.plc2.org', 'n204.plc2.org', 'n205.plc2.org'] -01: local slice oneone_slice1 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onetwo_slice2 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onethree_slice3 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onefour_slice4 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice oneone_slice1 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onetwo_slice2 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onethree_slice3 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onefour_slice4 (e=10) on nodes [8, 9, 10, 6, 7, 26, 27, 28, 29, 30] -[LOC:5] : n201.plc2.org n202.plc2.org n203.plc2.org n204.plc2.org n205.plc2.org -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: 4 slivers (exp. 4) in GetSlivers for node n101.plc1.org +01:== deleted in slice oneone_slice1 foreign ['n2-001.plc2.org', 'n2-002.plc2.org', 'n2-003.plc2.org'] +01:== deleted in slice onetwo_slice2 foreign ['n2-002.plc2.org', 'n2-003.plc2.org', 'n2-004.plc2.org'] +01:== deleted in slice onethree_slice3 foreign ['n2-003.plc2.org', 'n2-004.plc2.org', 'n2-005.plc2.org'] +01:== deleted in slice onefour_slice4 foreign ['n2-004.plc2.org', 'n2-005.plc2.org', 'n2-001.plc2.org'] +01: local slice oneone_slice1 (e=3) on nodes [16, 17, 18] +[LOC:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +01: local slice onetwo_slice2 (e=3) on nodes [17, 18, 19] +[LOC:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +01: local slice onethree_slice3 (e=3) on nodes [18, 19, 20] +[LOC:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +01: local slice onefour_slice4 (e=3) on nodes [16, 19, 20] +[LOC:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice oneone_slice1 (e=6) on nodes [8, 6, 7, 26, 27, 28] +[LOC:3] : n2-001.plc2.org n2-002.plc2.org n2-003.plc2.org +[FOR:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +02: foreign slice onetwo_slice2 (e=6) on nodes [8, 9, 7, 27, 28, 29] +[LOC:3] : n2-002.plc2.org n2-003.plc2.org n2-004.plc2.org +[FOR:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +02: foreign slice onethree_slice3 (e=6) on nodes [8, 9, 10, 28, 29, 30] +[LOC:3] : n2-003.plc2.org n2-004.plc2.org n2-005.plc2.org +[FOR:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice onefour_slice4 (e=6) on nodes [9, 10, 6, 26, 29, 30] +[LOC:3] : n2-001.plc2.org n2-004.plc2.org n2-005.plc2.org +[FOR:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +01: 2 slivers (exp. 2) in GetSlivers for node n1-001.plc1.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1166452572, + 'expires': 1166544616, 'instantiation': 'plc-instantiated', 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, @@ -610,55 +517,15 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 'key_type': 'ssh'}], 'name': 'oneone_slice1', 'slice_id': 4} ->>slivername = onetwo_slice2 +>>slivername = onefour_slice4 { 'attributes': [], - 'expires': 1166452569, + 'expires': 1166544631, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, { 'key': 'ssh-rsa 11key4plc11 user4-key2', - 'key_type': 'ssh'}], - 'name': 'onetwo_slice2', - 'slice_id': 5} ->>slivername = onethree_slice3 -{ 'attributes': [], - 'expires': 1166452581, - 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user1-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user2-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key2', - 'key_type': 'ssh'}], - 'name': 'onethree_slice3', - 'slice_id': 6} ->>slivername = onefour_slice4 -{ 'attributes': [], - 'expires': 1166452586, - 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', + { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, @@ -669,62 +536,58 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, { 'key': 'ssh-rsa 11key4plc11 user3-key2', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key1', - 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onefour_slice4', 'slice_id': 7} === refresh After foreign nodes were removed on plc1 -+++ 232.45 seconds ellapsed (23.61) ++++ 225.96 seconds ellapsed (22.01) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.90232896805 time_gather 0.0400369167328 time_process 0.218807935715 time_transmit 1.6434841156 } -+++ 235.17 seconds ellapsed (2.72) ++++ ellapsed: { process-keys 0.00182509422302 process-nodes 0.00765085220337 process-persons 0.00945401191711 process-sa 0.017893075943 process-sat 0.00217413902283 process-sites 0.00411295890808 process-slices 0.0173659324646 time_all 1.5922088623 time_gather 0.0390591621399 time_process 0.0604858398438 time_transmit 1.49266386032 } ++++ 228.36 seconds ellapsed (2.40) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.84636998177 time_gather 0.0306148529053 time_process 0.314095020294 time_transmit 1.50166010857 } -+++ 237.15 seconds ellapsed (1.98) -01: local slice oneone_slice1 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onetwo_slice2 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onethree_slice3 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -01: local slice onefour_slice4 (e=5) on nodes [16, 17, 18, 19, 20] -[LOC:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice oneone_slice1 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onetwo_slice2 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onethree_slice3 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onefour_slice4 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org ++++ ellapsed: { process-keys 0.00221490859985 process-nodes 0.0100440979004 process-persons 0.0123507976532 process-sa 0.0219099521637 process-sat 0.00252509117126 process-sites 0.00539612770081 process-slices 0.0340950489044 time_all 1.58790707588 time_gather 0.0306007862091 time_process 0.0885469913483 time_transmit 1.46875929832 } ++++ 230.08 seconds ellapsed (1.72) +01: local slice oneone_slice1 (e=3) on nodes [16, 17, 18] +[LOC:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +01: local slice onetwo_slice2 (e=3) on nodes [17, 18, 19] +[LOC:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +01: local slice onethree_slice3 (e=3) on nodes [18, 19, 20] +[LOC:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +01: local slice onefour_slice4 (e=3) on nodes [16, 19, 20] +[LOC:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice oneone_slice1 (e=3) on nodes [8, 6, 7] +[FOR:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +02: foreign slice onetwo_slice2 (e=3) on nodes [8, 9, 7] +[FOR:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +02: foreign slice onethree_slice3 (e=3) on nodes [8, 9, 10] +[FOR:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice onefour_slice4 (e=3) on nodes [9, 10, 6] +[FOR:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org ==================== ('DELETING LOCAL NODES FROM SLICES',) -01:== deleted in slice oneone_slice1 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01:== deleted in slice onetwo_slice2 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01:== deleted in slice onethree_slice3 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] -01:== deleted in slice onefour_slice4 local ['n101.plc1.org', 'n102.plc1.org', 'n103.plc1.org', 'n104.plc1.org', 'n105.plc1.org'] +01:== deleted in slice oneone_slice1 local ['n1-001.plc1.org', 'n1-002.plc1.org', 'n1-003.plc1.org'] +01:== deleted in slice onetwo_slice2 local ['n1-002.plc1.org', 'n1-003.plc1.org', 'n1-004.plc1.org'] +01:== deleted in slice onethree_slice3 local ['n1-003.plc1.org', 'n1-004.plc1.org', 'n1-005.plc1.org'] +01:== deleted in slice onefour_slice4 local ['n1-004.plc1.org', 'n1-005.plc1.org', 'n1-001.plc1.org'] 01: local slice oneone_slice1 (e=0) on nodes [] 01: local slice onetwo_slice2 (e=0) on nodes [] 01: local slice onethree_slice3 (e=0) on nodes [] 01: local slice onefour_slice4 (e=0) on nodes [] -02: foreign slice oneone_slice1 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onetwo_slice2 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onethree_slice3 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org -02: foreign slice onefour_slice4 (e=5) on nodes [8, 9, 10, 6, 7] -[FOR:5] : n101.plc1.org n102.plc1.org n103.plc1.org n104.plc1.org n105.plc1.org +02: foreign slice oneone_slice1 (e=3) on nodes [8, 6, 7] +[FOR:3] : n1-001.plc1.org n1-002.plc1.org n1-003.plc1.org +02: foreign slice onetwo_slice2 (e=3) on nodes [8, 9, 7] +[FOR:3] : n1-002.plc1.org n1-003.plc1.org n1-004.plc1.org +02: foreign slice onethree_slice3 (e=3) on nodes [8, 9, 10] +[FOR:3] : n1-003.plc1.org n1-004.plc1.org n1-005.plc1.org +02: foreign slice onefour_slice4 (e=3) on nodes [9, 10, 6] +[FOR:3] : n1-001.plc1.org n1-004.plc1.org n1-005.plc1.org === refresh After local nodes were removed on plc1 -+++ 256.34 seconds ellapsed (19.20) ++++ 248.43 seconds ellapsed (18.35) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.75599598885 time_gather 0.0399141311646 time_process 0.220777988434 time_transmit 1.49530386925 } -+++ 258.92 seconds ellapsed (2.57) ++++ ellapsed: { process-keys 0.00184893608093 process-nodes 0.00781011581421 process-persons 0.00971007347107 process-sa 0.0175638198853 process-sat 0.00211477279663 process-sites 0.00427293777466 process-slices 0.0186262130737 time_all 1.57066488266 time_gather 0.0387580394745 time_process 0.0619568824768 time_transmit 1.46994996071 } ++++ 250.82 seconds ellapsed (2.38) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.82033109665 time_gather 0.0314879417419 time_process 0.314651012421 time_transmit 1.47419214249 } -+++ 260.87 seconds ellapsed (1.95) ++++ ellapsed: { process-keys 0.00224184989929 process-nodes 0.00984215736389 process-persons 0.012130022049 process-sa 0.0217261314392 process-sat 0.00255703926086 process-sites 0.00553297996521 process-slices 0.0312337875366 time_all 1.58371901512 time_gather 0.0309329032898 time_process 0.085275888443 time_transmit 1.46751022339 } ++++ 252.53 seconds ellapsed (1.72) 01: local slice oneone_slice1 (e=0) on nodes [] 01: local slice onetwo_slice2 (e=0) on nodes [] 01: local slice onethree_slice3 (e=0) on nodes [] @@ -735,34 +598,34 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 02: foreign slice onefour_slice4 (e=0) on nodes [] ==================== ('CHECKING SLICES CLEAN UP',) 01:== Cleaning all slices -01:==== Cleaning slice 4 -01:==== Cleaning slice 5 -01:==== Cleaning slice 6 -01:==== Cleaning slice 7 +01:==== Cleaned slice 4 +01:==== Cleaned slice 5 +01:==== Cleaned slice 6 +01:==== Cleaned slice 7 01: Checking slices: got 2 local (e=2) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 4 foreign (e=4) === refresh After slices clenaup -+++ 274.60 seconds ellapsed (13.73) ++++ 266.13 seconds ellapsed (13.60) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.75281190872 time_gather 0.0411880016327 time_process 0.217626810074 time_transmit 1.49399709702 } -+++ 277.17 seconds ellapsed (2.57) ++++ ellapsed: { process-keys 0.00189709663391 process-nodes 0.00783181190491 process-persons 0.0103671550751 process-sa 0.0173480510712 process-sat 0.00213384628296 process-sites 0.00424909591675 process-slices 0.0171921253204 time_all 1.58334922791 time_gather 0.0405759811401 time_process 0.0610291957855 time_transmit 1.48174405098 } ++++ 268.52 seconds ellapsed (2.40) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 0 new_slice_attributes 0 new_slices -4 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.8151268959 time_gather 0.0297141075134 time_process 0.318310976028 time_transmit 1.46710181236 } -+++ 279.12 seconds ellapsed (1.95) ++++ ellapsed: { process-keys 0.00224900245667 process-nodes 0.010390996933 process-persons 0.0127301216125 process-sa 0.0216031074524 process-sat 0.00255799293518 process-sites 0.00559997558594 process-slices 0.074798822403 time_all 1.61594200134 time_gather 0.0294950008392 time_process 0.129941940308 time_transmit 1.4565050602 } ++++ 270.27 seconds ellapsed (1.75) 01: Checking slices: got 2 local (e=2) & 0 foreign (e=0) 02: Checking slices: got 2 local (e=2) & 0 foreign (e=0) -+++ 281.01 seconds ellapsed (1.89) ++++ 272.14 seconds ellapsed (1.87) 01:== created SliceAttributeType = 21 02:== created SliceAttributeType = 21 === refresh after SliceAttributeType creation -+++ 282.90 seconds ellapsed (1.90) ++++ 274.02 seconds ellapsed (1.87) 01:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 1 new_slice_attributes 0 new_slices 0 plcname Thierry plc1 } -+++ ellapsed: { time_all 1.75995182991 time_gather 0.0382769107819 time_process 0.230616807938 time_transmit 1.49105811119 } -+++ 285.48 seconds ellapsed (2.58) ++++ ellapsed: { process-keys 0.00184512138367 process-nodes 0.00767683982849 process-persons 0.0095272064209 process-sa 0.0170228481293 process-sat 0.0157477855682 process-sites 0.00419902801514 process-slices 0.0174841880798 time_all 1.57209396362 time_gather 0.037446975708 time_process 0.0735139846802 time_transmit 1.46113300323 } ++++ 276.40 seconds ellapsed (2.38) 02:== Refreshing peer Result: { new_keys 0 new_nodes 0 new_persons 0 new_sites 0 new_slice_attribute_types 1 new_slice_attributes 0 new_slices 0 plcname Thierry plc2 on devbox } -+++ ellapsed: { time_all 1.77619385719 time_gather 0.0305790901184 time_process 0.285783052444 time_transmit 1.45983171463 } -+++ 287.39 seconds ellapsed (1.91) -+++ 287.39 seconds ellapsed (0.00) ++++ ellapsed: { process-keys 0.0022280216217 process-nodes 0.0102257728577 process-persons 0.0124750137329 process-sa 0.0212419033051 process-sat 0.0142290592194 process-sites 0.00545811653137 process-slices 0.0224771499634 time_all 1.58010792732 time_gather 0.0301549434662 time_process 0.0883469581604 time_transmit 1.4616060257 } ++++ 278.12 seconds ellapsed (1.71) ++++ 278.12 seconds ellapsed (0.00) 01:============================== DUMPING 01: SITES 1 None pl Thierry plc1 Central [] @@ -796,33 +659,33 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 2 None root@plc1.org keys: [] sites: [1] 3 None peer1@planet-lab.org keys: [] sites: [] 4 None peer2@planet-lab.org keys: [] sites: [] +5 1 root@plc2.org keys: [] sites: [1] 6 None user1-1@plc1.org keys: [1, 2] sites: [] 7 None user1-2@plc1.org keys: [3, 4] sites: [] 8 None user1-3@plc1.org keys: [5, 6] sites: [] 9 None user1-4@plc1.org keys: [7, 8] sites: [] -5 1 root@plc2.org keys: [] sites: [1] 10 1 user2-1@plc2.org keys: [9, 10] sites: [] 11 1 user2-2@plc2.org keys: [11, 12] sites: [] 12 1 user2-3@plc2.org keys: [13, 14] sites: [] 13 1 user2-4@plc2.org keys: [16, 15] sites: [] 01: NODES -16 None n101.plc1.org sls= [] site= 2 -17 None n102.plc1.org sls= [] site= 3 -18 None n103.plc1.org sls= [] site= 4 -19 None n104.plc1.org sls= [] site= 5 -20 None n105.plc1.org sls= [] site= 2 -11 1 n201.plc2.org sls= [] site= 6 -12 1 n202.plc2.org sls= [] site= 7 -13 1 n203.plc2.org sls= [] site= 8 -14 1 n204.plc2.org sls= [] site= 9 -15 1 n205.plc2.org sls= [] site= 6 +11 1 n2-001.plc2.org sls= [] site= 6 +12 1 n2-002.plc2.org sls= [] site= 7 +13 1 n2-003.plc2.org sls= [] site= 8 +14 1 n2-004.plc2.org sls= [] site= 9 +15 1 n2-005.plc2.org sls= [] site= 6 +16 None n1-001.plc1.org sls= [] site= 2 +17 None n1-002.plc1.org sls= [] site= 3 +18 None n1-003.plc1.org sls= [] site= 4 +19 None n1-004.plc1.org sls= [] site= 5 +20 None n1-005.plc1.org sls= [] site= 2 01: SLICES 1 None pl_conf nodes= [] persons= [] --- sas= [1, 2, 3] pl_conf crp= 1 ---- 'expires': 1166452434 +--- 'expires': 1166544466 2 None pl_conf_vserverslice nodes= [] persons= [] --- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 ---- 'expires': 1166452434 +--- 'expires': 1166544466 01: Slice Attribute Types 1 None type 20 Type of slice (e.g. vserver) 2 None system 10 Is a default system slice (1) or not (0 or unset) @@ -864,25 +727,25 @@ sl= 1 n= None 6 None disk_max AT_id: 16 --- v= 5000000 sl= 2 n= None 01: SLIVERS -01: SLIVERS for : hostname n201.plc2.org +01: SLIVERS for : hostname n2-001.plc2.org 01: 31 config files -01: SLIVERS for : hostname n202.plc2.org +01: SLIVERS for : hostname n2-002.plc2.org 01: 31 config files -01: SLIVERS for : hostname n203.plc2.org +01: SLIVERS for : hostname n2-003.plc2.org 01: 31 config files -01: SLIVERS for : hostname n204.plc2.org +01: SLIVERS for : hostname n2-004.plc2.org 01: 31 config files -01: SLIVERS for : hostname n205.plc2.org +01: SLIVERS for : hostname n2-005.plc2.org 01: 31 config files -01: SLIVERS for : hostname n101.plc1.org +01: SLIVERS for : hostname n1-001.plc1.org 01: 31 config files -01: SLIVERS for : hostname n102.plc1.org +01: SLIVERS for : hostname n1-002.plc1.org 01: 31 config files -01: SLIVERS for : hostname n103.plc1.org +01: SLIVERS for : hostname n1-003.plc1.org 01: 31 config files -01: SLIVERS for : hostname n104.plc1.org +01: SLIVERS for : hostname n1-004.plc1.org 01: 31 config files -01: SLIVERS for : hostname n105.plc1.org +01: SLIVERS for : hostname n1-005.plc1.org 01: 31 config files 01:============================== END DUMP 02:============================== DUMPING @@ -892,10 +755,10 @@ sl= 1 n= None 3 None twotwo plc2 in federation [2, 12, 17, 22, 27] 4 None twothree plc2 in federation [3, 13, 18, 23, 28] 5 None twofour plc2 in federation [4, 14, 19, 24, 29] -8 1 onethree plc1 in federation [8] -9 1 onefour plc1 in federation [9] 6 1 oneone plc1 in federation [6, 10] 7 1 onetwo plc1 in federation [7] +8 1 onethree plc1 in federation [8] +9 1 onefour plc1 in federation [9] 02: KEYS 9 None ssh-rsa 22key4plc22 user1-key1 10 None ssh-rsa 22key4plc22 user1-key2 @@ -918,6 +781,7 @@ sl= 1 n= None 2 None root@plc2.org keys: [] sites: [1] 3 None peer2@planet-lab.org keys: [] sites: [] 4 None peer1@planet-lab.org keys: [] sites: [] +5 1 root@plc1.org keys: [] sites: [1] 10 None user2-1@plc2.org keys: [9, 10] sites: [] 11 None user2-2@plc2.org keys: [11, 12] sites: [] 12 None user2-3@plc2.org keys: [13, 14] sites: [] @@ -926,25 +790,24 @@ sl= 1 n= None 15 1 user1-2@plc1.org keys: [19, 20] sites: [] 16 1 user1-3@plc1.org keys: [21, 22] sites: [] 17 1 user1-4@plc1.org keys: [24, 23] sites: [] -5 1 root@plc1.org keys: [] sites: [1] 02: NODES -26 None n201.plc2.org sls= [] site= 2 -27 None n202.plc2.org sls= [] site= 3 -28 None n203.plc2.org sls= [] site= 4 -29 None n204.plc2.org sls= [] site= 5 -30 None n205.plc2.org sls= [] site= 2 -6 1 n101.plc1.org sls= [] site= 6 -7 1 n102.plc1.org sls= [] site= 7 -8 1 n103.plc1.org sls= [] site= 8 -9 1 n104.plc1.org sls= [] site= 9 -10 1 n105.plc1.org sls= [] site= 6 +6 1 n1-001.plc1.org sls= [] site= 6 +7 1 n1-002.plc1.org sls= [] site= 7 +8 1 n1-003.plc1.org sls= [] site= 8 +9 1 n1-004.plc1.org sls= [] site= 9 +10 1 n1-005.plc1.org sls= [] site= 6 +26 None n2-001.plc2.org sls= [] site= 2 +27 None n2-002.plc2.org sls= [] site= 3 +28 None n2-003.plc2.org sls= [] site= 4 +29 None n2-004.plc2.org sls= [] site= 5 +30 None n2-005.plc2.org sls= [] site= 2 02: SLICES 1 None pl_conf nodes= [] persons= [] --- sas= [1, 2, 3] pl_conf crp= 1 ---- 'expires': 1166452435 +--- 'expires': 1166544469 2 None pl_conf_vserverslice nodes= [] persons= [] --- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 ---- 'expires': 1166452435 +--- 'expires': 1166544469 02: Slice Attribute Types 1 None type 20 Type of slice (e.g. vserver) 2 None system 10 Is a default system slice (1) or not (0 or unset) @@ -986,27 +849,27 @@ sl= 1 n= None 6 None disk_max AT_id: 16 --- v= 5000000 sl= 2 n= None 02: SLIVERS -02: SLIVERS for : hostname n101.plc1.org +02: SLIVERS for : hostname n1-001.plc1.org 02: 31 config files -02: SLIVERS for : hostname n102.plc1.org +02: SLIVERS for : hostname n1-002.plc1.org 02: 31 config files -02: SLIVERS for : hostname n103.plc1.org +02: SLIVERS for : hostname n1-003.plc1.org 02: 31 config files -02: SLIVERS for : hostname n104.plc1.org +02: SLIVERS for : hostname n1-004.plc1.org 02: 31 config files -02: SLIVERS for : hostname n105.plc1.org +02: SLIVERS for : hostname n1-005.plc1.org 02: 31 config files -02: SLIVERS for : hostname n201.plc2.org +02: SLIVERS for : hostname n2-001.plc2.org 02: 31 config files -02: SLIVERS for : hostname n202.plc2.org +02: SLIVERS for : hostname n2-002.plc2.org 02: 31 config files -02: SLIVERS for : hostname n203.plc2.org +02: SLIVERS for : hostname n2-003.plc2.org 02: 31 config files -02: SLIVERS for : hostname n204.plc2.org +02: SLIVERS for : hostname n2-004.plc2.org 02: 31 config files -02: SLIVERS for : hostname n205.plc2.org +02: SLIVERS for : hostname n2-005.plc2.org 02: 31 config files 02:============================== END DUMP -+++ 298.40 seconds ellapsed (11.01) ++++ 289.05 seconds ellapsed (10.94) ==================== ('END',) -+++ 298.40 seconds ellapsed (0.00) ++++ 289.05 seconds ellapsed (0.00) diff --git a/TestPeers.py b/TestPeers.py index 9fe84982..0d669f83 100755 --- a/TestPeers.py +++ b/TestPeers.py @@ -25,32 +25,46 @@ import getopt import sys import time -## we use indexes 1 and 2 +import Shell +import PLC.Methods + +# when running locally, we might wish to run only our local stuff +dummy_print_methods = [ 'RefreshPeer' ] +class DummyShell: + class Callable: + def __init__(self,method,index): + self.method=method + self.index=index + self.printed=False + def __call__ (self, *args, **kwds): + if not self.printed or self.method in dummy_print_methods: + print "Dummy method %s on remote peer %d skipped"%(self.method,self.index) + self.printed=True + return 0 + def __init__(self,index): + self.index=index + def init(self): + for method in PLC.Methods.methods: + # ignore path-defined methods for now + if "." not in method: + setattr(self,method,DummyShell.Callable(method,self.index)) + def show_config(self,*args): + print 'DummyShell' + +#################### +import xmlrpclib +import os + +## try to support reload try: - dir(plc) + globals()['plc'] except: plc=[None,None,None] -## the server objects try: - dir(s) + globals()['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 - + #################### # predefined stuff # number of 'system' persons @@ -69,23 +83,33 @@ def total_slices (): def system_slivers (): # return len(system_slices_ids) return 0 +# too tedious to do the maths : how many slices attached to node 1 +expected_slivers=None def total_slivers (): - return number_slices+system_slivers() + global expected_slivers + if expected_slivers is None: + expected_slivers=0 + actual_nodes_per_slice = min (number_nodes,number_nodes_per_slice) + for ns in myrange(number_slices): + slice_range = [ map_on_node (n+ns) for n in range(actual_nodes_per_slice)] + if 1 in slice_range: + expected_slivers += 1 + return expected_slivers+system_slivers() #################### # set initial conditions # actual persons_per_slice is min(number_persons,number_persons_per_slice) # actual nodes_per_slice is min(number_nodes,number_nodes_per_slice) # this is to prevent quadractic test times on big tests -def define_test (keys,sites,persons,nodes,slices, - nodes_per_slice,persons_per_slice,fast_mode=None): - global number_keys, number_sites, number_persons, number_nodes, number_slices - global number_nodes_per_slice, number_persons_per_slice, fast_flag - number_keys=keys +def define_test (sites,persons,nodes,slices, + keys_per_person,nodes_per_slice,persons_per_slice,fast_mode=None): + global number_sites, number_persons, number_nodes, number_slices + global number_keys_per_person, number_nodes_per_slice, number_persons_per_slice, fast_flag number_sites = sites number_persons=persons number_nodes=nodes number_slices=slices + number_keys_per_person=keys_per_person number_nodes_per_slice=nodes_per_slice number_persons_per_slice=persons_per_slice if fast_mode is not None: @@ -95,10 +119,10 @@ def define_test (keys,sites,persons,nodes,slices, local_peer=None def show_test(): - print '%d keys, %d sites, %d persons, %d nodes & %d slices'%( - number_keys, number_sites,number_persons,number_nodes,number_slices) + print '%d sites, %d persons, %d nodes & %d slices'%( + number_sites,number_persons,number_nodes,number_slices) print '%d keys/person, %d nodes/slice & %d persons/slice'%( - number_keys,number_nodes_per_slice,number_persons_per_slice) + number_keys_per_person,number_nodes_per_slice,number_persons_per_slice) print 'fast_flag',fast_flag if local_peer is not None: print 'Running locally on index %d'%local_peer @@ -107,29 +131,43 @@ def mini(): define_test(1,1,1,1,1,1,1,True) def normal(): - define_test (keys=2,sites=4,persons=4,nodes=5,slices=4, - nodes_per_slice=5,persons_per_slice=8,fast_mode=False) + define_test (sites=4,persons=4,nodes=5,slices=4, + keys_per_person=2,nodes_per_slice=3,persons_per_slice=6,fast_mode=False) + +def apply_factor (factor): + global number_sites, number_persons, number_nodes, number_slices + [number_sites, number_persons, number_nodes, number_slices] = \ + [factor*x for x in [number_sites, number_persons, number_nodes, number_slices]] + # use only 1 key in this case big_factor=4 def big(): global number_sites, number_persons, number_nodes, number_slices - normal() - (number_sites,number_persons,number_nodes,number_slices) = [ - big_factor * x for x in (number_sites,number_persons,number_nodes,number_slices)] - global number_keys - number_keys=1 + number_sites=200 + number_persons=500 + number_nodes=350 + number_slices=500 + global nodes_per_slice + nodes_per_slice=3 + global number_keys_per_person + number_keys_per_person=1 + global number_persons_per_slice + number_persons_per_slice=3 -huge_factor=100 +#huge_factor=1000 def huge(): global number_sites, number_persons, number_nodes, number_slices - normal() - (number_sites,number_persons,number_nodes,number_slices) = [ - huge_factor * x for x in (number_sites,number_persons,number_nodes,number_slices)] - global number_keys - number_keys=1 + number_sites=1000 + number_persons=2000 + number_nodes=3000 + number_slices=2000 + global nodes_per_slice + nodes_per_slice=3 + global number_keys_per_person + number_keys_per_person=1 global number_persons_per_slice - number_persons_per_slice=2 + number_persons_per_slice=3 # use mini test by default in interactive mode mini() @@ -141,33 +179,33 @@ plain_numbers=['zero','one','two','three','four','five','six','seven','eight','n 'eleven','twelve','thirteen','fourteen','fifteen','sixteen','seventeen','eighteen','nineteen','twenty'] plain_digits=['a','b','c','d','e','f','g','h','i','j'] #################### -plc1={ 'plcname':'plc1 in federation', - 'hostname':'lurch.cs.princeton.edu', - 'url-format':'https://%s:443/PLCAPI/', - 'builtin-admin-id':'root@plc1.org', - 'builtin-admin-password':'root', - 'peer-admin-name':'peer1@planet-lab.org', - 'peer-admin-password':'peer', - 'node-format':'n1%02d.plc1.org', - 'plainname' : 'one', - 'site-format':'one%s', - 'person-format' : 'user1-%d@plc1.org', - 'key-format':'ssh-rsa 11key4plc11 user%d-key%d', - 'person-password' : 'password1', +plc[1]={ 'plcname':'plc1 in federation', + 'hostname':'lurch.cs.princeton.edu', + 'url-format':'https://%s:443/PLCAPI/', + 'builtin-admin-id':'root@plc1.org', + 'builtin-admin-password':'root', + 'peer-admin-name':'peer1@planet-lab.org', + 'peer-admin-password':'peer', + 'node-format':'n1-%03d.plc1.org', + 'plainname' : 'one', + 'site-format':'one%s', + 'person-format' : 'user1-%d@plc1.org', + 'key-format':'ssh-rsa 11key4plc11 user%d-key%d', + 'person-password' : 'password1', } -plc2={ 'plcname':'plc2 in federation', - 'hostname':'planetlab-devbox.inria.fr', - 'url-format':'https://%s:443/PLCAPI/', - 'builtin-admin-id':'root@plc2.org', - 'builtin-admin-password':'root', - 'peer-admin-name':'peer2@planet-lab.org', - 'peer-admin-password':'peer', - 'node-format':'n2%02d.plc2.org', - 'plainname' : 'two', - 'site-format':'two%s', - 'person-format' : 'user2-%d@plc2.org', - 'key-format':'ssh-rsa 22key4plc22 user%d-key%d', - 'person-password' : 'password2', +plc[2]={ 'plcname':'plc2 in federation', + 'hostname':'planetlab-devbox.inria.fr', + 'url-format':'https://%s:443/PLCAPI/', + 'builtin-admin-id':'root@plc2.org', + 'builtin-admin-password':'root', + 'peer-admin-name':'peer2@planet-lab.org', + 'peer-admin-password':'peer', + 'node-format':'n2-%03d.plc2.org', + 'plainname' : 'two', + 'site-format':'two%s', + 'person-format' : 'user2-%d@plc2.org', + 'key-format':'ssh-rsa 22key4plc22 user%d-key%d', + 'person-password' : 'password2', } #################### @@ -206,12 +244,6 @@ def key_name (i,n,k): def node_name (i,n): return plc[i]['node-format']%n -def map_on_site (n): - result=(n%number_sites) - if (result==0): - result=number_sites - return result - def slice_name (i,n): site_index=map_on_site(n) return "%s_slice%d"%(site_login_base(i,site_index),n) @@ -220,9 +252,24 @@ def sat_name (i): return 'sat_%d'%i # to have indexes start at 1 +def map_on (n,max): + result=(n%max) + if result==0: + result=max + return result + def myrange (n): return range (1,n+1,1) +def map_on_site (n): + return map_on (n,number_sites) + +def map_on_person (n): + return map_on (n,number_persons) + +def map_on_node (n): + return map_on (n,number_nodes) + def message (*args): print "====================", print args @@ -243,39 +290,41 @@ def timer_show (): #################### def test00_init (args=[1,2]): timer_start() - global plc,s,a,aa ## have you loaded this file already (support for reload) - if plc[1]: - pass - else: - plc=[None,plc1,plc2] - for i in args: - url=plc[i]['url-format']%plc[i]['hostname'] - plc[i]['url']=url - s[i]=xmlrpclib.ServerProxy(url,allow_none=True) - print 'initializing s[%d]'%i,url - aa[i]={'Username':plc[i]['builtin-admin-id'], - 'AuthMethod':'password', - 'AuthString':plc[i]['builtin-admin-password'], - 'Role':'admin'} - print 'initialized aa[%d]'%i, aa[i] - a[i]={'Username':plc[i]['peer-admin-name'], - 'AuthMethod':'password', - 'AuthString':plc[i]['peer-admin-password'], - 'Role':'admin'} - print 'initialized a[%d]'%i, a[i] + for i in args: + url=plc[i]['url-format']%plc[i]['hostname'] + plc[i]['url']=url + if local_peer is None: + # the regular remote mode + argv=[sys.argv[0], + # xxx todo - Shell.py still needs a non-empty config even if we define everything + '--config','dummy-config', + '--url',url, + '--user',plc[i]['builtin-admin-id'], + '--password',plc[i]['builtin-admin-password']] + print 'initializing s[%d]=>%s'%(i,url) + s[i]=Shell.Shell(argv) + s[i].init() + elif local_peer == i: + # local mode - use Shell's Direct mode - use /etc/planetlab/plc_config + s[i]=Shell.Shell([sys.argv[0]]) + s[i].init() + else: + # remote peer in local mode : use dummy shell instead + s[i]=DummyShell(i) + s[i].init() def test00_print (args=[1,2]): for i in args: - print 's[%d]'%i,s[i] - print 'aa[%d]'%i, aa[i] - print 'a[%d]'%i, a[i] + print '==================== s[%d]'%i + s[i].show_config() + print '====================' def check_nodes (el,ef,args=[1,2]): for i in args: # use a single request and sort afterwards for efficiency # could have used GetNodes's scope as well - all_nodes = s[i].GetNodes(a[i]) + all_nodes = s[i].GetNodes() n = len ([ x for x in all_nodes if x['peer_id'] is None]) f = len ([ x for x in all_nodes if x['peer_id'] is not None]) print '%02d: Checking nodes: got %d local (e=%d) & %d foreign (e=%d)'%(i,n,el,f,ef) @@ -286,7 +335,7 @@ def check_keys (el,ef,args=[1,2]): for i in args: # use a single request and sort afterwards for efficiency # could have used GetKeys's scope as well - all_keys = s[i].GetKeys(a[i]) + all_keys = s[i].GetKeys() n = len ([ x for x in all_keys if x['peer_id'] is None]) f = len ([ x for x in all_keys if x['peer_id'] is not None]) print '%02d: Checking keys: got %d local (e=%d) & %d foreign (e=%d)'%(i,n,el,f,ef) @@ -297,7 +346,7 @@ def check_persons (el,ef,args=[1,2]): for i in args: # use a single request and sort afterwards for efficiency # could have used GetPersons's scope as well - all_persons = s[i].GetPersons(a[i]) + all_persons = s[i].GetPersons() n = len ([ x for x in all_persons if x['peer_id'] is None]) f = len ([ x for x in all_persons if x['peer_id'] is not None]) print '%02d: Checking persons: got %d local (e=%d) & %d foreign (e=%d)'%(i,n,el,f,ef) @@ -307,15 +356,15 @@ def check_persons (el,ef,args=[1,2]): # expected : local slices, foreign slices def check_slices (els,efs,args=[1,2]): for i in args: - ls=len(s[i].GetSlices(a[i],{'peer_id':None})) - fs=len(s[i].GetSlices(a[i],{'~peer_id':None})) + ls=len(s[i].GetSlices({'peer_id':None})) + fs=len(s[i].GetSlices({'~peer_id':None})) print '%02d: Checking slices: got %d local (e=%d) & %d foreign (e=%d)'%(i,ls,els,fs,efs) assert els==ls assert efs==fs def show_nodes (i,node_ids): # same as above - all_nodes = s[i].GetNodes(a[i],node_ids) + all_nodes = s[i].GetNodes(node_ids) loc_nodes = filter (lambda n: n['peer_id'] is None, all_nodes) for_nodes = filter (lambda n: n['peer_id'] is not None, all_nodes) @@ -335,11 +384,11 @@ def check_slice_nodes_n (ns,expected_nodes, is_local_slice, args=[1,2]): peer=peer_index(i) if is_local_slice: sname=slice_name(i,ns) - slice=s[i].GetSlices(a[i],{'name':[sname],'peer_id':None})[0] + slice=s[i].GetSlices({'name':[sname],'peer_id':None})[0] message='local' else: sname=slice_name(peer,ns) - slice=s[i].GetSlices(a[i],{'name':[sname],'~peer_id':None})[0] + slice=s[i].GetSlices({'name':[sname],'~peer_id':None})[0] message='foreign' print '%02d: %s slice %s (e=%d) '%(i,message,sname,expected_nodes), slice_node_ids=slice['node_ids'] @@ -364,7 +413,7 @@ def check_conf_files (args=[1,2]): def check_conf_files_n (nn,args=[1,2]): for i in args: nodename=node_name(i,nn) - ndict= s[i].GetSlivers(a[i],[nodename])[0] + ndict= s[i].GetSlivers([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) @@ -388,7 +437,7 @@ def check_slivers_1 (esn,args=[1,2]): def check_slivers_n (nn,esn,args=[1,2]): for i in args: nodename=node_name(i,nn) - ndict= s[i].GetSlivers(a[i],[nodename])[0] + ndict= s[i].GetSlivers([nodename])[0] assert ndict['hostname'] == nodename slivers = ndict['slivers'] print '%02d: %d slivers (exp. %d) in GetSlivers for node %s'\ @@ -405,24 +454,24 @@ def test00_admin_person (args=[1,2]): for i in args: email = plc[i]['peer-admin-name'] try: - p=s[i].GetPersons(a[i],[email])[0] + p=s[i].GetPersons([email])[0] plc[i]['peer-admin-id']=p['person_id'] except: - person_id=s[i].AddPerson(aa[i],{'first_name':'Local', - 'last_name':'PeerPoint', - 'role_ids':[10], - 'email':email, - 'password':plc[i]['peer-admin-password']}) - print '%02d:== created peer admin account %d, %s - %s'%(i, - person_id,plc[i]['peer-admin-name'], - plc[i]['peer-admin-password']) + person_id=s[i].AddPerson({'first_name':'Local', + 'last_name':'PeerPoint', + 'role_ids':[10], + 'email':email, + 'password':plc[i]['peer-admin-password']}) + if person_id: + print '%02d:== created peer admin account %d, %s - %s'%( + i, person_id,plc[i]['peer-admin-name'],plc[i]['peer-admin-password']) plc[i]['peer-admin-id']=person_id def test00_admin_enable (args=[1,2]): for i in args: - s[i].AdmSetPersonEnabled(aa[i],plc[i]['peer-admin-id'],True) - 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']) + if s[i].AdmSetPersonEnabled(plc[i]['peer-admin-id'],True): + s[i].AddRoleToPerson('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 test00_peer_person (args=[1,2]): global plc @@ -430,12 +479,13 @@ def test00_peer_person (args=[1,2]): peer=peer_index(i) email=plc[peer]['peer-admin-name'] try: - p=s[i].GetPersons(a[i],[email])[0] + p=s[i].GetPersons([email])[0] plc[i]['peer_person_id']=p['person_id'] except: - person_id = s[i].AddPerson (a[i], {'first_name':'Peering(plain passwd)', 'last_name':plc_name(peer), 'role_ids':[3000], + person_id = s[i].AddPerson ( {'first_name':'Peering(plain passwd)', 'last_name':plc_name(peer), 'role_ids':[3000], 'email':email,'password':plc[peer]['peer-admin-password']}) - print '%02d:Created person %d as the peer person'%(i,person_id) + if person_id: + print '%02d:== Created person %d as the peer person'%(i,person_id) plc[i]['peer_person_id']=person_id #################### @@ -445,20 +495,27 @@ def test00_peer (args=[1,2]): peer=peer_index(i) peername = plc_name(peer) try: - p=s[i].GetPeers (a[i], [peername])[0] + p=s[i].GetPeers ( [peername])[0] plc[i]['peer_id']=p['peer_id'] except: - peer_id=s[i].AddPeer (a[i], {'peername':peername,'peer_url':plc[peer]['url'],'person_id':plc[i]['peer_person_id']}) + peer_id=s[i].AddPeer ( {'peername':peername,'peer_url':plc[peer]['url'],'person_id':plc[i]['peer_person_id']}) # NOTE : need to manually reset the encrypted password through SQL at this point - print '%02d:Created peer %d'%(i,peer_id) + if peer_id: + print '%02d:Created peer %d'%(i,peer_id) + print "PLEASE manually set password for person_id=%d in DB%d"%(plc[i]['peer_person_id'],i) plc[i]['peer_id']=peer_id - print "PLEASE manually set password for person_id=%d in DB%d"%(plc[i]['peer_person_id'],i) def test00_peer_passwd (args=[1,2]): - for i in args: - # using an ad-hoc local command for now - never could get quotes to reach sql.... - 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'])) + if local_peer is None: + for i in args: + # using an ad-hoc local command for now - never could get quotes to reach sql.... + print "Attempting to remotely 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 '-> system returns',retcod + else: + i=local_peer + print "Locally setting passwd for person_id=%d in DB%d"%(plc[i]['peer_person_id'],i), + retcod=os.system("./person-password.sh -l %d"%(plc[i]['peer_person_id'])) print '-> system returns',retcod # this one gets cached @@ -467,7 +524,7 @@ def get_peer_id (i): return plc[i]['peer_id'] except: peername = plc_name (peer_index(i)) - peer_id = s[i].GetPeers(a[i],[peername])[0]['peer_id'] + peer_id = s[i].GetPeers([peername])[0]['peer_id'] plc[i]['peer_id'] = peer_id return peer_id @@ -477,18 +534,20 @@ def test00_refresh (message,args=[1,2]): timer_show() for i in args: print '%02d:== Refreshing peer'%(i), - retcod=s[i].RefreshPeer(a[i],get_peer_id(i)) + retcod=s[i].RefreshPeer(get_peer_id(i)) keys=retcod.keys() keys.sort() print "Result: {", for key in keys: - if "time_" not in key: + if "time" not in key: print key,retcod[key], print "}" print "+++ ellapsed: {", + timers=retcod['timers'] + keys=timers.keys() + keys.sort() for key in keys: - if "time_" in key: - print key,retcod[key], + print key,timers[key], print "}" timer_show() @@ -505,24 +564,25 @@ def test01_site_n (ns,add_if_true,args=[1,2]): for i in args: login_base = site_login_base (i,ns) try: - site_id = s[i].GetSites(a[i],[login_base])[0]['site_id'] + site_id = s[i].GetSites([login_base])[0]['site_id'] if not add_if_true: - s[i].DeleteSite(a[i],site_id) - print "%02d:== deleted site_id %d"%(i,site_id) + if s[i].DeleteSite(site_id): + print "%02d:== deleted site_id %d"%(i,site_id) except: if add_if_true: sitename=site_name(i,ns) abbrev_name="abbr"+str(i) max_slices = number_slices - site_id=s[i].AddSite (a[i], {'name':plc_name(i), - 'abbreviated_name': abbrev_name, - 'login_base': login_base, - 'is_public': True, - 'url': 'http://%s.com/'%abbrev_name, - 'max_slices':max_slices}) + site_id=s[i].AddSite ( {'name':plc_name(i), + 'abbreviated_name': abbrev_name, + 'login_base': login_base, + 'is_public': True, + 'url': 'http://%s.com/'%abbrev_name, + 'max_slices':max_slices}) ### max_slices does not seem taken into account at that stage - s[i].UpdateSite(a[i],site_id,{'max_slices':max_slices}) - print '%02d:== Created site %d with max_slices=%d'%(i,site_id,max_slices) + if site_id: + s[i].UpdateSite(site_id,{'max_slices':max_slices}) + print '%02d:== Created site %d with max_slices=%d'%(i,site_id,max_slices) #################### def test02_person (args=[1,2]): @@ -534,43 +594,45 @@ def test02_del_person (args=[1,2]): test02_person_n (np,False,args) def test02_person_n (np,add_if_true,args=[1,2]): - test02_person_n_ks (np, myrange(number_keys),add_if_true,args) + test02_person_n_ks (np, myrange(number_keys_per_person),add_if_true,args) def test02_person_n_ks (np,nks,add_if_true,args=[1,2]): for i in args: email = person_name(i,np) try: - person_id=s[i].GetPersons(a[i],[email])[0]['person_id'] + person_id=s[i].GetPersons([email])[0]['person_id'] if not add_if_true: - s[i].DeletePerson(a[i],person_id) - print "%02d:== deleted person_id %d"%(i,person_id) + if s[i].DeletePerson(person_id): + print "%02d:== deleted person_id %d"%(i,person_id) except: if add_if_true: password = plc[i]['person-password'] - person_id=s[i].AddPerson(a[i],{'first_name':'Your average', + person_id=s[i].AddPerson({'first_name':'Your average', 'last_name':'User%d'%np, 'role_ids':[30], 'email':email, 'password': password }) - print '%02d:== created user account %d, %s - %s'%(i, person_id,email,password) - for nk in nks: - key=key_name(i,np,nk) - s[i].AddPersonKey(aa[i],email,{'key_type':'ssh', 'key':key}) - print '%02d:== added key %s to person %s'%(i,key,email) + if person_id: + print '%02d:== created user account %d, %s - %s'%(i, person_id,email,password) + for nk in nks: + key=key_name(i,np,nk) + s[i].AddPersonKey(email,{'key_type':'ssh', 'key':key}) + print '%02d:== added key %s to person %s'%(i,key,email) #################### # retrieves node_id from hostname - checks for local nodes only def get_local_node_id(i,nodename): - return s[i].GetNodes(a[i],{'hostname':nodename,'peer_id':None})[0]['node_id'] + return s[i].GetNodes({'hostname':nodename,'peer_id':None})[0]['node_id'] # clean all local nodes - foreign nodes are not supposed to be cleaned up manually def clean_all_nodes (args=[1,2]): for i in args: print '%02d:== Cleaning all nodes'%i - loc_nodes = s[i].GetNodes(a[i],{'peer_id':None}) - for node in loc_nodes: - print '%02d:==== Cleaning node %d'%(i,node['node_id']) - s[i].DeleteNode(a[i],node['node_id']) + local_nodes = s[i].GetNodes({'peer_id':None}) + if local_nodes: + for node in local_nodes: + print '%02d:==== Cleaning node %d'%(i,node['node_id']) + s[i].DeleteNode(node['node_id']) def test03_node (args=[1,2]): for nn in myrange(number_nodes): @@ -583,8 +645,9 @@ def test03_node_n (nn,args=[1,2]): get_local_node_id(i,nodename) except: login_base=site_login_base(i,map_on_site(nn)) - n=s[i].AddNode(a[i],login_base,{'hostname': nodename}) - print '%02d:== Added node %d %s'%(i,n,node_name(i,nn)) + n=s[i].AddNode(login_base,{'hostname': nodename}) + if n: + print '%02d:== Added node %d %s'%(i,n,node_name(i,nn)) def test02_delnode (args=[1,2]): for nn in myrange(number_nodes): @@ -594,18 +657,19 @@ def test02_delnode_n (nn,args=[1,2]): for i in args: nodename = node_name(i,nn) node_id = get_local_node_id (i,nodename) - retcod=s[i].DeleteNode(a[i],nodename) - print '%02d:== Deleted node %d, returns %s'%(i,node_id,retcod) + retcod=s[i].DeleteNode(nodename) + if retcod: + print '%02d:== Deleted node %d, returns %s'%(i,node_id,retcod) #################### def clean_all_slices (args=[1,2]): for i in args: print '%02d:== Cleaning all slices'%i - for slice in s[i].GetSlices(a[i],{'peer_id':None}): + for slice in s[i].GetSlices({'peer_id':None}): slice_id = slice['slice_id'] if slice_id not in system_slices_ids: - print '%02d:==== Cleaning slice %d'%(i,slice_id) - s[i].DeleteSlice(a[i],slice_id) + if s[i].DeleteSlice(slice_id): + print '%02d:==== Cleaned slice %d'%(i,slice_id) def test04_slice (args=[1,2]): for n in myrange(number_slices): @@ -618,20 +682,22 @@ def test04_slice_n (ns,args=[1,2]): slicename=slice_name(i,ns) max_nodes=number_nodes try: - s[i].GetSlices(a[i],[slicename])[0] + s[i].GetSlices([slicename])[0] except: - slice_id=s[i].AddSlice (a[i],{'name':slicename, - 'description':'slice %s on %s'%(slicename,plcname), - 'url':'http://planet-lab.org/%s'%slicename, - 'max_nodes':max_nodes, - 'instanciation':'plc-instantiated', - }) - print '%02d:== created slice %d - max nodes=%d'%(i,slice_id,max_nodes) - actual_persons_per_slice = min (number_persons,number_persons_per_slice) - for np in myrange(actual_persons_per_slice): - email = person_name (i,np) - retcod = s[i].AddPersonToSlice (a[i], email, slicename) - print '%02d:== Attached person %s to slice %s'%(i,email,slicename) + slice_id=s[i].AddSlice ({'name':slicename, + 'description':'slice %s on %s'%(slicename,plcname), + 'url':'http://planet-lab.org/%s'%slicename, + 'max_nodes':max_nodes, + 'instanciation':'plc-instantiated', + }) + if slice_id: + print '%02d:== created slice %d - max nodes=%d'%(i,slice_id,max_nodes) + actual_persons_per_slice = min (number_persons,number_persons_per_slice) + person_indexes=[map_on_person (p+ns) for p in range(actual_persons_per_slice)] + for np in person_indexes: + email = person_name (i,np) + retcod = s[i].AddPersonToSlice (email, slicename) + print '%02d:== Attached person %s to slice %s'%(i,email,slicename) def test04_node_slice (is_local, add_if_true, args=[1,2]): @@ -640,7 +706,8 @@ def test04_node_slice (is_local, add_if_true, args=[1,2]): def test04_node_slice_ns (ns,is_local, add_if_true, args=[1,2]): actual_nodes_per_slice = min (number_nodes,number_nodes_per_slice) - test04_node_slice_nl_n (myrange(actual_nodes_per_slice),ns,is_local, add_if_true, args) + node_indexes = [ map_on_node (n+ns) for n in range(actual_nodes_per_slice)] + test04_node_slice_nl_n (node_indexes,ns,is_local, add_if_true, args) def test04_node_slice_nl_n (nnl,ns,is_local, add_if_true, args=[1,2]): for i in args: @@ -654,13 +721,14 @@ def test04_node_slice_nl_n (nnl,ns,is_local, add_if_true, args=[1,2]): hostnames=[node_name(peer,nn) for nn in nnl] nodetype='foreign' if add_if_true: - s[i].AddSliceToNodes (a[i], sname,hostnames) + res=s[i].AddSliceToNodes (sname,hostnames) message="added" else: - s[i].DeleteSliceFromNodes (a[i], sname,hostnames) + res=s[i].DeleteSliceFromNodes (sname,hostnames) message="deleted" - print '%02d:== %s in slice %s %s '%(i,message,sname,nodetype), - print hostnames + if res: + print '%02d:== %s in slice %s %s '%(i,message,sname,nodetype), + print hostnames def test04_slice_add_lnode (args=[1,2]): test04_node_slice (True,True,args) @@ -679,15 +747,15 @@ def test05_sat (args=[1,2]): for i in args: name = sat_name(i) try: - sat_id=s[i].GetSliceAttributeTypes (a[i],[name])[0] + sat_id=s[i].GetSliceAttributeTypes ([name])[0] except: description="custom sat on plc%d"%i min_role_id=10 - sat_id=s[i].AddSliceAttributeType (a[i], - { 'name':name, + sat_id=s[i].AddSliceAttributeType ({ 'name':name, 'description': description, 'min_role_id' : min_role_id}) - print '%02d:== created SliceAttributeType = %d'%(i,sat_id) + if sat_id: + print '%02d:== created SliceAttributeType = %d'%(i,sat_id) # for test, we create 4 slice_attributes # on slice1 - sat=custom_made (see above) - all nodes @@ -696,23 +764,22 @@ def test05_sat (args=[1,2]): # on slice1 - sat='net_max' - node=n1 def test05_sa_atom (slice_name,sat_name,value,node,i): - sa_id=s[i].GetSliceAttributes(a[i],{'name':sat_name, - 'value':value}) + sa_id=s[i].GetSliceAttributes({'name':sat_name, + 'value':value}) if not sa_id: if node: - sa_id=s[i].AddSliceAttribute(a[i], - slice_name, + sa_id=s[i].AddSliceAttribute(slice_name, sat_name, value, node) else: print 'slice_name',slice_name,'sat_name',sat_name - sa_id=s[i].AddSliceAttribute(a[i], - slice_name, + sa_id=s[i].AddSliceAttribute(slice_name, sat_name, value) - print '%02d:== created SliceAttribute = %d'%(i,sa_id), - print 'On slice',slice_name,'and node',node + if sa_id: + print '%02d:== created SliceAttribute = %d'%(i,sa_id), + print 'On slice',slice_name,'and node',node def test05_sa (args=[1,2]): for i in args: @@ -768,21 +835,21 @@ def dump (args=[1,2]): for i in args: print '%02d:============================== DUMPING'%i print '%02d: SITES'%i - [p_site(x) for x in s[i].GetSites(a[i])] + [p_site(x) for x in s[i].GetSites()] print '%02d: KEYS'%i - [p_key(x) for x in s[i].GetKeys(a[i])] + [p_key(x) for x in s[i].GetKeys()] print '%02d: PERSONS'%i - [p_person(x) for x in s[i].GetPersons(a[i])] + [p_person(x) for x in s[i].GetPersons()] print '%02d: NODES'%i - [p_node(x) for x in s[i].GetNodes(a[i])] + [p_node(x) for x in s[i].GetNodes()] print '%02d: SLICES'%i - [p_slice(x) for x in s[i].GetSlices(a[i])] + [p_slice(x) for x in s[i].GetSlices()] print '%02d: Slice Attribute Types'%i - [p_sat(x) for x in s[i].GetSliceAttributeTypes(a[i])] + [p_sat(x) for x in s[i].GetSliceAttributeTypes()] print '%02d: Slice Attributes'%i - [p_sa(x) for x in s[i].GetSliceAttributes(a[i])] + [p_sa(x) for x in s[i].GetSliceAttributes()] print '%02d: SLIVERS'%i - [p_sliver('%02d:'%i,x) for x in s[i].GetSlivers(a[i])] + [p_sliver('%02d:'%i,x) for x in s[i].GetSlivers()] print '%02d:============================== END DUMP'%i @@ -864,10 +931,10 @@ def test_all_persons (): message ("1 extra del/add cycle for unique indexes") test02_del_person([2]) test02_person([2]) - check_keys(number_persons*number_keys,0) + check_keys(number_persons*number_keys_per_person,0) check_persons(system_persons+number_persons,system_persons_cross) test00_refresh ('after persons&keys creation') - check_keys(number_persons*number_keys,number_persons*number_keys) + check_keys(number_persons*number_keys_per_person,number_persons*number_keys_per_person) check_persons(system_persons+number_persons,system_persons_cross+number_persons) def test_all_nodes (): @@ -927,26 +994,26 @@ def test_all_addslices (): message ("ADDING LOCAL NODES IN SLICES") test04_slice_add_lnode ([1]) # of course the change is only local - check_local_slice_nodes (number_nodes,[1]) + check_local_slice_nodes (number_nodes_per_slice,[1]) check_foreign_slice_nodes(0,[2]) # refreshing test00_refresh ("After local nodes were added on plc1") - check_local_slice_nodes (number_nodes,[1]) - check_foreign_slice_nodes (number_nodes,[2]) + check_local_slice_nodes (number_nodes_per_slice,[1]) + check_foreign_slice_nodes (number_nodes_per_slice,[2]) # now we add foreign nodes into local slice message ("ADDING FOREIGN NODES IN SLICES") test04_slice_add_fnode ([1]) - check_local_slice_nodes (2*number_nodes,[1]) - check_foreign_slice_nodes (number_nodes,[2]) + check_local_slice_nodes (2*number_nodes_per_slice,[1]) + check_foreign_slice_nodes (number_nodes_per_slice,[2]) # refreshing test00_refresh ("After foreign nodes were added in plc1") # remember that foreign slices only know about LOCAL nodes # so this does not do anything - check_local_slice_nodes (2*number_nodes,[1]) - check_foreign_slice_nodes (2*number_nodes,[2]) + check_local_slice_nodes (2*number_nodes_per_slice,[1]) + check_foreign_slice_nodes (2*number_nodes_per_slice,[2]) check_slivers_1(total_slivers()) @@ -954,19 +1021,19 @@ def test_all_delslices (): message ("DELETING FOREIGN NODES FROM SLICES") test04_slice_del_fnode([1]) - check_local_slice_nodes (number_nodes,[1]) - check_foreign_slice_nodes (2*number_nodes,[2]) + check_local_slice_nodes (number_nodes_per_slice,[1]) + check_foreign_slice_nodes (2*number_nodes_per_slice,[2]) # mmh? check_slivers_1(total_slivers(),[1]) test00_refresh ("After foreign nodes were removed on plc1") - check_local_slice_nodes (number_nodes,[1]) - check_foreign_slice_nodes (number_nodes,[2]) + check_local_slice_nodes (number_nodes_per_slice,[1]) + check_foreign_slice_nodes (number_nodes_per_slice,[2]) message ("DELETING LOCAL NODES FROM SLICES") test04_slice_del_lnode([1]) check_local_slice_nodes (0,[1]) - check_foreign_slice_nodes (number_nodes,[2]) + check_foreign_slice_nodes (number_nodes_per_slice,[2]) test00_refresh ("After local nodes were removed on plc1") check_local_slice_nodes (0,[1]) @@ -1024,6 +1091,7 @@ def populate (): timer_show() test05_sa([1]) timer_show() + message("END") def populate_end(): test00_init() @@ -1053,15 +1121,16 @@ def usage (): print " -p runs populate instead of test_all" print " -e runs populate_end of test_all" print " -m run in mini mode (1 instance of each class)" - print " -b performs big run (%d times as large as normal)"%big_factor - print " -H performs huge run (%d times as large as normal)"%huge_factor + print " -b performs big run" + print " -H performs huge run" + print " -f n : increases normal sizes by " print " -l n : tester runs locally for peer , rather than through xmlrpc" sys.exit(1) def main (): try: - (o,a) = getopt.getopt(sys.argv[1:], "emnpbHl:") + (o,a) = getopt.getopt(sys.argv[1:], "emnpbHf:l:") except: usage() func = test_all @@ -1081,12 +1150,13 @@ def main (): big() elif opt=='-H': huge() + elif opt=='-f': + factor=int(val) + apply_factor(factor) elif opt=='-l': - if val in (1,2): - local_peer=val - print '-l option not implemented yet' - # need to figure a way to use Shell.py-like calling paradigm - else: + global local_peer + local_peer=int(val) + if local_peer not in (1,2): usage() else: usage() diff --git a/peers-test.mk b/peers-test.mk index a2cbaaaa..d728ada6 100644 --- a/peers-test.mk +++ b/peers-test.mk @@ -11,10 +11,13 @@ PLC2=planetlab-devbox.inria.fr PLC1SSH=root@$(PLC1) PLC2SSH=root@$(PLC2) +PY=python -u + all:help #################### PUSH=pclean pplc2 papi2 pplc1 papi1 +EXTRA-PUSHS= ./Shell.py ./TestPeers.py ./planetlab4.sql ./dummy-config ./peers-test.mk ./person-password.sh push:$(PUSH) @@ -26,11 +29,11 @@ pclean: papi1: rsync -a -v -C ./ root@$(PLC1):new_plc_api/ pplc1: - rsync -a -v -C ./planetlab4.sql ./PLC root@$(PLC1):$(CHROOT)$(APIDIR)/ + rsync -a -v -C $(EXTRA-PUSHS) ./PLC root@$(PLC1):$(CHROOT)$(APIDIR)/ papi2: rsync -a -v -C ./ root@$(PLC2):new_plc_api/ pplc2: - rsync -a -v -C ./planetlab4.sql ./PLC root@$(PLC2):$(CHROOT)$(APIDIR)/ + rsync -a -v -C $(EXTRA-PUSHS) ./PLC root@$(PLC2):$(CHROOT)$(APIDIR)/ #################### DB=install-schema stop-clients db-drop restart-full-db @@ -132,18 +135,17 @@ log: # remove time/delay dependent output normalize = egrep -v "'expires':|^+++.*ellapsed" -TEST=run checkpoint diff -run: run-n normalize -normalize: TestPeers-n.nout TestPeers-n.nref +TEST=run diff checkpoint +run: run-n %.nout: %.out $(normalize) $*.out > $@ %.nref: %.ref $(normalize) $*.ref > $@ -diff: normalize +diff: TestPeers-n.nref TestPeers-n.nout @echo '<< REF OUT>>' - diff TestPeers-n.ref TestPeers-n.out + diff TestPeers-n.nref TestPeers-n.nout ckp checkpoint: @echo adopting latest run as reference @@ -155,31 +157,31 @@ VARIANT-TESTS := VARIANT-TESTS += run-n run-n: - python -u ./TestPeers.py > TestPeers-n.out 2>&1 + $(PY) ./TestPeers.py > TestPeers-n.out 2>&1 VARIANT-TESTS += run-m run-m: - python -u ./TestPeers.py -m > TestPeers-m.out 2>&1 + $(PY) ./TestPeers.py -m > TestPeers-m.out 2>&1 VARIANT-TESTS += run-b run-b: - python -u ./TestPeers.py -b > TestPeers-b.out 2>&1 + $(PY) ./TestPeers.py -b > TestPeers-b.out 2>&1 VARIANT-TESTS += run-p run-pn -run-p run-pn: - python -u ./TestPeers.py -p > TestPeers-p.out 2>&1 +run-pn: + $(PY) ./TestPeers.py -p > TestPeers-pn.out 2>&1 VARIANT-TESTS += run-pb run-pb: - python -u ./TestPeers.py -p -b > TestPeers-pb.out 2>&1 + $(PY) ./TestPeers.py -p -b > TestPeers-pb.out 2>&1 VARIANT-TESTS += run-ph run-ph: - python -u ./TestPeers.py -p -H > TestPeers-ph.out 2>&1 + $(PY) ./TestPeers.py -p -H > TestPeers-ph.out 2>&1 VARIANT-TESTS += run-e run-en -run-e run-en: - python -u ./TestPeers.py -e > TestPeers-e.out 2>&1 +run-en: + $(PY) ./TestPeers.py -e > TestPeers-en.out 2>&1 VARIANT-TESTS += run-eb run-eb: - python -u ./TestPeers.py -e -b > TestPeers-eb.out 2>&1 + $(PY) ./TestPeers.py -e -b > TestPeers-eb.out 2>&1 VARIANT-TESTS += run-eh run-eh: - python -u ./TestPeers.py -e -H > TestPeers-eh.out 2>&1 + $(PY) ./TestPeers.py -e -H > TestPeers-eh.out 2>&1 VARIANT-TESTS += diff-m diff-m: TestPeers-m.nref TestPeers-m.nout @@ -190,12 +192,54 @@ ckp-m: rm -f TestPeers-m.n??? VARIANT-TESTS += diff-p -diff-p: TestPeers-p.nref TestPeers-p.nout - diff TestPeers-p.nref TestPeers-p.nout +diff-p: TestPeers-pn.nref TestPeers-pn.nout + diff TestPeers-pn.nref TestPeers-pn.nout VARIANT-TESTS += ckp-p ckp-p: - cp TestPeers-p.out TestPeers-p.ref - rm -f TestPeers-p.n??? + cp TestPeers-pn.out TestPeers-pn.ref + rm -f TestPeers-pn.n??? + +VARIANT-TESTS += diff-eh +diff-eh: TestPeers-eh.nref TestPeers-eh.nout + diff TestPeers-eh.nref TestPeers-eh.nout +VARIANT-TESTS += ckp-eh +ckp-eh: + cp TestPeers-eh.out TestPeers-eh.ref + rm -f TestPeers-eh.n??? + +### need to run in installed plc for gaining direct access (psycopg2 broken) +VARIANT-TESTS += run-lpn-1 +run-lpn-1: + chroot $(CHROOT) make -C $(APIDIR) -f peers-test.mk chroot-run-lpn-1 +chroot-run-lpn-1: + $(PY) TestPeers.py -n -p -l 1 -f 8 > TestPeers-pn-1.out +VARIANT-TESTS += run-lpn-2 +run-lpn-2: + chroot $(CHROOT) make -C $(APIDIR) -f peers-test.mk chroot-run-lpn-2 +chroot-run-lpn-2: + $(PY) TestPeers.py -n -p -l 2 -f 8 > TestPeers-pn-2.out + +VARIANT-TESTS += run-lpb-1 +run-lpb-1: + chroot $(CHROOT) make -C $(APIDIR) -f peers-test.mk chroot-run-lpb-1 +chroot-run-lpb-1: + $(PY) TestPeers.py -b -p -l 1 > TestPeers-pb-1.out +VARIANT-TESTS += run-lpb-2 +run-lpb-2: + chroot $(CHROOT) make -C $(APIDIR) -f peers-test.mk chroot-run-lpb-2 +chroot-run-lpb-2: + $(PY) TestPeers.py -b -p -l 2 > TestPeers-pb-2.out + +VARIANT-TESTS += run-lph-1 +run-lph-1: + chroot $(CHROOT) make -C $(APIDIR) -f peers-test.mk chroot-run-lph-1 +chroot-run-lph-1: + $(PY) TestPeers.py -H -p -l 1 > TestPeers-ph-1.out +VARIANT-TESTS += run-lph-1 +run-lph-2: + chroot $(CHROOT) make -C $(APIDIR) -f peers-test.mk chroot-run-lph-2 +chroot-run-lph-2: + $(PY) TestPeers.py -H -p -l 2 > TestPeers-ph-2.out VARIANTS-DB := @@ -203,57 +247,61 @@ VARIANTS-DB := DB1=populate-1.sql DB2=populate-2.sql -SAVE=save1 save2 -VARIANT-DB += save -save: $(SAVE) - VARIANT-DB += save-n -save-n: DB1=populate-n-1.sql -save-n: DB2=populate-n-2.sql -save-n:save +save-n: save-n-1 save-n-2 +save-n-1: DB1=populate-n-1.sql +save-n-1: save1 +save-n-2: DB2=populate-n-2.sql +save-n-2:save2 VARIANT-DB += save-b -save-b: DB1=populate-b-1.sql -save-b: DB2=populate-b-2.sql -save-b:save +save-b: save-b-1 save-b-2 +save-b-1: DB1=populate-b-1.sql +save-b-1: save1 +save-b-2: DB2=populate-b-2.sql +save-b-2:save2 VARIANT-DB += save-h -save-h: DB1=populate-h-1.sql -save-h: DB2=populate-h-2.sql -save-h:save +save-h: save-h-1 save-h-2 +save-h-1: DB1=populate-h-1.sql +save-h-1: save1 +save-h-2: DB2=populate-h-2.sql +save-h-2:save2 save1: - ssh $(PLC1SSH) "make -C new_plc_api -f peers-test.mk DBDUMP=$(DB1) db-dump" + ssh $(PLC1SSH) make -C new_plc_api -f peers-test.mk DBDUMP=$(DB1) db-dump scp $(PLC1SSH):new_plc_api/$(DB1) . save2: - ssh $(PLC2SSH) "make -C new_plc_api -f peers-test.mk DBDUMP=$(DB2) db-dump" + ssh $(PLC2SSH) make -C new_plc_api -f peers-test.mk DBDUMP=$(DB2) db-dump scp $(PLC2SSH):new_plc_api/$(DB2) . -RESTORE=restore1 restore2 -VARIANT-DB += restore -restore:$(RESTORE) - VARIANT-DB += restore-n -restore-n: DB1=populate-n-1.sql -restore-n: DB2=populate-n-2.sql -restore-n:restore +restore-n: restore-n-1 restore-n-2 +restore-n-1: DB1=populate-n-1.sql +restore-n-1: restore1 +restore-n-2: DB2=populate-n-2.sql +restore-n-2:restore2 VARIANT-DB += restore-b -restore-b: DB1=populate-b-1.sql -restore-b: DB2=populate-b-2.sql -restore-b:restore +restore-b: restore-b-1 restore-b-2 +restore-b-1: DB1=populate-b-1.sql +restore-b-1: restore1 +restore-b-2: DB2=populate-b-2.sql +restore-b-2:restore2 VARIANT-DB += restore-h -restore-h: DB1=populate-h-1.sql -restore-h: DB2=populate-h-2.sql -restore-h:restore +restore-h: restore-h-1 restore-h-2 +restore-h-1: DB1=populate-h-1.sql +restore-h-1: restore1 +restore-h-2: DB2=populate-h-2.sql +restore-h-2:restore2 restore1: scp $(DB1) $(PLC1SSH):new_plc_api/ - ssh $(PLC1SSH) "make -C new_plc_api -f peers-test.mk DBDUMP=$(DB1) dbi" + ssh $(PLC1SSH) make -C new_plc_api -f peers-test.mk DBDUMP=$(DB1) dbi restore2: scp $(DB2) $(PLC2SSH):new_plc_api/ - ssh $(PLC2SSH) "make -C new_plc_api -f peers-test.mk DBDUMP=$(DB2) dbi" + ssh $(PLC2SSH) make -C new_plc_api -f peers-test.mk DBDUMP=$(DB2) dbi ####### HELP=rpm db-dump restart-http @@ -268,8 +316,6 @@ help: @echo upgrade: $(UPGRADE) @echo test: $(TEST) @echo other test targets: $(VARIANT-TESTS) - @echo save:$(SAVE) - @echo restore:$(RESTORE) @echo db targets: $(VARIANT-DB) @echo OTHERS: $(HELP)