Commit 47030bb8 authored by Mac Newbold's avatar Mac Newbold

Add ordering to everything that wasn't getting a strict ordering.

parent 83cfa8ec
......@@ -142,7 +142,7 @@ if (($state eq EXPTSTATE_ACTIVE) ||
"left join nodes as n on r.node_id=n.node_id ".
"left join os_info as o on o.osid=n.def_boot_osid ".
"left join node_types as nt on nt.type=n.type ".
"where r.pid='$pid' and r.eid='$eid'");
"where r.pid='$pid' and r.eid='$eid' order by vname");
while (($v,$p,$t,$m,$o,$s,$j,$r) = $query_result->fetchrow_array()) {
if (!$v) {
......@@ -167,7 +167,7 @@ if (($state eq EXPTSTATE_ACTIVE) ||
my $virtnodes_result =
DBQueryFatal("SELECT vname,ips,osname,cmd_line,rpms,deltas," .
"startupcmd,tarfiles,type,fixed from virt_nodes ".
"where pid='$pid' and eid='$eid'");
"where pid='$pid' and eid='$eid' order by vname");
if ($shownodes) {
print "Virtual Node Info:\n";
......@@ -274,7 +274,7 @@ if ($showlinks) {
DBQueryFatal("select vname,member,delay,bandwidth,lossrate, ".
"rdelay,rbandwidth,rlossrate ".
"from virt_lans where pid='$pid' and eid='$eid'".
"order by vname");
"order by vname,member");
if ($result->numrows) {
print "Virtual Lan/Link Info:\n";
......@@ -299,7 +299,7 @@ if ($showlinks) {
"q_weight,q_linterm,q_qinbytes,q_red,q_gentle ".
" from virt_lans ".
"where pid='$pid' and eid='$eid'".
"order by vname");
"order by vname,member");
if ($result->numrows) {
print "Virtual Queue Info:\n";
......@@ -333,7 +333,7 @@ if ($showlinks) {
$result =
DBQueryFatal("select vname,member,delay,bandwidth,lossrate ".
"from virt_lans where pid='$pid' and eid='$eid' and ".
"widearea!=0");
"widearea!=0 order by vname,member");
if ($result->numrows) {
while (($vname,$member,$delay,$bandwidth,$lossrate)
= $result->fetchrow_array()) {
......@@ -434,11 +434,13 @@ if ($showdelays &&
$result_delays =
DBQueryFatal("select d.*,r.vname as delayvname from delays as d ".
"left join reserved as r on d.node_id=r.node_id ".
"where d.pid='$pid' and d.eid='$eid'");
"where d.pid='$pid' and d.eid='$eid' ".
"order by vname,vnode0");
$result_linkdelays =
DBQueryFatal("select * from linkdelays ".
"where pid='$pid' and eid='$eid'");
"where pid='$pid' and eid='$eid' ".
"order by vlan,vnode,node_id");
if ($result_delays->numrows || $result_linkdelays->numrows) {
print "Physical Lan/Link Info:\n";
......@@ -548,7 +550,7 @@ if ($showroutes) {
my $result =
DBQueryFatal("select vname,src,dst,dst_type,dst_mask,nexthop,cost ".
" from virt_routes where ".
"pid='$pid' and eid='$eid' order by vname");
"pid='$pid' and eid='$eid' order by vname,src,dst");
if ($result->numrows) {
print "Route List:\n";
......@@ -580,7 +582,7 @@ if ($showevents) {
"left join event_eventtypes as et on ex.eventtype=et.idx ".
"left join event_objecttypes as ot on ex.objecttype=ot.idx ".
"where ex.pid='$pid' and ex.eid='$eid' ".
"order by time");
"order by time,vnode,vname,idx");
if ($result->numrows) {
if ($verbose) {
......
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