Commit bc054b07 authored by David Hancock's avatar David Hancock

Focus debug statements in vib_client; minor fixes to run_t10 script

parent 10c8708d
......@@ -135,8 +135,8 @@ class VibrantManager(ChainSliceManager):
else:
self.enc_vdevs.append(name)
print("===== Checkpoint: GUMBO =====")
time.sleep(5)
#print("===== Checkpoint: GUMBO =====")
#time.sleep(5)
self.dec_rules, self.enc_rules = self.gen_mask_and_keys()
......@@ -158,7 +158,7 @@ class VibrantManager(ChainSliceManager):
+ 'table_set_default strip_vibrant a_strip_vibrant')
#print(resp)
print("===== " + dec_vdev + " ready =====")
time.sleep(2.5)
#time.sleep(2.5)
for enc_vdev in self.enc_vdevs:
......@@ -170,14 +170,17 @@ class VibrantManager(ChainSliceManager):
self.enc_vdev_handles[(enc_vdev, rule[1])] = int(handle)
print("===== " + enc_vdev + " ready =====")
time.sleep(2.5)
#time.sleep(2.5)
for device in line.split()[2:]:
dec_vdev = device + '_vib_dec'
self.do_lease_insert(device + ' ' + dec_vdev + ' 0 efalse')
print("===== Inserted " + dec_vdev + " =====")
time.sleep(5)
#print("===== Inserted " + dec_vdev + " =====")
#time.sleep(5)
print("Debug... start entering commands manually")
"""
# TO REINSTATE after manual testing
for device in line.split()[2:]:
enc_vdev = device + '_vib_enc'
resp = self.do_vdev_interpretf(enc_vdev + ' bmv2 ' + self.enc_cmd_path \
......@@ -188,6 +191,7 @@ class VibrantManager(ChainSliceManager):
print ("Complete")
print (time.strftime("%H:%M:%S"))
"""
def rotate_keys(self):
......
......@@ -68,9 +68,6 @@ ttyecho -n $ADMIN sudo cp /users/$user/node-3-hp4.json /opt/hp4-ctrl/tests/t10/n
scp node-4-hp4.json $user@pc${nodes[0]}.emulab.net:~/
ttyecho -n $ADMIN sudo cp /users/$user/node-4-hp4.json /opt/hp4-ctrl/tests/t10/node-4-hp4.json
echo "Check for presence of JSONs in hp4-ctrl/tests/t10..."
$pause
echo "Next: create/provision slice1 with lease to s1, s2, and s3, slice2 w/ lease to s1, s4, and s5"
$pause
......@@ -116,9 +113,6 @@ H3="$(cat /tmp/pts_h3)"
H5="$(cat /tmp/pts_h5)"
H6="$(cat /tmp/pts_h6)"
echo "strategic pause..."
$pause
ttyecho -n $H1 ssh -p 22 $user@pc${nodes[5]}.emulab.net
ttyecho -n $H2 ssh -p 22 $user@pc${nodes[6]}.emulab.net
ttyecho -n $H3 ssh -p 22 $user@pc${nodes[7]}.emulab.net
......@@ -138,7 +132,7 @@ H6ip="10.10.10.1"
ttyecho -n $H2 ping $H4ip -i 0.2 -w 120
echo time h2 kicked off:
date
sudo echo start h2 $(date) >> t10/t10r$RUN
echo start h2 $(date) >> t10/t10r$RUN
sleep 1
#t9h3.sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment