3:48 a.m.
Mixing all completers in one file does not support
maintainability. Separate those completers which relate to
networks (e.g. they complete various network aspects)
into virsh-completer-network.c
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tools/Makefile.am | 1 +
tools/virsh-completer-network.c | 145 ++++++++++++++++++++++++++++++++
tools/virsh-completer-network.h | 35 ++++++++
tools/virsh-completer.c | 119 --------------------------
tools/virsh-completer.h | 13 +--
5 files changed, 182 insertions(+), 131 deletions(-)
create mode 100644 tools/virsh-completer-network.c
create mode 100644 tools/virsh-completer-network.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a86587f200..79e2ea7cd9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -219,6 +219,7 @@ virsh_SOURCES = \
virsh-completer.c virsh-completer.h \
virsh-completer-domain.c virsh-completer-domain.h \
virsh-completer-interface.c virsh-completer-interface.h \
+ virsh-completer-network.c virsh-completer-network.h \
virsh-completer-pool.c virsh-completer-pool.h \
virsh-completer-volume.c virsh-completer-volume.h \
virsh-console.c virsh-console.h \
diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c
new file mode 100644
index 0000000000..6f92780feb
--- /dev/null
+++ b/tools/virsh-completer-network.c
@@ -0,0 +1,145 @@
+/*
+ * virsh-completer-network.c: virsh completer callbacks related to networks
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ */
+
+#include <config.h>
+
+#include "virsh-completer-network.h"
+#include "viralloc.h"
+#include "virsh-network.h"
+#include "virsh.h"
+#include "virstring.h"
+
+char **
+virshNetworkNameCompleter(vshControl *ctl,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ virshControlPtr priv = ctl->privData;
+ virNetworkPtr *nets = NULL;
+ int nnets = 0;
+ size_t i = 0;
+ char **ret = NULL;
+ VIR_AUTOSTRINGLIST tmp = NULL;
+
+ virCheckFlags(VIR_CONNECT_LIST_NETWORKS_INACTIVE |
+ VIR_CONNECT_LIST_NETWORKS_ACTIVE |
+ VIR_CONNECT_LIST_NETWORKS_PERSISTENT,
+ NULL);
+
+ if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+ return NULL;
+
+ if ((nnets = virConnectListAllNetworks(priv->conn, &nets, flags)) < 0)
+ return NULL;
+
+ if (VIR_ALLOC_N(tmp, nnets + 1) < 0)
+ goto cleanup;
+
+ for (i = 0; i < nnets; i++) {
+ const char *name = virNetworkGetName(nets[i]);
+
+ if (VIR_STRDUP(tmp[i], name) < 0)
+ goto cleanup;
+ }
+
+ VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+ for (i = 0; i < nnets; i++)
+ virNetworkFree(nets[i]);
+ VIR_FREE(nets);
+ return ret;
+}
+
+
+char **
+virshNetworkEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ size_t i = 0;
+ char **ret = NULL;
+ VIR_AUTOSTRINGLIST tmp = NULL;
+
+ virCheckFlags(0, NULL);
+
+ if (VIR_ALLOC_N(tmp, VIR_NETWORK_EVENT_ID_LAST + 1) < 0)
+ goto cleanup;
+
+ for (i = 0; i < VIR_NETWORK_EVENT_ID_LAST; i++) {
+ if (VIR_STRDUP(tmp[i], virshNetworkEventCallbacks[i].name) < 0)
+ goto cleanup;
+ }
+
+ VIR_STEAL_PTR(ret, tmp);
+
+ cleanup:
+ return ret;
+}
+
+
+char **
+virshNetworkPortUUIDCompleter(vshControl *ctl,
+ const vshCmd *cmd ATTRIBUTE_UNUSED,
+ unsigned int flags)
+{
+ virshControlPtr priv = ctl->privData;
+ virNetworkPtr net = NULL;
+ virNetworkPortPtr *ports = NULL;
+ int nports = 0;
+ size_t i = 0;
+ char **ret = NULL;
+
+ virCheckFlags(0, NULL);
+
+ if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+ return NULL;
+
+ if (!(net = virshCommandOptNetwork(ctl, cmd, NULL)))
+ return false;
+
+ if ((nports = virNetworkListAllPorts(net, &ports, flags)) < 0)
+ return NULL;
+
+ if (VIR_ALLOC_N(ret, nports + 1) < 0)
+ goto error;
+
+ for (i = 0; i < nports; i++) {
+ char uuid[VIR_UUID_STRING_BUFLEN];
+
+ if (virNetworkPortGetUUIDString(ports[i], uuid) < 0 ||
+ VIR_STRDUP(ret[i], uuid) < 0)
+ goto error;
+
+ virNetworkPortFree(ports[i]);
+ }
+ VIR_FREE(ports);
+
+ return ret;
+
+ error:
+ for (; i < nports; i++)
+ virNetworkPortFree(ports[i]);
+ VIR_FREE(ports);
+ for (i = 0; i < nports; i++)
+ VIR_FREE(ret[i]);
+ VIR_FREE(ret);
+ return NULL;
+}
diff --git a/tools/virsh-completer-network.h b/tools/virsh-completer-network.h
new file mode 100644
index 0000000000..e317e483c1
--- /dev/null
+++ b/tools/virsh-completer-network.h
@@ -0,0 +1,35 @@
+/*
+ * virsh-completer-network.h: virsh completer callbacks related to networks
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ */
+
+#pragma once
+
+#include "vsh.h"
+
+char ** virshNetworkNameCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
+
+char ** virshNetworkEventNameCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
+
+char ** virshNetworkPortUUIDCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 62df752962..108596e24d 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -143,125 +143,6 @@ virshCommaStringListComplete(const char *input,
}
-char **
-virshNetworkNameCompleter(vshControl *ctl,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- virshControlPtr priv = ctl->privData;
- virNetworkPtr *nets = NULL;
- int nnets = 0;
- size_t i = 0;
- char **ret = NULL;
- VIR_AUTOSTRINGLIST tmp = NULL;
-
- virCheckFlags(VIR_CONNECT_LIST_NETWORKS_INACTIVE |
- VIR_CONNECT_LIST_NETWORKS_ACTIVE |
- VIR_CONNECT_LIST_NETWORKS_PERSISTENT,
- NULL);
-
- if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
- return NULL;
-
- if ((nnets = virConnectListAllNetworks(priv->conn, &nets, flags)) < 0)
- return NULL;
-
- if (VIR_ALLOC_N(tmp, nnets + 1) < 0)
- goto cleanup;
-
- for (i = 0; i < nnets; i++) {
- const char *name = virNetworkGetName(nets[i]);
-
- if (VIR_STRDUP(tmp[i], name) < 0)
- goto cleanup;
- }
-
- VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
- for (i = 0; i < nnets; i++)
- virNetworkFree(nets[i]);
- VIR_FREE(nets);
- return ret;
-}
-
-
-char **
-virshNetworkEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- size_t i = 0;
- char **ret = NULL;
- VIR_AUTOSTRINGLIST tmp = NULL;
-
- virCheckFlags(0, NULL);
-
- if (VIR_ALLOC_N(tmp, VIR_NETWORK_EVENT_ID_LAST + 1) < 0)
- goto cleanup;
-
- for (i = 0; i < VIR_NETWORK_EVENT_ID_LAST; i++) {
- if (VIR_STRDUP(tmp[i], virshNetworkEventCallbacks[i].name) < 0)
- goto cleanup;
- }
-
- VIR_STEAL_PTR(ret, tmp);
-
- cleanup:
- return ret;
-}
-
-
-char **
-virshNetworkPortUUIDCompleter(vshControl *ctl,
- const vshCmd *cmd ATTRIBUTE_UNUSED,
- unsigned int flags)
-{
- virshControlPtr priv = ctl->privData;
- virNetworkPtr net = NULL;
- virNetworkPortPtr *ports = NULL;
- int nports = 0;
- size_t i = 0;
- char **ret = NULL;
-
- virCheckFlags(0, NULL);
-
- if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
- return NULL;
-
- if (!(net = virshCommandOptNetwork(ctl, cmd, NULL)))
- return false;
-
- if ((nports = virNetworkListAllPorts(net, &ports, flags)) < 0)
- return NULL;
-
- if (VIR_ALLOC_N(ret, nports + 1) < 0)
- goto error;
-
- for (i = 0; i < nports; i++) {
- char uuid[VIR_UUID_STRING_BUFLEN];
-
- if (virNetworkPortGetUUIDString(ports[i], uuid) < 0 ||
- VIR_STRDUP(ret[i], uuid) < 0)
- goto error;
-
- virNetworkPortFree(ports[i]);
- }
- VIR_FREE(ports);
-
- return ret;
-
- error:
- for (; i < nports; i++)
- virNetworkPortFree(ports[i]);
- VIR_FREE(ports);
- for (i = 0; i < nports; i++)
- VIR_FREE(ret[i]);
- VIR_FREE(ret);
- return NULL;
-}
-
-
char **
virshNodeDeviceNameCompleter(vshControl *ctl,
const vshCmd *cmd ATTRIBUTE_UNUSED,
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 6170a87757..d4784105c1 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -24,24 +24,13 @@
#include "virsh-completer-domain.h"
#include "virsh-completer-interface.h"
+#include "virsh-completer-network.h"
#include "virsh-completer-pool.h"
#include "virsh-completer-volume.h"
char ** virshCommaStringListComplete(const char *input,
const char **options);
-char ** virshNetworkNameCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
-char ** virshNetworkEventNameCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
-char ** virshNetworkPortUUIDCompleter(vshControl *ctl,
- const vshCmd *cmd,
- unsigned int flags);
-
char ** virshNodeDeviceNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
--
2.21.0