X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fusr_share_openvswitch_scripts_ovs-xapi-sync;h=79a6bde124e78cfb2a3b7db1b745e7c98bc40e6e;hb=d2cee5a48ebe850ccb72cd1e860a90e5ec0248fd;hp=8392c61f0145289a4ee95a4e13cb4147a3887840;hpb=e9ade0fee62e886c2459ca42d1e15f06a0045ce4;p=sliver-openvswitch.git

diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index 8392c61f0..79a6bde12 100755
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -25,7 +25,6 @@
 import argparse
 import os
 import signal
-import subprocess
 import sys
 import time
 
@@ -34,13 +33,10 @@ import XenAPI
 import ovs.dirs
 from ovs.db import error
 from ovs.db import types
-import ovs.util
 import ovs.daemon
 import ovs.db.idl
 
-root_prefix = ''                # Prefix for absolute file names, for testing.
 vlog = ovs.vlog.Vlog("ovs-xapi-sync")
-vsctl = "/usr/bin/ovs-vsctl"
 session = None
 force_run = False
 
@@ -116,11 +112,28 @@ def get_iface_id(if_name, xs_vif_uuid):
         return xs_vif_uuid
 
 
-def call_vsctl(args):
-    cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args
-    exitcode = subprocess.call(cmd)
-    if exitcode != 0:
-        vlog.warn("Couldn't call ovs-vsctl")
+# By default, the "vm-id" external id in the Interface table is the
+# same as "xs-vm-uuid".  This may be overridden by defining a
+# "nicira-vm-id" key in the "other_config" field of the VM
+# record of XAPI.
+def get_vm_id(if_name, xs_vm_uuid):
+    if not if_name.startswith("vif") and not if_name.startswith("tap"):
+        # Treat whatever was passed into 'xs_vm_uuid' as a default
+        # value for non-VIFs.
+        return xs_vm_uuid
+
+    if not init_session():
+        vlog.warn("Failed to get vm id for interface id %s because"
+                " XAPI session could not be initialized" % if_name)
+        return xs_vm_uuid
+
+    try:
+        vm = session.xenapi.VM.get_by_uuid(xs_vm_uuid)
+        rec = session.xenapi.VM.get_record(vm)
+        return rec['other_config'].get('nicira-vm-id', xs_vm_uuid)
+    except XenAPI.Failure:
+        vlog.warn("Could not find XAPI entry for VIF %s" % if_name)
+        return xs_vm_uuid
 
 
 def set_or_delete(d, key, value):
@@ -225,7 +238,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("database", metavar="DATABASE",
             help="A socket on which ovsdb-server is listening.")
-    parser.add_argument("--root-prefix", metavar="DIR",
+    parser.add_argument("--root-prefix", metavar="DIR", default='',
                         help="Use DIR as alternate root directory"
                         " (for testing).")
 
@@ -235,10 +248,6 @@ def main():
     ovs.vlog.handle_args(args)
     ovs.daemon.handle_args(args)
 
-    global root_prefix
-    if args.root_prefix:
-        root_prefix = args.root_prefix
-
     remote = args.database
     schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR
     schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schema_file))
@@ -249,7 +258,7 @@ def main():
 
     # This daemon is usually started before XAPI, but to complete our
     # tasks, we need it.  Wait here until it's up.
-    cookie_file = root_prefix + "/var/run/xapi_init_complete.cookie"
+    cookie_file = args.root_prefix + "/var/run/xapi_init_complete.cookie"
     while not os.path.exists(cookie_file):
         time.sleep(1)
 
@@ -257,8 +266,11 @@ def main():
 
     bridges = {}                # Map from bridge name to xs_network_uuids
     iface_ids = {}              # Map from xs-vif-uuid to iface-id
+    vm_ids = {}                 # Map from xs-vm-uuid to vm-id
+    seqno = idl.change_seqno    # Sequence number when we last processed the db
     while True:
-        if not force_run and not idl.run():
+        idl.run()
+        if not force_run and seqno == idl.change_seqno:
             poller = ovs.poller.Poller()
             idl.wait(poller)
             poller.block()
@@ -268,7 +280,9 @@ def main():
             vlog.info("Forced to re-run as the result of a SIGHUP")
             bridges = {}
             iface_ids = {}
+            vm_ids = {}
             force_run = False
+        seqno = idl.change_seqno
 
         txn = ovs.db.idl.Transaction(idl)
 
@@ -280,9 +294,8 @@ def main():
                 # New bridge.
                 update_fail_mode(row)
                 update_in_band_mgmt(row)
-            if new_xnu != old_xnu:
-                # New bridge or bridge's xs-network-uuids has changed.
-                update_bridge_id(row)
+
+            update_bridge_id(row)
             new_bridges[row.name] = new_xnu
         bridges = new_bridges
 
@@ -291,6 +304,7 @@ def main():
             iface_by_name[row.name] = row
 
         new_iface_ids = {}
+        new_vm_ids = {}
         for row in idl.tables["Interface"].rows.itervalues():
             # Match up paired vif and tap devices.
             if row.name.startswith("vif"):
@@ -326,6 +340,17 @@ def main():
                 iface_id = None
             set_external_id(row, "iface-id", iface_id)
 
+            # Map from xs-vm-uuid to vm-id.
+            xvmu = row.external_ids.get("xs-vm-uuid")
+            if xvmu:
+                vm_id = (new_vm_ids.get(xvmu)
+                         or vm_ids.get(xvmu)
+                         or get_vm_id(row.name, xvmu))
+                new_vm_ids[xvmu] = vm_id
+            else:
+                vm_id = None
+            set_external_id(row, "vm-id", vm_id)
+
             # When there's a vif and a tap, the tap is active (used for
             # traffic).  When there's just a vif, the vif is active.
             #
@@ -340,6 +365,7 @@ def main():
             else:
                 set_external_id(row, "iface-status", None)
         iface_ids = new_iface_ids
+        vm_ids = new_vm_ids
 
         txn.commit_block()