Commit 1ebb5ea6 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Do not return control net vlans from tmcd. We determine this by

looking at the stack attribute in the lans_attributes table, which
must not say 'Experimental' or not be set at all (legacy).
parent 71812015
* Copyright (c) 2000-2008 University of Utah and the Flux Group.
* Copyright (c) 2000-2009 University of Utah and the Flux Group.
* All rights reserved.
......@@ -1608,7 +1608,12 @@ COMMAND_PROTOTYPE(doifconfig)
" vll.idx=v.virtlanidx and vll.exptidx='%d' "
"left join lan_attributes as la on "
" la.lanid=v.vlanid and la.attrkey='vlantag' "
"where v.node_id='%s' and %s",
"left join lan_attributes as la2 on "
" la2.lanid=v.vlanid and la2.attrkey='stack' "
"where v.node_id='%s' and "
" (la2.attrvalue='Experimental' or "
" la2.attrvalue is null) "
" and %s",
10, reqp->exptidx, reqp->pnodeid, buf);
if (!res) {
error("IFCONFIG: %s: DB Error getting veth interfaces!\n",
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