virsh: Add mac completion to net-dhcp-leases command

Signed-off-by: Lin Ma <lma@suse.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c
index 73f7115ab28b1f1b656928d859da712d70bf3d72..3094b9d5d628f0eba68f2192b8fb4e3f952b1a20 100644 (file)
--- a/tools/virsh-completer-network.c
+++ b/tools/virsh-completer-network.c
@@ -174,3 +174,47 @@ virshNetworkUUIDCompleter(vshControl *ctl,
     g_free(nets);
     return ret;
 }
+
+
+char **
+virshNetworkDhcpMacCompleter(vshControl *ctl,
+                             const vshCmd *cmd,
+                             unsigned int flags)
+{
+    virshControlPtr priv = ctl->privData;
+    virNetworkDHCPLeasePtr *leases = NULL;
+    virNetworkPtr network = NULL;
+    int nleases;
+    size_t i = 0;
+    char **ret = NULL;
+    VIR_AUTOSTRINGLIST tmp = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+        return NULL;
+
+    if (!(network = virshCommandOptNetwork(ctl, cmd, NULL)))
+        return NULL;
+
+    if ((nleases = virNetworkGetDHCPLeases(network, NULL, &leases, flags)) < 0)
+        goto cleanup;
+
+    tmp = g_new0(char *, nleases + 1);
+
+    for (i = 0; i < nleases; i++) {
+        virNetworkDHCPLeasePtr lease = leases[i];
+        tmp[i] = g_strdup(lease->mac);
+    }
+
+    ret = g_steal_pointer(&tmp);
+
+ cleanup:
+    if (leases) {
+        for (i = 0; i < nleases; i++)
+            virNetworkDHCPLeaseFree(leases[i]);
+        VIR_FREE(leases);
+    }
+    virNetworkFree(network);
+    return ret;
+}

diff --git a/tools/virsh-completer-network.h b/tools/virsh-completer-network.h
index 8910e4525cf48179afb021e507985b2ff9a4a892..80df5c468ea370495f9ae8938086ebb82a729dd4 100644 (file)
--- a/tools/virsh-completer-network.h
+++ b/tools/virsh-completer-network.h
@@ -37,3 +37,7 @@ char ** virshNetworkPortUUIDCompleter(vshControl *ctl,
 char ** virshNetworkUUIDCompleter(vshControl *ctl,
                                   const vshCmd *cmd,
                                   unsigned int flags);
+
+char ** virshNetworkDhcpMacCompleter(vshControl *ctl,
+                                     const vshCmd *cmd,
+                                     unsigned int flags);

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 745afc537d00d8332ab1d5182b1443854f171196..9e3b31a60c22047286fbf66c3b16f17df649f761 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -1376,7 +1376,8 @@ static const vshCmdOptDef opts_network_dhcp_leases[] = {
     {.name = "mac",
      .type = VSH_OT_STRING,
      .flags = VSH_OFLAG_NONE,
-     .help = N_("MAC address")
+     .help = N_("MAC address"),
+     .completer = virshNetworkDhcpMacCompleter,
     },
     {.name = NULL}
 };