self.key = self.NST_KEY_PATH
self.slice = self.NST_SLICE
self.nodes = self.NST_NODES
- self.multiquery_path = self.NST_MULTIQUERY_PATH
self.verbose = options.verbose
self.data_path = '/usr/share/planetlab/tests/nst/data/'
def count_nodes_by_api(config):
# count all nodes
- all_nodes = [row['node_id'] for row in config.api.GetNodes(config.auth, {}, ['node_id', 'slice_ids'])]
+ all_nodes = config.api.GetNodes(config.auth, {}, ['node_id', 'slice_ids'])
all_nodes_output = "%d\t%d" % (round(time.time()), len(all_nodes))
# count all nodes in slice
verbose = config.verbose
auth = config.auth
nodes = config.nodes
- multiquery_path = config.multiquery_path
if verbose:
verbose_text = ""
node_list = node_dict.keys()
nodes_filename = tempfile.mktemp()
nodes_file = open(nodes_filename, 'w')
- nodes_file.write_lines(node_list)
+ for node in node_list:
+ nodes_file.write("%(node)s\n" % locals())
nodes_file.close()
# creaet node dict
ssh_filename = tempfile.mktemp()
ssh_file = open(ssh_filename, 'w')
ssh_file.write("""
- export PATH=$PATH:%(multiquery_path)s
export MQ_SLICE="%(slice)s"
export MQ_NODES="%(nodes_filename)s"
grep -v ": 0 bytes"
""" % locals())
ssh_file.close()
- ssh_results = os.popen("python /tmp/test").readlines()
- ssh_result = eval(ssh_results[0].replace('\\n', ''))
-
- # create a list of hostname out of results that are not empty
- good_nodes = []
- for result in ssh_result:
- if result.find("bytes") > -1:
- result_parts = result.split(":")
- hostname = result_parts[0]
- good_nodes.append(hostname)
-
+ ssh_results = os.popen("bash %(ssh_filename)s" % locals()).readlines()
+ good_nodes= [result.split(':')[0] for result in ssh_results]
+
+ # remove temp files
+ if os.path.exists(nodes_filename): os.unlink(nodes_filename)
+ if os.path.exists(ssh_filename): os.unlink(ssh_filename)
+
# count number of node we can ssh into
ssh_count = len(good_nodes)
curr_time = round(time.time())
dead_node_count_output = "%d\t%d" % (curr_time, len(dead_nodes))
dead_nodes_file_name = config.data_path + os.sep + "dead_nodes"
- dead_nodes_file = open(dead_nodes_file_name, 'a')
+ dead_nodes_file = open(dead_nodes_file_name, 'w')
+
for hostname in dead_nodes:
boot_state = node_dict[hostname]['boot_state']
last_updated = 0
# write good node count
ssh_result_output = "%d\t%d" % (round(time.time()), ssh_count)
nodes_can_ssh_file_name = config.data_path + os.sep + "nodes_can_ssh"
- nodes_can_ssh_file = open(nodes_can_ssh_file_name, 'a')
+ nodes_can_ssh_file = open(nodes_can_ssh_file_name, 'w')
nodes_can_ssh_file.write(ssh_result_output)
nodes_can_ssh_file.close()
print "Removing %s from all nodes" % config.slice
all_nodes = [row['node_id'] for row in config.api.GetNodes(config.auth, {}, ['node_id'])]
- config.api.DeleteSliceFromNodes(config.auth, slice, all_nodes)
+ config.api.DeleteSliceFromNodes(config.auth, config.slice, all_nodes)
# add slice to all nodes.
# make sure users key is up to date
def init_slice(config):
- # make sure slice exists
- slices = config.api.GetSlices(config.auth, [config.slice], \
- ['slice_id', 'name', 'person_ids'])
+ api = config.api
+ auth = config.auth
+ slice = config.slice
+ key_path = config.key
+ verbose = config.verbose
+ slices = api.GetSlices(auth, [slice], \
+ ['slice_id', 'name', 'person_ids', 'node_ids'])
if not slices:
- raise "No such slice %s" % config.slice
+ raise "No such slice %s" % slice
slice = slices[0]
# make sure user is in slice
- person = config.api.GetPersons(config.auth, config.auth['Username'], \
+ person = api.GetPersons(auth, auth['Username'], \
['person_id', 'email', 'slice_ids', 'key_ids'])[0]
if slice['slice_id'] not in person['slice_ids']:
raise "%s not in %s slice. Must be added first" % \
if len(current_key) == 0:
raise "Key cannot be empty"
- keys = config.api.GetKeys(auth, person['key_ids'])
+ keys = api.GetKeys(auth, person['key_ids'])
if not keys:
- if config.verbose:
+ if verbose:
print "Adding new key " + key_path
- config.api.AddPersonKey(config.auth, person['person_id'], \
+ api.AddPersonKey(auth, person['person_id'], \
{'key_type': 'ssh', 'key': current_key})
elif not filter(lambda k: k['key'] == current_key, keys):
- if config.verbose:
+ if verbose:
print "%s was modified or is new. Updating PLC"
old_key = keys[0]
- config.api.UpdateKey(config.auth, old_key['key_id'], \
+ api.UpdateKey(auth, old_key['key_id'], \
{'key': current_key})
+
+
# add slice to all nodes
- if config.verbose:
- print "Adding %s to all nodes" + slice
+ if verbose:
+ print "Generating list of all nodes "
all_nodes = [row['node_id'] for row in \
- config.api.GetNodes(config.auth, {}, ['node_id'])]
- config.api.AddSliceToNodes(config.auth, config.slice, all_nodes)
+ api.GetNodes(auth, {}, ['node_id'])]
+ if verbose:
+ print "Adding %s to all nodes" % slice['name']
+
+ new_nodes = set(all_nodes).difference(slice['node_ids'])
+ api.AddSliceToNodes(auth, slice['slice_id'], list(new_nodes))
# create the fill/empty plot
ticstep = 1800
plotlength = 10800
+ plots_path = config.plots_path
+
all_nodes_file_name = config.data_path + os.sep + "nodes"
nodes_in_slice_file_name = config.data_path + os.sep + "nodes_in_slice"
nodes_can_ssh_file_name = config.data_path + os.sep + "nodes_can_ssh"
config = Config(options)
-
+sleep_time = 900
if config.slice == 'root':
else:
# set up slice and add it to nodes
init_slice(config)
-
- # wait 15 mins for nodes to get the data
- sleep(900)
+
+ if config.verbose:
+ print "Waiting %(sleep_time)d seconds for nodes to update" % locals()
+ # wait nodes to get the data
+ sleep(sleep_time)
# gather data
count_nodes_can_ssh(config)
count_nodes_good_by_comon(config)
# update plots
-plot_fill_empty()
+#plot_fill_empty()
#os.system("cp plots/*.png ~/public_html/planetlab/tests")
# clean up
git://git.onelab.eu / tests.git / blobdiff