openvswitch: Add utility functions for getting and setting Open vSwitch per-port...

Add utility functions for Open vSwitch to both save
per-port data before a live migration, and restore the
per-port data after a live migration.

Signed-off-by: Kyle Mestery <kmestery@cisco.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 60f9c7fdfbd0da907619731da55a223b099ab7f7..699c9a376d78ab72af6a1ba909ba32a0a2954a7b 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1500,7 +1500,9 @@ virNetDevMacVLanVPortProfileRegisterCallback;
 
 # virnetdevopenvswitch.h
 virNetDevOpenvswitchAddPort;
+virNetDevOpenvswitchGetMigrateData;
 virNetDevOpenvswitchRemovePort;
+virNetDevOpenvswitchSetMigrateData;
 
 
 # virnetdevtap.h

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index a6993b6c6d34b343ee25cdbd6ad72e1e81f96e9a..5bce6115a37ef4ec10a5efb5d2dc779cb6094bbd 100644 (file)
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -173,9 +173,74 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch
                              _("Unable to delete port %s from OVS"), ifname);
         goto cleanup;
     }
+
+    ret = 0;
+cleanup:
+    virCommandFree(cmd);
+    return ret;
+}
+
+/**
+ * virNetDevOpenvswitchGetMigrateData:
+ * @migrate: a pointer to store the data into, allocated by this function
+ * @ifname: name of the interface for which data is being migrated
+ *
+ * Allocates data to be migrated specific to Open vSwitch
+ *
+ * Returns 0 in case of success or -1 in case of failure
+ */
+int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
+{
+    virCommandPtr cmd = NULL;
+    int ret = -1;
+
+    cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface",
+                               ifname, "external_ids:PortData", NULL);
+
+    virCommandSetOutputBuffer(cmd, migrate);
+
+    /* Run the command */
+    if (virCommandRun(cmd, NULL) < 0) {
+        virReportSystemError(VIR_ERR_INTERNAL_ERROR,
+                             _("Unable to run command to get OVS port data for "
+                             "interface %s"), ifname);
+        goto cleanup;
+    }
+
+    /* Wipeout the newline */
+    (*migrate)[strlen(*migrate) - 1] = '\0';
     ret = 0;
+cleanup:
+    return ret;
+}
 
-    cleanup:
-        virCommandFree(cmd);
-        return ret;
+/**
+ * virNetDevOpenvswitchSetMigrateData:
+ * @migrate: the data which was transferred during migration
+ * @ifname: the name of the interface the data is associated with
+ *
+ * Repopulates OVS per-port data on destination host
+ *
+ * Returns 0 in case of success or -1 in case of failure
+ */
+int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
+{
+    virCommandPtr cmd = NULL;
+    int ret = -1;
+
+    cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set",
+                               "Interface", ifname, NULL);
+    virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate);
+
+    /* Run the command */
+    if (virCommandRun(cmd, NULL) < 0) {
+        virReportSystemError(VIR_ERR_INTERNAL_ERROR,
+                             _("Unable to run command to set OVS port data for "
+                             "interface %s"), ifname);
+        goto cleanup;
+    }
+
+    ret = 0;
+cleanup:
+    return ret;
 }

diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index 7e5b618951732489616b4fe57b2ba106c8faa681..147cd6f7c7f99090b8388eb1ede5a3f4a03614a1 100644 (file)
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -42,4 +42,10 @@ int virNetDevOpenvswitchAddPort(const char *brname,
 int virNetDevOpenvswitchRemovePort(const char *brname, const char *ifname)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 
+int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+
+int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+
 #endif /* __VIR_NETDEV_OPENVSWITCH_H__ */