From: Thierry Parmentelat Date: Thu, 30 Nov 2006 10:23:25 +0000 (+0000) Subject: new naming scheme for outputs and reference outputs X-Git-Tag: pycurl-7_13_1~223 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=280e52dca20050546412c9e5fb0439df29f2797d;p=plcapi.git new naming scheme for outputs and reference outputs --- diff --git a/TestPeers-m.ref b/TestPeers-m.ref new file mode 100644 index 0000000..27e1a61 --- /dev/null +++ b/TestPeers-m.ref @@ -0,0 +1,404 @@ +1 keys, 1 sites, 1 persons, 1 nodes, 1 slices & 1 nodes/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'} +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 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 + -> system returns 0 +Attempting to set passwd for person_id=4 in DB2UPDATE 1 + -> system returns 0 ++++ 12.84 seconds ellapsed (12.84) +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) +=== 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) +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) +02: Checking persons: got 4 local (e=4) & 1 foreign (e=1) +==================== ('Creating persons&keys',) +01:== created user account 6, user1-1@plc1.org - password1 +01:== added key ssh-rsa 11key4plc11 user1-key1 to person user1-1@plc1.org +02:== created user account 6, user2-1@plc2.org - password2 +02:== added key ssh-rsa 22key4plc22 user1-key1 to person user2-1@plc2.org +01: Checking keys: got 1 local (e=1) & 0 foreign (e=0) +02: Checking keys: got 1 local (e=1) & 0 foreign (e=0) +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) +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) +==================== ('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) +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: 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) +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) +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 +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) +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) +==================== ('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:== Cleaning all slices +01:==== Cleaning slice 3 +02:== Cleaning all slices +02:==== Cleaning 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) +==================== ('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) +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: local slice oneone_slice1 (e=1) on nodes [4] +[LOC:1] : n101.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) +01: local slice oneone_slice1 (e=1) on nodes [4] +[LOC:1] : n101.plc1.org +02: foreign slice oneone_slice1 (e=1) on nodes [2] +[FOR:1] : n101.plc1.org +==================== ('ADDING FOREIGN NODES IN SLICES',) +01:== added in slice oneone_slice1 foreign ['n201.plc2.org'] +01: local slice oneone_slice1 (e=2) on nodes [4, 3] +[LOC:1] : n101.plc1.org +[FOR:1] : n201.plc2.org +02: foreign slice oneone_slice1 (e=1) on nodes [2] +[FOR:1] : n101.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) +01: local slice oneone_slice1 (e=2) on nodes [4, 3] +[LOC:1] : n101.plc1.org +[FOR:1] : n201.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 +>>slivername = oneone_slice1 +{ 'attributes': [], + 'expires': 1166088952, + '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 +>>slivername = oneone_slice1 +{ 'attributes': [], + 'expires': 1166088952, + '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: local slice oneone_slice1 (e=1) on nodes [4] +[LOC:1] : n101.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 +>>slivername = oneone_slice1 +{ 'attributes': [], + 'expires': 1166088952, + '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) +01: local slice oneone_slice1 (e=1) on nodes [4] +[LOC:1] : n101.plc1.org +02: foreign slice oneone_slice1 (e=1) on nodes [2] +[FOR:1] : n101.plc1.org +==================== ('DELETING LOCAL NODES FROM SLICES',) +01:== deleted in slice oneone_slice1 local ['n101.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 +=== 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) +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: 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) +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 +=== 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) +01:============================== DUMPING +01: SITES +1 None pl Thierry plc1 Central [] +2 None oneone plc1 in federation [1, 4] +3 1 twoone plc2 in federation [2, 3] +01: KEYS +1 None ssh-rsa 11key4plc11 user1-key1 +2 1 ssh-rsa 22key4plc22 user1-key1 +01: PERSONS +1 None maint@localhost.localdomain keys: [] sites: [] +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] +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 +01: SLICES +1 None pl_conf nodes= [] persons= [] +--- sas= [1, 2, 3] pl_conf crp= 1 +--- 'expires': 1166088823 +2 None pl_conf_vserverslice nodes= [] persons= [] +--- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 +--- 'expires': 1166088823 +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) +3 None enabled 10 Slice enabled (1 or unset) or suspended (0) +4 None vref 30 Reference image +5 None initscript 10 Slice initialization script +6 None cpu_min 10 Minimum CPU share (ms/s) +7 None cpu_share 10 Number of CPU shares +8 None net_min 10 Minimum bandwidth (bps) +9 None net_max 10 Maximum bandwidth (bps) +10 None net_avg 10 Average bandwidth (bps) +11 None net_share 10 Number of bandwidth shares +12 None net2_min 10 Minimum bandwidth over routes exempt from node bandwidth limits (bps) +13 None net2_max 10 Maximum bandwidth over routes exempt from node bandwidth limits (bps) +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 +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 +--- v= VServerSlice sl= 1 n= None +3 None plc_ticket_pubkey AT_id: 19 +--- v= MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIUaG0IE/V4tHb2XeAdV37JvAS +h3YmxVpFFAYbjI3i2rcNFYGbjRxaBxQbLMVVI1vNCcgqVZTxDcHJKWRGJHwD6LTK +s57VXANFQNMnFVmp6DiA/5xnf40UYpyvzmw90AY4I3IURgeoEMXKdBsAfccGv+fw +AHiU1HxVVV3ClJZlkwIDAQAB +sl= 1 n= None +4 None disk_max AT_id: 16 +--- v= 5000000 sl= 2 n= None +5 None cpu_share AT_id: 7 +--- v= 32 sl= 2 n= None +6 None plc_slice_type AT_id: 17 +--- v= VServerSlice sl= 2 n= None +01: SLIVERS +01: SLIVERS for : hostname n201.plc2.org +01: 31 config files +01: SLIVERS for : hostname n101.plc1.org +01: 31 config files +01:============================== END DUMP +02:============================== DUMPING +02: SITES +1 None pl Thierry plc2 on devbox Central [] +2 None twoone plc2 in federation [1, 3, 4] +3 1 oneone plc1 in federation [2] +02: KEYS +1 None ssh-rsa 22key4plc22 user1-key1 +2 1 ssh-rsa 11key4plc11 user1-key1 +02: PERSONS +1 None maint@localhost.localdomain keys: [] sites: [] +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] +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 +02: SLICES +1 None pl_conf nodes= [] persons= [] +--- sas= [1, 2, 3] pl_conf crp= 1 +--- 'expires': 1166088824 +2 None pl_conf_vserverslice nodes= [] persons= [] +--- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 +--- 'expires': 1166088824 +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) +3 None enabled 10 Slice enabled (1 or unset) or suspended (0) +4 None vref 30 Reference image +5 None initscript 10 Slice initialization script +6 None cpu_min 10 Minimum CPU share (ms/s) +7 None cpu_share 10 Number of CPU shares +8 None net_min 10 Minimum bandwidth (bps) +9 None net_max 10 Maximum bandwidth (bps) +10 None net_avg 10 Average bandwidth (bps) +11 None net_share 10 Number of bandwidth shares +12 None net2_min 10 Minimum bandwidth over routes exempt from node bandwidth limits (bps) +13 None net2_max 10 Maximum bandwidth over routes exempt from node bandwidth limits (bps) +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 +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 +--- v= VServerSlice sl= 1 n= None +3 None plc_ticket_pubkey AT_id: 19 +--- v= MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzNBijHgrh8Md4VsdyvB2JscUz +T9eiCmZ+nWFPq7WgH8BVHYg7ltu5cuUU6R2KkjvwPSlK6NASdZaowlqp2TjHJodA +myoh6CQQwuyzb+EWxfkBq3cv3uYWnpR2rJBtHtgQbmSDT6cxyZz8KVXcYTztfxTh +hfcSi5YPSiWRE7xh1wIDAQAB +sl= 1 n= None +4 None disk_max AT_id: 16 +--- v= 5000000 sl= 2 n= None +5 None cpu_share AT_id: 7 +--- v= 32 sl= 2 n= None +6 None plc_slice_type AT_id: 17 +--- v= VServerSlice sl= 2 n= None +02: SLIVERS +02: SLIVERS for : hostname n101.plc1.org +02: 31 config files +02: SLIVERS for : hostname n201.plc2.org +02: 31 config files +02:============================== END DUMP ++++ 144.41 seconds ellapsed (8.78) +==================== ('END',) ++++ 144.41 seconds ellapsed (0.00) diff --git a/TestPeers.ref b/TestPeers-n.ref similarity index 77% rename from TestPeers.ref rename to TestPeers-n.ref index 5d614be..67fabac 100644 --- a/TestPeers.ref +++ b/TestPeers-n.ref @@ -1,4 +1,4 @@ -4 sites, 2 keys, 4 persons, 5 nodes & 4 slices +2 keys, 4 sites, 4 persons, 5 nodes, 4 slices & 5 nodes/slice fast_flag False ==================== ('INIT',) +++ timer start initializing s[1] https://lurch.cs.princeton.edu:443/PLCAPI/ @@ -27,7 +27,7 @@ Attempting to set passwd for person_id=4 in DB1UPDATE 1 -> system returns 0 Attempting to set passwd for person_id=4 in DB2UPDATE 1 -> system returns 0 -+++ 12.99 seconds ellapsed (12.99) ++++ 13.02 seconds ellapsed (13.02) 01:== Created site 2 with max_slices=4 02:== Created site 2 with max_slices=4 01:== Created site 3 with max_slices=4 @@ -37,88 +37,88 @@ 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.68 seconds ellapsed (11.68) ++++ 25.09 seconds ellapsed (12.07) 01:== Refreshing peer got {'new_keys': 0, 'new_sites': 4, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 1, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 27.15 seconds ellapsed (2.47) ++++ 27.42 seconds ellapsed (2.32) 02:== Refreshing peer got {'new_keys': 0, 'new_sites': 4, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 1, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 28.86 seconds ellapsed (1.71) -+++ 28.86 seconds ellapsed (0.00) ++++ 29.11 seconds ellapsed (1.70) ++++ 29.11 seconds ellapsed (0.00) === refresh before persons&keys creation -+++ 32.60 seconds ellapsed (3.75) ++++ 32.92 seconds ellapsed (3.81) 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} -+++ 34.89 seconds ellapsed (2.29) ++++ 35.21 seconds ellapsed (2.29) 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} -+++ 36.52 seconds ellapsed (1.63) ++++ 36.85 seconds ellapsed (1.64) 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) 02: Checking persons: got 4 local (e=4) & 1 foreign (e=1) ==================== ('Creating persons&keys',) 01:== created user account 6, user1-1@plc1.org - password1 -01:== added key ssh-rsa 1111111111111111 user1-key1 to person user1-1@plc1.org -01:== added key ssh-rsa 1111111111111111 user1-key2 to person user1-1@plc1.org +01:== added key ssh-rsa 11key4plc11 user1-key1 to person user1-1@plc1.org +01:== added key ssh-rsa 11key4plc11 user1-key2 to person user1-1@plc1.org 02:== created user account 6, user2-1@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user1-key1 to person user2-1@plc2.org -02:== added key ssh-rsa 2222222222222222 user1-key2 to person user2-1@plc2.org +02:== added key ssh-rsa 22key4plc22 user1-key1 to person user2-1@plc2.org +02:== added key ssh-rsa 22key4plc22 user1-key2 to person user2-1@plc2.org 01:== created user account 7, user1-2@plc1.org - password1 -01:== added key ssh-rsa 1111111111111111 user2-key1 to person user1-2@plc1.org -01:== added key ssh-rsa 1111111111111111 user2-key2 to person user1-2@plc1.org +01:== added key ssh-rsa 11key4plc11 user2-key1 to person user1-2@plc1.org +01:== added key ssh-rsa 11key4plc11 user2-key2 to person user1-2@plc1.org 02:== created user account 7, user2-2@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user2-key1 to person user2-2@plc2.org -02:== added key ssh-rsa 2222222222222222 user2-key2 to person user2-2@plc2.org +02:== added key ssh-rsa 22key4plc22 user2-key1 to person user2-2@plc2.org +02:== added key ssh-rsa 22key4plc22 user2-key2 to person user2-2@plc2.org 01:== created user account 8, user1-3@plc1.org - password1 -01:== added key ssh-rsa 1111111111111111 user3-key1 to person user1-3@plc1.org -01:== added key ssh-rsa 1111111111111111 user3-key2 to person user1-3@plc1.org +01:== added key ssh-rsa 11key4plc11 user3-key1 to person user1-3@plc1.org +01:== added key ssh-rsa 11key4plc11 user3-key2 to person user1-3@plc1.org 02:== created user account 8, user2-3@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user3-key1 to person user2-3@plc2.org -02:== added key ssh-rsa 2222222222222222 user3-key2 to person user2-3@plc2.org +02:== added key ssh-rsa 22key4plc22 user3-key1 to person user2-3@plc2.org +02:== added key ssh-rsa 22key4plc22 user3-key2 to person user2-3@plc2.org 01:== created user account 9, user1-4@plc1.org - password1 -01:== added key ssh-rsa 1111111111111111 user4-key1 to person user1-4@plc1.org -01:== added key ssh-rsa 1111111111111111 user4-key2 to person user1-4@plc1.org +01:== added key ssh-rsa 11key4plc11 user4-key1 to person user1-4@plc1.org +01:== added key ssh-rsa 11key4plc11 user4-key2 to person user1-4@plc1.org 02:== created user account 9, user2-4@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user4-key1 to person user2-4@plc2.org -02:== added key ssh-rsa 2222222222222222 user4-key2 to person user2-4@plc2.org +02:== added key ssh-rsa 22key4plc22 user4-key1 to person user2-4@plc2.org +02:== added key ssh-rsa 22key4plc22 user4-key2 to person user2-4@plc2.org ==================== ('1 extra del/add cycle for unique indexes',) 02:== deleted person_id 6 02:== deleted person_id 7 02:== deleted person_id 8 02:== deleted person_id 9 02:== created user account 10, user2-1@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user1-key1 to person user2-1@plc2.org -02:== added key ssh-rsa 2222222222222222 user1-key2 to person user2-1@plc2.org +02:== added key ssh-rsa 22key4plc22 user1-key1 to person user2-1@plc2.org +02:== added key ssh-rsa 22key4plc22 user1-key2 to person user2-1@plc2.org 02:== created user account 11, user2-2@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user2-key1 to person user2-2@plc2.org -02:== added key ssh-rsa 2222222222222222 user2-key2 to person user2-2@plc2.org +02:== added key ssh-rsa 22key4plc22 user2-key1 to person user2-2@plc2.org +02:== added key ssh-rsa 22key4plc22 user2-key2 to person user2-2@plc2.org 02:== created user account 12, user2-3@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user3-key1 to person user2-3@plc2.org -02:== added key ssh-rsa 2222222222222222 user3-key2 to person user2-3@plc2.org +02:== added key ssh-rsa 22key4plc22 user3-key1 to person user2-3@plc2.org +02:== added key ssh-rsa 22key4plc22 user3-key2 to person user2-3@plc2.org 02:== created user account 13, user2-4@plc2.org - password2 -02:== added key ssh-rsa 2222222222222222 user4-key1 to person user2-4@plc2.org -02:== added key ssh-rsa 2222222222222222 user4-key2 to person user2-4@plc2.org +02:== added key ssh-rsa 22key4plc22 user4-key1 to person user2-4@plc2.org +02:== added key ssh-rsa 22key4plc22 user4-key2 to person user2-4@plc2.org 01: Checking keys: got 8 local (e=8) & 0 foreign (e=0) 02: Checking keys: got 8 local (e=8) & 0 foreign (e=0) 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.25 seconds ellapsed (22.74) ++++ 59.63 seconds ellapsed (22.77) 01:== Refreshing peer got {'new_keys': 8, 'new_sites': 0, 'plcname': 'Thierry plc1', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 4, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 61.75 seconds ellapsed (2.50) ++++ 62.23 seconds ellapsed (2.60) 02:== Refreshing peer got {'new_keys': 8, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 0, 'new_persons': 4, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 63.72 seconds ellapsed (1.97) ++++ 64.19 seconds ellapsed (1.97) 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.10 seconds ellapsed (2.39) ++++ 66.59 seconds ellapsed (2.40) ==================== ('RESETTING NODES',) 01:== Cleaning all nodes 02:== Cleaning all nodes === refresh cleaned nodes -+++ 67.04 seconds ellapsed (0.94) ++++ 67.53 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} -+++ 69.53 seconds ellapsed (2.49) ++++ 70.02 seconds ellapsed (2.49) 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.37 seconds ellapsed (1.84) ++++ 71.87 seconds ellapsed (1.86) 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',) @@ -135,11 +135,11 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 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 -+++ 82.98 seconds ellapsed (11.60) ++++ 83.46 seconds ellapsed (11.58) 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': 5, 'new_slice_attribute_types': 0} -+++ 85.60 seconds ellapsed (2.62) ++++ 86.07 seconds ellapsed (2.61) 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': 5, 'new_slice_attribute_types': 0} -+++ 87.58 seconds ellapsed (1.98) ++++ 88.09 seconds ellapsed (2.02) 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 @@ -170,11 +170,11 @@ 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.98 seconds ellapsed (8.40) ++++ 96.21 seconds ellapsed (8.11) 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': -5, 'new_slice_attribute_types': 0} -+++ 98.56 seconds ellapsed (2.59) ++++ 98.78 seconds ellapsed (2.58) 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} -+++ 100.48 seconds ellapsed (1.92) ++++ 100.70 seconds ellapsed (1.91) 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',) @@ -186,14 +186,14 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 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 -+++ 104.06 seconds ellapsed (3.58) ++++ 104.31 seconds ellapsed (3.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': 5, 'new_slice_attribute_types': 0} -+++ 106.66 seconds ellapsed (2.60) ++++ 106.93 seconds ellapsed (2.62) 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} -+++ 108.62 seconds ellapsed (1.96) ++++ 108.85 seconds ellapsed (1.93) 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.90 seconds ellapsed (1.29) ++++ 110.13 seconds ellapsed (1.28) ==================== ('RESETTING SLICES TEST',) 01:== Cleaning all nodes 01:==== Cleaning node 1 @@ -222,11 +222,11 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 02:== Cleaning all slices 02:==== Cleaning slice 3 === refresh After slices init -+++ 127.36 seconds ellapsed (17.46) ++++ 127.56 seconds ellapsed (17.43) 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} -+++ 129.91 seconds ellapsed (2.55) ++++ 130.13 seconds ellapsed (2.57) 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} -+++ 131.78 seconds ellapsed (1.87) ++++ 132.05 seconds ellapsed (1.92) ==================== ('CREATING SLICES on plc1',) 01:== created slice 4 - max nodes=5 01:== Attached person user1-1@plc1.org to slice oneone_slice1 @@ -251,11 +251,11 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 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.57 seconds ellapsed (21.79) ++++ 153.80 seconds ellapsed (21.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} -+++ 156.09 seconds ellapsed (2.52) ++++ 156.33 seconds ellapsed (2.52) 02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': 4, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 158.10 seconds ellapsed (2.01) ++++ 158.35 seconds ellapsed (2.03) 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 [] @@ -284,11 +284,11 @@ 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 [] === refresh After local nodes were added on plc1 -+++ 179.23 seconds ellapsed (21.13) ++++ 179.46 seconds ellapsed (21.11) 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} -+++ 181.75 seconds ellapsed (2.53) ++++ 182.16 seconds ellapsed (2.69) 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} -+++ 183.73 seconds ellapsed (1.98) ++++ 184.11 seconds ellapsed (1.95) 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] @@ -331,11 +331,11 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 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 === refresh After foreign nodes were added in plc1 -+++ 204.28 seconds ellapsed (20.54) ++++ 204.59 seconds ellapsed (20.48) 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} -+++ 206.86 seconds ellapsed (2.58) ++++ 207.18 seconds ellapsed (2.59) 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} -+++ 208.90 seconds ellapsed (2.04) ++++ 209.19 seconds ellapsed (2.01) 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 @@ -363,178 +363,178 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 01: 4 slivers (exp. 4) in GetSlivers for node n101.plc1.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1165932042, + 'expires': 1166091452, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'oneone_slice1', 'slice_id': 4} >>slivername = onetwo_slice2 { 'attributes': [], - 'expires': 1165932040, + 'expires': 1166091449, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onetwo_slice2', 'slice_id': 5} >>slivername = onethree_slice3 { 'attributes': [], - 'expires': 1165932052, + 'expires': 1166091462, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onethree_slice3', 'slice_id': 6} >>slivername = onefour_slice4 { 'attributes': [], - 'expires': 1165932057, + 'expires': 1166091467, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { '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 >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1165932042, + 'expires': 1166091452, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user3-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key1', + { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}], 'name': 'oneone_slice1', 'slice_id': 4} >>slivername = onetwo_slice2 { 'attributes': [], - 'expires': 1165932040, + 'expires': 1166091449, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user3-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key1', + { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}], 'name': 'onetwo_slice2', 'slice_id': 5} >>slivername = onethree_slice3 { 'attributes': [], - 'expires': 1165932052, + 'expires': 1166091462, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user3-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key1', + { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}], 'name': 'onethree_slice3', 'slice_id': 6} >>slivername = onefour_slice4 { 'attributes': [], - 'expires': 1165932057, + 'expires': 1166091467, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user3-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key1', + { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}], 'name': 'onefour_slice4', 'slice_id': 7} @@ -566,98 +566,98 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 01: 4 slivers (exp. 4) in GetSlivers for node n101.plc1.org >>slivername = oneone_slice1 { 'attributes': [], - 'expires': 1165932042, + 'expires': 1166091452, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'oneone_slice1', 'slice_id': 4} >>slivername = onetwo_slice2 { 'attributes': [], - 'expires': 1165932040, + 'expires': 1166091449, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onetwo_slice2', 'slice_id': 5} >>slivername = onethree_slice3 { 'attributes': [], - 'expires': 1165932052, + 'expires': 1166091462, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onethree_slice3', 'slice_id': 6} >>slivername = onefour_slice4 { 'attributes': [], - 'expires': 1165932057, + 'expires': 1166091467, 'instantiation': 'plc-instantiated', - 'keys': [ { 'key': 'ssh-rsa 1111111111111111 user1-key1', + 'keys': [ { 'key': 'ssh-rsa 11key4plc11 user1-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user1-key2', + { 'key': 'ssh-rsa 11key4plc11 user1-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key1', + { 'key': 'ssh-rsa 11key4plc11 user2-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user2-key2', + { 'key': 'ssh-rsa 11key4plc11 user2-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key1', + { 'key': 'ssh-rsa 11key4plc11 user3-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user3-key2', + { 'key': 'ssh-rsa 11key4plc11 user3-key2', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key1', + { 'key': 'ssh-rsa 11key4plc11 user4-key1', 'key_type': 'ssh'}, - { 'key': 'ssh-rsa 1111111111111111 user4-key2', + { 'key': 'ssh-rsa 11key4plc11 user4-key2', 'key_type': 'ssh'}], 'name': 'onefour_slice4', 'slice_id': 7} === refresh After foreign nodes were removed on plc1 -+++ 232.69 seconds ellapsed (23.79) ++++ 232.75 seconds ellapsed (23.57) 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} -+++ 235.24 seconds ellapsed (2.55) ++++ 235.31 seconds ellapsed (2.56) 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} -+++ 237.18 seconds ellapsed (1.94) ++++ 237.26 seconds ellapsed (1.94) 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] @@ -692,11 +692,11 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 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 === refresh After local nodes were removed on plc1 -+++ 256.56 seconds ellapsed (19.38) ++++ 256.49 seconds ellapsed (19.24) 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} -+++ 259.09 seconds ellapsed (2.53) ++++ 259.04 seconds ellapsed (2.55) 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} -+++ 261.03 seconds ellapsed (1.94) ++++ 261.02 seconds ellapsed (1.98) 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 [] @@ -714,23 +714,23 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 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.75 seconds ellapsed (13.72) ++++ 274.71 seconds ellapsed (13.68) 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} -+++ 277.30 seconds ellapsed (2.55) ++++ 277.64 seconds ellapsed (2.94) 02:== Refreshing peer got {'new_keys': 0, 'new_sites': 0, 'plcname': 'Thierry plc2 on devbox', 'new_slice_attributes': 0, 'new_slices': -4, 'new_persons': 0, 'new_nodes': 0, 'new_slice_attribute_types': 0} -+++ 279.23 seconds ellapsed (1.93) ++++ 279.61 seconds ellapsed (1.97) 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.12 seconds ellapsed (1.89) ++++ 281.49 seconds ellapsed (1.88) 01:== created SliceAttributeType = 20 02:== created SliceAttributeType = 20 === refresh after SliceAttributeType creation -+++ 283.02 seconds ellapsed (1.90) ++++ 283.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} -+++ 285.56 seconds ellapsed (2.54) ++++ 285.91 seconds ellapsed (2.53) 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} -+++ 287.47 seconds ellapsed (1.91) -+++ 287.47 seconds ellapsed (0.00) ++++ 287.81 seconds ellapsed (1.90) ++++ 287.81 seconds ellapsed (0.00) 01:============================== DUMPING 01: SITES 1 None pl Thierry plc1 Central [] @@ -743,22 +743,22 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 8 1 twothree plc2 in federation [8, 13] 9 1 twofour plc2 in federation [9, 14] 01: KEYS -1 None ssh-rsa 1111111111111111 user1-key1 -2 None ssh-rsa 1111111111111111 user1-key2 -3 None ssh-rsa 1111111111111111 user2-key1 -4 None ssh-rsa 1111111111111111 user2-key2 -5 None ssh-rsa 1111111111111111 user3-key1 -6 None ssh-rsa 1111111111111111 user3-key2 -7 None ssh-rsa 1111111111111111 user4-key1 -8 None ssh-rsa 1111111111111111 user4-key2 -9 1 ssh-rsa 2222222222222222 user1-key1 -10 1 ssh-rsa 2222222222222222 user1-key2 -11 1 ssh-rsa 2222222222222222 user2-key1 -12 1 ssh-rsa 2222222222222222 user2-key2 -13 1 ssh-rsa 2222222222222222 user3-key1 -14 1 ssh-rsa 2222222222222222 user3-key2 -15 1 ssh-rsa 2222222222222222 user4-key1 -16 1 ssh-rsa 2222222222222222 user4-key2 +1 None ssh-rsa 11key4plc11 user1-key1 +2 None ssh-rsa 11key4plc11 user1-key2 +3 None ssh-rsa 11key4plc11 user2-key1 +4 None ssh-rsa 11key4plc11 user2-key2 +5 None ssh-rsa 11key4plc11 user3-key1 +6 None ssh-rsa 11key4plc11 user3-key2 +7 None ssh-rsa 11key4plc11 user4-key1 +8 None ssh-rsa 11key4plc11 user4-key2 +9 1 ssh-rsa 22key4plc22 user1-key1 +10 1 ssh-rsa 22key4plc22 user1-key2 +11 1 ssh-rsa 22key4plc22 user2-key1 +12 1 ssh-rsa 22key4plc22 user2-key2 +13 1 ssh-rsa 22key4plc22 user3-key1 +14 1 ssh-rsa 22key4plc22 user3-key2 +15 1 ssh-rsa 22key4plc22 user4-key1 +16 1 ssh-rsa 22key4plc22 user4-key2 01: PERSONS 1 None maint@localhost.localdomain keys: [] sites: [] 2 None root@plc1.org keys: [] sites: [1] @@ -786,9 +786,11 @@ Attempting to set passwd for person_id=4 in DB2UPDATE 1 15 1 n205.plc2.org sls= [] site= 6 01: SLICES 1 None pl_conf nodes= [] persons= [] ---- sas= [1, 2, 3] pl_conf crp= 1 e= 1165931897 +--- sas= [1, 2, 3] pl_conf crp= 1 +--- 'expires': 1166091315 2 None pl_conf_vserverslice nodes= [] persons= [] ---- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 e= 1165931897 +--- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 +--- 'expires': 1166091315 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) @@ -862,22 +864,22 @@ sl= 1 n= None 6 1 oneone plc1 in federation [6, 10] 7 1 onetwo plc1 in federation [7] 02: KEYS -9 None ssh-rsa 2222222222222222 user1-key1 -10 None ssh-rsa 2222222222222222 user1-key2 -11 None ssh-rsa 2222222222222222 user2-key1 -12 None ssh-rsa 2222222222222222 user2-key2 -13 None ssh-rsa 2222222222222222 user3-key1 -14 None ssh-rsa 2222222222222222 user3-key2 -15 None ssh-rsa 2222222222222222 user4-key1 -16 None ssh-rsa 2222222222222222 user4-key2 -17 1 ssh-rsa 1111111111111111 user1-key1 -18 1 ssh-rsa 1111111111111111 user1-key2 -19 1 ssh-rsa 1111111111111111 user2-key1 -20 1 ssh-rsa 1111111111111111 user2-key2 -21 1 ssh-rsa 1111111111111111 user3-key1 -22 1 ssh-rsa 1111111111111111 user3-key2 -23 1 ssh-rsa 1111111111111111 user4-key1 -24 1 ssh-rsa 1111111111111111 user4-key2 +9 None ssh-rsa 22key4plc22 user1-key1 +10 None ssh-rsa 22key4plc22 user1-key2 +11 None ssh-rsa 22key4plc22 user2-key1 +12 None ssh-rsa 22key4plc22 user2-key2 +13 None ssh-rsa 22key4plc22 user3-key1 +14 None ssh-rsa 22key4plc22 user3-key2 +15 None ssh-rsa 22key4plc22 user4-key1 +16 None ssh-rsa 22key4plc22 user4-key2 +17 1 ssh-rsa 11key4plc11 user1-key1 +18 1 ssh-rsa 11key4plc11 user1-key2 +19 1 ssh-rsa 11key4plc11 user2-key1 +20 1 ssh-rsa 11key4plc11 user2-key2 +21 1 ssh-rsa 11key4plc11 user3-key1 +22 1 ssh-rsa 11key4plc11 user3-key2 +23 1 ssh-rsa 11key4plc11 user4-key1 +24 1 ssh-rsa 11key4plc11 user4-key2 02: PERSONS 1 None maint@localhost.localdomain keys: [] sites: [] 2 None root@plc2.org keys: [] sites: [1] @@ -905,9 +907,11 @@ sl= 1 n= None 10 1 n105.plc1.org sls= [] site= 6 02: SLICES 1 None pl_conf nodes= [] persons= [] ---- sas= [1, 2, 3] pl_conf crp= 1 e= 1165931898 +--- sas= [1, 2, 3] pl_conf crp= 1 +--- 'expires': 1166091316 2 None pl_conf_vserverslice nodes= [] persons= [] ---- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 e= 1165931898 +--- sas= [4, 5, 6] pl_conf_vserverslice crp= 1 +--- 'expires': 1166091316 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) @@ -969,6 +973,6 @@ sl= 1 n= None 02: SLIVERS for : hostname n205.plc2.org 02: 31 config files 02:============================== END DUMP -+++ 298.57 seconds ellapsed (11.10) ++++ 298.86 seconds ellapsed (11.05) ==================== ('END',) -+++ 298.57 seconds ellapsed (0.00) ++++ 298.86 seconds ellapsed (0.00) diff --git a/peers-test.mk b/peers-test.mk index 9e9458f..e9b508c 100644 --- a/peers-test.mk +++ b/peers-test.mk @@ -111,35 +111,41 @@ log: normalize = egrep -v "'expires':|^+++.*ellapsed" TEST=run checkpoint diff -run: run-only normalize -run-only: - python -u ./TestPeers.py > TestPeers.out 2>&1 - -normalize: TestPeers.out.nor TestPeers.ref.nor -TestPeers.out.nor: TestPeers.out - $(normalize) TestPeers.out > TestPeers.out.nor -TestPeers.ref.nor: TestPeers.ref - $(normalize) TestPeers.ref > TestPeers.ref.nor - -diff: normalize - @echo '<< REF OUT>>' - diff TestPeers.ref.nor TestPeers.out.nor - -checkpoint: - @echo adopting latest run as reference - cp TestPeers.out TestPeers.ref - cp TestPeers.out.nor TestPeers.ref.nor +run: nrun normalize +normalize: TestPeers-n.nout TestPeers-n.nref +nrun: + python -u ./TestPeers.py > TestPeers-n.out 2>&1 mrun: - python -u ./TestPeers.py -m > TestPeers.mout 2>&1 + python -u ./TestPeers.py -m > TestPeers-m.out 2>&1 brun: - python -u ./TestPeers.py -b > TestPeers.bout 2>&1 + python -u ./TestPeers.py -b > TestPeers-b.out 2>&1 prun: - python -u ./TestPeers.py -p > TestPeers.pout 2>&1 + python -u ./TestPeers.py -p > TestPeers-p.out 2>&1 pbrun: - python -u ./TestPeers.py -p -b > TestPeers.pbout 2>&1 + python -u ./TestPeers.py -p -b > TestPeers-pb.out 2>&1 phrun: - python -u ./TestPeers.py -p -H > TestPeers.phout 2>&1 + python -u ./TestPeers.py -p -H > TestPeers-ph.phout 2>&1 + +%.nout: %.out + $(normalize) $*.out > $@ +%.nref: %.ref + $(normalize) $*.ref > $@ + +diff: normalize + @echo '<< REF OUT>>' + diff TestPeers-n.ref TestPeers-n.out + +ckp checkpoint: + @echo adopting latest run as reference + cp TestPeers-n.out TestPeers-n.ref + rm -f TestPeers-n.n??? + +mdiff: TestPeers-m.nref TestPeers-m.nout + diff TestPeers-m.nref TestPeers-m.nout +mckp: + cp TestPeers-m.out TestPeers-m.ref + rm -f TestPeers-m.n??? ####### HELP=rpm db-dump http