# "nicira-iface-id" key in the "other_config" field of the VIF
# record of XAPI.
def get_iface_id(if_name, xs_vif_uuid):
- if not if_name.startswith("vif"):
+ if not if_name.startswith("vif") and not if_name.startswith("tap"):
# Treat whatever was passed into 'xs_vif_uuid' as a default
# value for non-VIFs.
return xs_vif_uuid
s_log.warning("Couldn't call ovs-vsctl")
def set_external_id(table, record, key, value):
- col = 'external-ids:"' + key + '"="' + value + '"'
- call_vsctl(["set", table, record, col])
+ if value:
+ col = 'external-ids:"%s"="%s"' % (key, value)
+ call_vsctl(["set", table, record, col])
+ else:
+ call_vsctl(["remove", table, record, "external-ids", key])
+
# XenServer does not call interface-reconfigure on internal networks,
# which is where the fail-mode would normally be set.
else:
s_log.warning('"' + dib + '"'
"isn't a valid setting for other_config:disable-in-band on " +
- bridge)
+ name)
def update_bridge_id(name, ids):
id = get_bridge_id(name, ids.get("xs-network-uuids"))
set_external_id("Bridge", name, "bridge-id", primary_id)
ids["bridge-id"] = primary_id
-def update_iface_id(name, ids):
+def update_iface(name, ids):
id = get_iface_id(name, ids.get("xs-vif-uuid"))
if ids.get("iface-id") != id and id:
set_external_id("Interface", name, "iface-id", id)
ids["iface-id"] = id
+ status = ids.get("iface-status")
+ if status:
+ set_external_id("Interface", name, "iface-status", status)
+
def keep_table_columns(schema, table_name, column_types):
table = schema.tables.get(table_name)
if not table:
if (signum == signal.SIGHUP):
force_run = True
+def update_tap_from_vif(idl, tap_name, vif_name):
+ ifaces = idl.data["Interface"]
+ tap = None
+ vif = None
+
+ for i in ifaces.values():
+ name = i.name.as_scalar().strip('"')
+ if name == tap_name:
+ tap = i
+ elif name == vif_name:
+ vif = i
+
+ if vif and tap:
+ vxid = vif.external_ids
+ txid = tap.external_ids
+
+ keys = ["attached-mac", "xs-network-uuid", "xs-vif-uuid", "xs-vm-uuid"]
+ for k in keys:
+ if vxid.get(k) != txid.get(k):
+ set_external_id("Interface", tap_name, k, vxid.get(k))
+
def main(argv):
global force_run
new_interfaces[name] = {"xs-vif-uuid": xs_vif_uuid,
"iface-id": iface_id}
+ if name.startswith("vif"):
+ new_interfaces[name]["iface-status"] = "active"
+
+ #Tap devices take their xs-vif-uuid from their corresponding vif and
+ #cause that vif to be labled inactive.
+ for name in new_interfaces:
+ if not name.startswith("tap"):
+ continue
+
+ vif = name.replace("tap", "vif", 1)
+
+ if vif in new_interfaces:
+ xs_vif_uuid = new_interfaces[vif]["xs-vif-uuid"]
+ new_interfaces[name]["xs-vif-uuid"] = xs_vif_uuid
+
+ new_interfaces[vif]["iface-status"] = "inactive"
+ new_interfaces[name]["iface-status"] = "active"
+
+ update_tap_from_vif(idl, name, vif)
+
if bridges != new_bridges:
for name,ids in new_bridges.items():
if name not in bridges:
if interfaces != new_interfaces:
for name,ids in new_interfaces.items():
if (name not in interfaces) or (interfaces[name] != ids):
- update_iface_id(name, ids)
+ update_iface(name, ids)
interfaces = new_interfaces
if __name__ == '__main__':