From b285b710ba8b008f7a4302922ddc07f9d07798fd Mon Sep 17 00:00:00 2001 From: Mike Hibler Date: Tue, 25 Sep 2007 00:44:00 +0000 Subject: [PATCH] A couple more minor tweaks for elabinelab --- xmlrpc/emulabserver.py.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xmlrpc/emulabserver.py.in b/xmlrpc/emulabserver.py.in index 87a9990ed..754851bac 100755 --- a/xmlrpc/emulabserver.py.in +++ b/xmlrpc/emulabserver.py.in @@ -4362,8 +4362,9 @@ class elabinelab: " i.node_id=r.node_id " "left join wires as s on s.node_id1=i.node_id " " and s.card1=i.card " - "where r.pid=%s and r.eid=%s and " - " r.inner_elab_role='node' " + "where r.pid=%s and r.eid=%s " + " and r.inner_elab_role='node' " + " and s.node_id2!='' " "order by r.node_id,iface", (self.pid,self.eid,)) @@ -4491,7 +4492,7 @@ class elabinelab: tmp["card"] = res[5] tmp["type"] = res[6] tmp["switch_id"] = res[7] - tmp["switch_card"] = res[9] + tmp["switch_card"] = res[8] tmp["switch_port"] = res[9] interfaces[res[1]] = tmp pass -- GitLab