X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=02635568cbad8448d55d7ad62eecae6c2f64505e;hb=109b8459218973f7fba72fc606bcdbbb306592de;hp=400693cccd1f3577d8c1f82a1c4ccd2d94165545;hpb=32abfca082fe8754980c6beba56cbad3e9524177;p=openvswitch

diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index 400693cc..02635568 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -118,14 +118,18 @@ def get_iface_id(if_name, xs_vif_uuid):
         return xs_vif_uuid
 
 def call_vsctl(args):
-    cmd = [vsctl, "--timeout=30", "-vANY:console:emer"] + args
+    cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args
     exitcode = subprocess.call(cmd)
     if exitcode != 0:
         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.
@@ -235,6 +239,27 @@ def handler(signum, frame):
     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
 
@@ -319,6 +344,8 @@ def main(argv):
                 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: