Commit c6767831 authored by Mike Hibler's avatar Mike Hibler

For elabinelab.switchmac, ignore interfaces with oddball roles ("other","gw");

e.g., for IXP-laden machines.
parent 358bb6ad
...@@ -4374,7 +4374,8 @@ class elabinelab: ...@@ -4374,7 +4374,8 @@ class elabinelab:
# #
# The current control network becomes the outer control network. # The current control network becomes the outer control network.
# The experimental network with an IP assigned becomes the # The experimental network with an IP assigned becomes the
# inner control network. # inner control network. Interfaces other than experimental
# or control (e.g., fake IXP interfaces) are ignored.
# #
role = res[3] role = res[3]
IP = res[7] IP = res[7]
...@@ -4385,6 +4386,8 @@ class elabinelab: ...@@ -4385,6 +4386,8 @@ class elabinelab:
elif role == "expt" and IP != "": elif role == "expt" and IP != "":
role = "ctrl" role = "ctrl"
pass pass
elif role != "expt":
continue
tmp["mac"] = res[1] tmp["mac"] = res[1]
tmp["iface"] = res[2] tmp["iface"] = res[2]
......
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