[PATCH v3 06/21] LXC from native: migrate veth network configuration

[Cédric Bosdonnat <cbosdonnat@xxxxxxxx>]

Some of the LXC configuration properties aren't migrated since they
would only cause problems in libvirt-lxc:
  * lxc.network.ipv[46]: LXC driver doesn't setup IP address of guests,
    see rhbz#1059624
  * lxc.network.name, see rhbz#1059630
---
 src/lxc/lxc_native.c                         | 114 ++++++++++++++++++++++++---
 tests/lxcconf2xmldata/lxcconf2xml-simple.xml |   5 ++
 2 files changed, 107 insertions(+), 12 deletions(-)

diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index bc14d69..42eccfc 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -325,8 +325,80 @@ lxcFstabWalkCallback(const char* name, virConfValuePtr value, void * data)
     return ret;
 }
 
+static virDomainNetDefPtr
+lxcCreateNetDef(const char *type,
+                const char *link,
+                const char *mac,
+                const char *flag)
+{
+    virDomainNetDefPtr net = NULL;
+
+    if (VIR_ALLOC(net) < 0)
+        goto error;
+
+    if (flag) {
+        if (STREQ(flag, "up"))
+            net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP;
+        else
+            net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN;
+    }
+
+    if (STREQ(type, "veth")) {
+        virMacAddr macAddr;
+
+        if (!link)
+            goto error;
+
+        net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
+
+        if (VIR_STRDUP(net->data.bridge.brname, link) < 0)
+            goto error;
+
+        if (mac && virMacAddrParse(mac, &macAddr) == 0)
+            net->mac = macAddr;
+
+    }
+
+    return net;
+
+error:
+    virDomainNetDefFree(net);
+    return NULL;
+}
+
+static int
+lxcAddNetworkDefinition(virDomainDefPtr def,
+                        const char *type,
+                        const char *link,
+                        const char *mac,
+                        const char *flag)
+{
+    virDomainNetDefPtr net = NULL;
+
+    if ((type == NULL) || STREQ(type, "empty") || STREQ(type, "") ||
+            STREQ(type, "none"))
+        return 0;
+
+    if (!(net = lxcCreateNetDef(type, link, mac, flag)))
+        goto error;
+
+    if (VIR_EXPAND_N(def->nets, def->nnets, 1) < 0)
+        goto error;
+    def->nets[def->nnets - 1] = net;
+
+    return 1;
+
+error:
+    virDomainNetDefFree(net);
+    return -1;
+}
+
 typedef struct {
+    virDomainDefPtr def;
     char *type;
+    char *link;
+    char *mac;
+    char *flag;
     bool privnet;
     size_t networks;
 } lxcNetworkParseData;
@@ -335,38 +407,56 @@ static int
 lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data)
 {
     lxcNetworkParseData *parseData = data;
+    int status;
 
     if (STREQ(name, "lxc.network.type")) {
-        if (parseData->type != NULL && STREQ(parseData->type, "none"))
-            parseData->privnet = false;
-        else if ((parseData->type != NULL) &&
-                        STRNEQ(parseData->type, "empty") &&
-                        STRNEQ(parseData->type, "")) {
+        /* Store the previous NIC */
+        status = lxcAddNetworkDefinition(parseData->def, parseData->type,
+                                         parseData->link, parseData->mac,
+                                         parseData->flag);
+        if (status < 0)
+            return -1;
+        else if (status > 0)
             parseData->networks++;
-        }
+        else if (parseData->type != NULL && STREQ(parseData->type, "none"))
+            parseData->privnet = false;
 
         /* Start a new network interface config */
         parseData->type = NULL;
+        parseData->link = NULL;
+        parseData->mac = NULL;
+        parseData->flag = NULL;
 
         /* Keep the new value */
         parseData->type = value->str;
     }
+    else if (STREQ(name, "lxc.network.link"))
+        parseData->link = value->str;
+    else if (STREQ(name, "lxc.network.hwaddr"))
+        parseData->mac = value->str;
+    else if (STREQ(name, "lxc.network.flags"))
+        parseData->flag = value->str;
+
     return 0;
 }
 
 static int
 lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties)
 {
-    lxcNetworkParseData data = {NULL, true, 0};
+    int status;
+    lxcNetworkParseData data = {def, NULL, NULL, NULL, NULL, true, 0};
 
     virConfWalk(properties, lxcNetworkWalkCallback, &data);
 
-    if ((data.type != NULL) && STREQ(data.type, "none"))
-        data.privnet = false;
-    else if ((data.type != NULL) && STRNEQ(data.type, "empty") &&
-                    STRNEQ(data.type, "")) {
+    /* Add the last network definition found */
+    status = lxcAddNetworkDefinition(def, data.type, data.link,
+                                     data.mac, data.flag);
+    if (status < 0)
+        return -1;
+    else if (status > 0)
         data.networks++;
-    }
+    else if (data.type != NULL && STREQ(data.type, "none"))
+        data.privnet = false;
 
     if (data.networks == 0 && data.privnet) {
         /* When no network type is provided LXC only adds loopback */
diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
index fadbdca..75c3b28 100644
--- a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
+++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
@@ -26,5 +26,10 @@
       <target dir='/etc/resolv.conf'/>
       <readonly/>
     </filesystem>
+    <interface type='bridge'>
+      <mac address='02:00:15:8f:05:c1'/>
+      <source bridge='virbr0'/>
+      <link state='up'/>
+    </interface>
   </devices>
 </domain>
-- 
1.8.5.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list