2012-07-23 06:02:14 +00:00
|
|
|
/*
|
|
|
|
* virsh-network.c: Commands to manage network
|
|
|
|
*
|
2016-01-09 13:36:26 +00:00
|
|
|
* Copyright (C) 2005, 2007-2016 Red Hat, Inc.
|
2012-07-23 06:02:14 +00:00
|
|
|
*
|
|
|
|
* 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
|
2012-09-20 22:30:55 +00:00
|
|
|
* License along with this library. If not, see
|
2012-07-23 06:02:14 +00:00
|
|
|
* <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
* Daniel Veillard <veillard@redhat.com>
|
|
|
|
* Karel Zak <kzak@redhat.com>
|
|
|
|
* Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2012-08-20 21:43:25 +00:00
|
|
|
#include <config.h>
|
|
|
|
#include "virsh-network.h"
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2012-08-20 21:43:25 +00:00
|
|
|
#include "internal.h"
|
2012-12-04 12:04:07 +00:00
|
|
|
#include "virbuffer.h"
|
2012-12-12 18:06:53 +00:00
|
|
|
#include "viralloc.h"
|
2013-05-09 18:59:04 +00:00
|
|
|
#include "virfile.h"
|
2015-04-01 15:09:04 +00:00
|
|
|
#include "virstring.h"
|
2016-01-08 10:50:55 +00:00
|
|
|
#include "virtime.h"
|
2012-09-04 15:55:20 +00:00
|
|
|
#include "conf/network_conf.h"
|
2012-08-20 21:43:25 +00:00
|
|
|
|
2018-05-15 11:18:21 +00:00
|
|
|
#define VIRSH_COMMON_OPT_NETWORK(_helpstr, cflags) \
|
2017-11-03 12:09:47 +00:00
|
|
|
{.name = "network", \
|
|
|
|
.type = VSH_OT_DATA, \
|
|
|
|
.flags = VSH_OFLAG_REQ, \
|
2018-05-15 11:18:21 +00:00
|
|
|
.help = _helpstr, \
|
2018-01-12 13:35:40 +00:00
|
|
|
.completer = virshNetworkNameCompleter, \
|
|
|
|
.completer_flags = cflags, \
|
2017-10-31 10:47:36 +00:00
|
|
|
}
|
2016-01-09 13:36:34 +00:00
|
|
|
|
2018-05-15 11:18:21 +00:00
|
|
|
#define VIRSH_COMMON_OPT_NETWORK_FULL(cflags) \
|
|
|
|
VIRSH_COMMON_OPT_NETWORK(N_("network name or uuid"), cflags)
|
|
|
|
|
2018-05-15 11:10:35 +00:00
|
|
|
#define VIRSH_COMMON_OPT_NETWORK_OT_STRING(_helpstr, cflags) \
|
|
|
|
{.name = "network", \
|
|
|
|
.type = VSH_OT_STRING, \
|
|
|
|
.help = _helpstr, \
|
|
|
|
.completer = virshNetworkNameCompleter, \
|
|
|
|
.completer_flags = cflags, \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define VIRSH_COMMON_OPT_NETWORK_OT_STRING_FULL(cflags) \
|
|
|
|
VIRSH_COMMON_OPT_NETWORK_OT_STRING(N_("network name or uuid"), cflags)
|
|
|
|
|
2012-08-20 21:43:25 +00:00
|
|
|
virNetworkPtr
|
2015-06-15 16:53:58 +00:00
|
|
|
virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd,
|
|
|
|
const char **name, unsigned int flags)
|
2012-07-23 06:02:14 +00:00
|
|
|
{
|
|
|
|
virNetworkPtr network = NULL;
|
|
|
|
const char *n = NULL;
|
|
|
|
const char *optname = "network";
|
2015-06-15 16:53:58 +00:00
|
|
|
virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL);
|
|
|
|
virshControlPtr priv = ctl->privData;
|
2012-08-20 21:43:25 +00:00
|
|
|
|
2013-01-21 16:22:17 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0)
|
2012-07-23 06:02:14 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n",
|
|
|
|
cmd->def->name, optname, n);
|
|
|
|
|
|
|
|
if (name)
|
|
|
|
*name = n;
|
|
|
|
|
|
|
|
/* try it by UUID */
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((flags & VIRSH_BYUUID) && strlen(n) == VIR_UUID_STRING_BUFLEN-1) {
|
2012-07-23 06:02:14 +00:00
|
|
|
vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as network UUID\n",
|
|
|
|
cmd->def->name, optname);
|
2015-06-15 16:53:58 +00:00
|
|
|
network = virNetworkLookupByUUIDString(priv->conn, n);
|
2012-07-23 06:02:14 +00:00
|
|
|
}
|
|
|
|
/* try it by NAME */
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!network && (flags & VIRSH_BYNAME)) {
|
2012-07-23 06:02:14 +00:00
|
|
|
vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as network NAME\n",
|
|
|
|
cmd->def->name, optname);
|
2015-06-15 16:53:58 +00:00
|
|
|
network = virNetworkLookupByName(priv->conn, n);
|
2012-07-23 06:02:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!network)
|
|
|
|
vshError(ctl, _("failed to get network '%s'"), n);
|
|
|
|
|
|
|
|
return network;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-autostart" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_autostart[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("autostart a network")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Configure a network to be automatically started at boot.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_autostart[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(VIR_CONNECT_LIST_NETWORKS_PERSISTENT),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = "disable",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("disable autostarting")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
const char *name;
|
|
|
|
int autostart;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, &name)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
autostart = !vshCommandOptBool(cmd, "disable");
|
|
|
|
|
|
|
|
if (virNetworkSetAutostart(network, autostart) < 0) {
|
|
|
|
if (autostart)
|
|
|
|
vshError(ctl, _("failed to mark network %s as autostarted"), name);
|
|
|
|
else
|
|
|
|
vshError(ctl, _("failed to unmark network %s as autostarted"), name);
|
|
|
|
virNetworkFree(network);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (autostart)
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s marked as autostarted\n"), name);
|
2012-07-23 06:02:14 +00:00
|
|
|
else
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s unmarked as autostarted\n"), name);
|
2012-07-23 06:02:14 +00:00
|
|
|
|
|
|
|
virNetworkFree(network);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-create" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_create[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("create a network from an XML file")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Create a network.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_create[] = {
|
2016-01-09 13:36:29 +00:00
|
|
|
VIRSH_COMMON_OPT_FILE(N_("file containing an XML network description")),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
const char *from = NULL;
|
|
|
|
bool ret = true;
|
|
|
|
char *buffer;
|
2015-06-15 16:53:58 +00:00
|
|
|
virshControlPtr priv = ctl->privData;
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2013-01-21 16:22:17 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
virsh: use common namespacing
Convert the exported items in virsh.h to use a common 'vsh' prefix.
* tools/virsh.h (VIRSH_MAX_XML_FILE): Rename...
(VSH_MAX_XML_FILE): ...and parenthesize.
(DIFF_MSEC, CTRL_CLOSE_BRACKET): Delete.
(vshUsage, vshInit, vshDeinit, vshParseArgv): Remove prototype.
(editWriteToTempFile, editFile, editReadBackFile, prettyCapacity)
(virshReportError): Rename...
(vshEditWriteToTempFile, vshEditFile, vshEditReadBackFile)
(vshPrettyCapacity, vshReportError): ...into vsh namespace.
(jobWatchTimeoutFunc): Move to virsh-domain.c.
* tools/virsh.c (vshCommandRun): Inline former DIFF_MSEC.
(main): Inline former CTRL_CLOSE_BRACKET.
(vshUsage, vshInit, vshDeinit, vshParseArgv): Make static.
(prettyCapacity, virshReportError, editWriteToTempFile, editFile):
Fix naming, and adjust usage.
(vshAskReedit, vshCommandRun, vshEventLoop, vshInit): Adjust
usage.
* tools/virsh-domain.c (cmdAttachDevice, cmdCPUCompare)
(cmdCPUBaseline, cmdCreate, cmdDefine, cmdDetachDevice)
(cmdUpdateDevice, cmdDesc, cmdUndefine, cmdStart, cmdVcpucount)
(cmdAttachDevice, cmdDomjobinfo): Likewise.
* tools/virsh-edit.c (do): Likewise.
* tools/virsh-interface.c (cmdInterfaceDefine): Likewise.
* tools/virsh-network.c (cmdNetworkCreate, cmdNetworkDefine):
Likewise.
* tools/virsh-nodedev.c (cmdNodeDeviceCreate): Likewise.
* tools/virsh-nwfilter.c (cmdNWFilterDefine): Likewise.
* tools/virsh-pool.c (cmdPoolCreate, cmdPoolDefine)
(cmdPoolDiscoverSources, cmdPoolList): Likewise.
* tools/virsh-secret.c (cmdSecretDefine): Likewise.
* tools/virsh-snapshot.c (cmdSnapshotCreate, vshSnapshotCreate)
(vshLookupSnapshot, cmdSnapshotEdit, cmdSnapshotCurrent)
(vshGetSnapshotParent): Likewise.
* tools/virsh-volume.c (cmdVolCreate, cmdVolCreateFrom)
(cmdVolInfo, cmdVolList): Likewise.
2012-08-19 04:10:17 +00:00
|
|
|
if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0)
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
network = virNetworkCreateXML(priv->conn, buffer);
|
2012-07-23 06:02:14 +00:00
|
|
|
VIR_FREE(buffer);
|
|
|
|
|
|
|
|
if (network != NULL) {
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s created from %s\n"),
|
|
|
|
virNetworkGetName(network), from);
|
2012-07-23 06:02:14 +00:00
|
|
|
virNetworkFree(network);
|
|
|
|
} else {
|
|
|
|
vshError(ctl, _("Failed to create network from %s"), from);
|
|
|
|
ret = false;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-define" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_define[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
2015-02-25 15:01:09 +00:00
|
|
|
.data = N_("define an inactive persistent virtual network or modify "
|
|
|
|
"an existing persistent one from an XML file")
|
2013-02-07 15:25:10 +00:00
|
|
|
},
|
|
|
|
{.name = "desc",
|
2015-02-25 15:01:09 +00:00
|
|
|
.data = N_("Define or modify a persistent virtual network.")
|
2013-02-07 15:25:10 +00:00
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_define[] = {
|
2016-01-09 13:36:29 +00:00
|
|
|
VIRSH_COMMON_OPT_FILE(N_("file containing an XML network description")),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
const char *from = NULL;
|
|
|
|
bool ret = true;
|
|
|
|
char *buffer;
|
2015-06-15 16:53:58 +00:00
|
|
|
virshControlPtr priv = ctl->privData;
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2013-01-21 16:22:17 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
virsh: use common namespacing
Convert the exported items in virsh.h to use a common 'vsh' prefix.
* tools/virsh.h (VIRSH_MAX_XML_FILE): Rename...
(VSH_MAX_XML_FILE): ...and parenthesize.
(DIFF_MSEC, CTRL_CLOSE_BRACKET): Delete.
(vshUsage, vshInit, vshDeinit, vshParseArgv): Remove prototype.
(editWriteToTempFile, editFile, editReadBackFile, prettyCapacity)
(virshReportError): Rename...
(vshEditWriteToTempFile, vshEditFile, vshEditReadBackFile)
(vshPrettyCapacity, vshReportError): ...into vsh namespace.
(jobWatchTimeoutFunc): Move to virsh-domain.c.
* tools/virsh.c (vshCommandRun): Inline former DIFF_MSEC.
(main): Inline former CTRL_CLOSE_BRACKET.
(vshUsage, vshInit, vshDeinit, vshParseArgv): Make static.
(prettyCapacity, virshReportError, editWriteToTempFile, editFile):
Fix naming, and adjust usage.
(vshAskReedit, vshCommandRun, vshEventLoop, vshInit): Adjust
usage.
* tools/virsh-domain.c (cmdAttachDevice, cmdCPUCompare)
(cmdCPUBaseline, cmdCreate, cmdDefine, cmdDetachDevice)
(cmdUpdateDevice, cmdDesc, cmdUndefine, cmdStart, cmdVcpucount)
(cmdAttachDevice, cmdDomjobinfo): Likewise.
* tools/virsh-edit.c (do): Likewise.
* tools/virsh-interface.c (cmdInterfaceDefine): Likewise.
* tools/virsh-network.c (cmdNetworkCreate, cmdNetworkDefine):
Likewise.
* tools/virsh-nodedev.c (cmdNodeDeviceCreate): Likewise.
* tools/virsh-nwfilter.c (cmdNWFilterDefine): Likewise.
* tools/virsh-pool.c (cmdPoolCreate, cmdPoolDefine)
(cmdPoolDiscoverSources, cmdPoolList): Likewise.
* tools/virsh-secret.c (cmdSecretDefine): Likewise.
* tools/virsh-snapshot.c (cmdSnapshotCreate, vshSnapshotCreate)
(vshLookupSnapshot, cmdSnapshotEdit, cmdSnapshotCurrent)
(vshGetSnapshotParent): Likewise.
* tools/virsh-volume.c (cmdVolCreate, cmdVolCreateFrom)
(cmdVolInfo, cmdVolList): Likewise.
2012-08-19 04:10:17 +00:00
|
|
|
if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0)
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
network = virNetworkDefineXML(priv->conn, buffer);
|
2012-07-23 06:02:14 +00:00
|
|
|
VIR_FREE(buffer);
|
|
|
|
|
|
|
|
if (network != NULL) {
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s defined from %s\n"),
|
|
|
|
virNetworkGetName(network), from);
|
2012-07-23 06:02:14 +00:00
|
|
|
virNetworkFree(network);
|
|
|
|
} else {
|
|
|
|
vshError(ctl, _("Failed to define network from %s"), from);
|
|
|
|
ret = false;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-destroy" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_destroy[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("destroy (stop) a network")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Forcefully stop a given network.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_destroy[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(VIR_CONNECT_LIST_NETWORKS_ACTIVE),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
bool ret = true;
|
|
|
|
const char *name;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, &name)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if (virNetworkDestroy(network) == 0) {
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s destroyed\n"), name);
|
2012-07-23 06:02:14 +00:00
|
|
|
} else {
|
|
|
|
vshError(ctl, _("Failed to destroy network %s"), name);
|
|
|
|
ret = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
virNetworkFree(network);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-dumpxml" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_dumpxml[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("network information in XML")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Output the network information as an XML dump to stdout.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_dumpxml[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(0),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = "inactive",
|
|
|
|
.type = VSH_OT_BOOL,
|
2016-06-15 06:54:40 +00:00
|
|
|
.help = N_("show inactive defined XML")
|
2013-01-14 14:28:17 +00:00
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
bool ret = true;
|
|
|
|
char *dump;
|
|
|
|
unsigned int flags = 0;
|
|
|
|
int inactive;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, NULL)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
inactive = vshCommandOptBool(cmd, "inactive");
|
|
|
|
if (inactive)
|
|
|
|
flags |= VIR_NETWORK_XML_INACTIVE;
|
|
|
|
|
|
|
|
dump = virNetworkGetXMLDesc(network, flags);
|
|
|
|
|
|
|
|
if (dump != NULL) {
|
|
|
|
vshPrint(ctl, "%s", dump);
|
|
|
|
VIR_FREE(dump);
|
|
|
|
} else {
|
|
|
|
ret = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
virNetworkFree(network);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-info" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_info[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("network information")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Returns basic information about the network")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_info[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(0),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
char uuid[VIR_UUID_STRING_BUFLEN];
|
|
|
|
int autostart;
|
|
|
|
int persistent = -1;
|
|
|
|
int active = -1;
|
|
|
|
char *bridge = NULL;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, NULL)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
2013-11-19 06:20:57 +00:00
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Name:"), virNetworkGetName(network));
|
2012-07-23 06:02:14 +00:00
|
|
|
|
|
|
|
if (virNetworkGetUUIDString(network, uuid) == 0)
|
2013-11-19 06:20:57 +00:00
|
|
|
vshPrint(ctl, "%-15s %s\n", _("UUID:"), uuid);
|
2012-07-23 06:02:14 +00:00
|
|
|
|
|
|
|
active = virNetworkIsActive(network);
|
|
|
|
if (active >= 0)
|
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Active:"), active? _("yes") : _("no"));
|
|
|
|
|
|
|
|
persistent = virNetworkIsPersistent(network);
|
|
|
|
if (persistent < 0)
|
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Persistent:"), _("unknown"));
|
|
|
|
else
|
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Persistent:"), persistent ? _("yes") : _("no"));
|
|
|
|
|
|
|
|
if (virNetworkGetAutostart(network, &autostart) < 0)
|
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Autostart:"), _("no autostart"));
|
|
|
|
else
|
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Autostart:"), autostart ? _("yes") : _("no"));
|
|
|
|
|
|
|
|
bridge = virNetworkGetBridgeName(network);
|
|
|
|
if (bridge)
|
|
|
|
vshPrint(ctl, "%-15s %s\n", _("Bridge:"), bridge);
|
|
|
|
|
|
|
|
VIR_FREE(bridge);
|
|
|
|
virNetworkFree(network);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-09-04 15:55:20 +00:00
|
|
|
static int
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkSorter(const void *a, const void *b)
|
2012-09-04 15:55:20 +00:00
|
|
|
{
|
|
|
|
virNetworkPtr *na = (virNetworkPtr *) a;
|
|
|
|
virNetworkPtr *nb = (virNetworkPtr *) b;
|
|
|
|
|
|
|
|
if (*na && !*nb)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (!*na)
|
|
|
|
return *nb != NULL;
|
|
|
|
|
|
|
|
return vshStrcasecmp(virNetworkGetName(*na),
|
|
|
|
virNetworkGetName(*nb));
|
|
|
|
}
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
struct virshNetworkList {
|
2012-09-04 15:55:20 +00:00
|
|
|
virNetworkPtr *nets;
|
|
|
|
size_t nnets;
|
|
|
|
};
|
2015-06-15 16:53:58 +00:00
|
|
|
typedef struct virshNetworkList *virshNetworkListPtr;
|
2012-09-04 15:55:20 +00:00
|
|
|
|
|
|
|
static void
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkListFree(virshNetworkListPtr list)
|
2012-09-04 15:55:20 +00:00
|
|
|
{
|
Convert 'int i' to 'size_t i' in tools/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2012-09-04 15:55:20 +00:00
|
|
|
|
2013-08-27 11:27:50 +00:00
|
|
|
if (list && list->nets) {
|
2012-09-04 15:55:20 +00:00
|
|
|
for (i = 0; i < list->nnets; i++) {
|
|
|
|
if (list->nets[i])
|
|
|
|
virNetworkFree(list->nets[i]);
|
|
|
|
}
|
|
|
|
VIR_FREE(list->nets);
|
|
|
|
}
|
|
|
|
VIR_FREE(list);
|
|
|
|
}
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
static virshNetworkListPtr
|
|
|
|
virshNetworkListCollect(vshControl *ctl,
|
|
|
|
unsigned int flags)
|
2012-09-04 15:55:20 +00:00
|
|
|
{
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkListPtr list = vshMalloc(ctl, sizeof(*list));
|
Convert 'int i' to 'size_t i' in tools/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2012-09-04 15:55:20 +00:00
|
|
|
int ret;
|
|
|
|
char **names = NULL;
|
|
|
|
virNetworkPtr net;
|
|
|
|
bool success = false;
|
|
|
|
size_t deleted = 0;
|
|
|
|
int persistent;
|
|
|
|
int autostart;
|
|
|
|
int nActiveNets = 0;
|
|
|
|
int nInactiveNets = 0;
|
|
|
|
int nAllNets = 0;
|
2015-06-15 16:53:58 +00:00
|
|
|
virshControlPtr priv = ctl->privData;
|
2012-09-04 15:55:20 +00:00
|
|
|
|
2012-09-13 08:56:07 +00:00
|
|
|
/* try the list with flags support (0.10.2 and later) */
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((ret = virConnectListAllNetworks(priv->conn,
|
2012-09-04 15:55:20 +00:00
|
|
|
&list->nets,
|
|
|
|
flags)) >= 0) {
|
|
|
|
list->nnets = ret;
|
|
|
|
goto finished;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check if the command is actually supported */
|
2012-09-13 08:56:07 +00:00
|
|
|
if (last_error && last_error->code == VIR_ERR_NO_SUPPORT)
|
2012-09-04 15:55:20 +00:00
|
|
|
goto fallback;
|
|
|
|
|
|
|
|
if (last_error && last_error->code == VIR_ERR_INVALID_ARG) {
|
|
|
|
/* try the new API again but mask non-guaranteed flags */
|
|
|
|
unsigned int newflags = flags & (VIR_CONNECT_LIST_NETWORKS_ACTIVE |
|
|
|
|
VIR_CONNECT_LIST_NETWORKS_INACTIVE);
|
|
|
|
|
|
|
|
vshResetLibvirtError();
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((ret = virConnectListAllNetworks(priv->conn, &list->nets,
|
2012-09-04 15:55:20 +00:00
|
|
|
newflags)) >= 0) {
|
|
|
|
list->nnets = ret;
|
|
|
|
goto filter;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* there was an error during the first or second call */
|
|
|
|
vshError(ctl, "%s", _("Failed to list networks"));
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
2014-03-25 06:53:59 +00:00
|
|
|
fallback:
|
2012-09-13 08:56:07 +00:00
|
|
|
/* fall back to old method (0.10.1 and older) */
|
2012-09-04 15:55:20 +00:00
|
|
|
vshResetLibvirtError();
|
|
|
|
|
|
|
|
/* Get the number of active networks */
|
2012-09-11 10:48:19 +00:00
|
|
|
if (!VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) ||
|
|
|
|
VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE)) {
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((nActiveNets = virConnectNumOfNetworks(priv->conn)) < 0) {
|
2012-09-04 15:55:20 +00:00
|
|
|
vshError(ctl, "%s", _("Failed to get the number of active networks"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the number of inactive networks */
|
2012-09-11 10:48:19 +00:00
|
|
|
if (!VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) ||
|
|
|
|
VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_INACTIVE)) {
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((nInactiveNets = virConnectNumOfDefinedNetworks(priv->conn)) < 0) {
|
2012-09-04 15:55:20 +00:00
|
|
|
vshError(ctl, "%s", _("Failed to get the number of inactive networks"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
nAllNets = nActiveNets + nInactiveNets;
|
|
|
|
|
|
|
|
if (nAllNets == 0)
|
|
|
|
return list;
|
|
|
|
|
|
|
|
names = vshMalloc(ctl, sizeof(char *) * nAllNets);
|
|
|
|
|
|
|
|
/* Retrieve a list of active network names */
|
2012-09-11 10:48:19 +00:00
|
|
|
if (!VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) ||
|
|
|
|
VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE)) {
|
2015-06-15 16:53:58 +00:00
|
|
|
if (virConnectListNetworks(priv->conn,
|
2012-09-04 15:55:20 +00:00
|
|
|
names, nActiveNets) < 0) {
|
|
|
|
vshError(ctl, "%s", _("Failed to list active networks"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the inactive networks to the end of the name list */
|
2012-09-11 10:48:19 +00:00
|
|
|
if (!VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE) ||
|
|
|
|
VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_ACTIVE)) {
|
2015-06-15 16:53:58 +00:00
|
|
|
if (virConnectListDefinedNetworks(priv->conn,
|
2012-09-04 15:55:20 +00:00
|
|
|
&names[nActiveNets],
|
|
|
|
nInactiveNets) < 0) {
|
|
|
|
vshError(ctl, "%s", _("Failed to list inactive networks"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
list->nets = vshMalloc(ctl, sizeof(virNetworkPtr) * (nAllNets));
|
|
|
|
list->nnets = 0;
|
|
|
|
|
|
|
|
/* get active networks */
|
|
|
|
for (i = 0; i < nActiveNets; i++) {
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(net = virNetworkLookupByName(priv->conn, names[i])))
|
2012-09-04 15:55:20 +00:00
|
|
|
continue;
|
|
|
|
list->nets[list->nnets++] = net;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get inactive networks */
|
|
|
|
for (i = 0; i < nInactiveNets; i++) {
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(net = virNetworkLookupByName(priv->conn, names[i])))
|
2012-09-04 15:55:20 +00:00
|
|
|
continue;
|
|
|
|
list->nets[list->nnets++] = net;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* truncate networks that weren't found */
|
|
|
|
deleted = nAllNets - list->nnets;
|
|
|
|
|
2014-03-25 06:53:59 +00:00
|
|
|
filter:
|
2012-09-04 15:55:20 +00:00
|
|
|
/* filter list the list if the list was acquired by fallback means */
|
|
|
|
for (i = 0; i < list->nnets; i++) {
|
|
|
|
net = list->nets[i];
|
|
|
|
|
|
|
|
/* persistence filter */
|
2012-09-11 10:48:19 +00:00
|
|
|
if (VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT)) {
|
2012-09-04 15:55:20 +00:00
|
|
|
if ((persistent = virNetworkIsPersistent(net)) < 0) {
|
|
|
|
vshError(ctl, "%s", _("Failed to get network persistence info"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2012-09-11 10:48:19 +00:00
|
|
|
if (!((VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_PERSISTENT) && persistent) ||
|
|
|
|
(VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_TRANSIENT) && !persistent)))
|
2012-09-04 15:55:20 +00:00
|
|
|
goto remove_entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* autostart filter */
|
2012-09-11 10:48:19 +00:00
|
|
|
if (VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART)) {
|
2012-09-04 15:55:20 +00:00
|
|
|
if (virNetworkGetAutostart(net, &autostart) < 0) {
|
|
|
|
vshError(ctl, "%s", _("Failed to get network autostart state"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2012-09-11 10:48:19 +00:00
|
|
|
if (!((VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_AUTOSTART) && autostart) ||
|
|
|
|
(VSH_MATCH(VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART) && !autostart)))
|
2012-09-04 15:55:20 +00:00
|
|
|
goto remove_entry;
|
|
|
|
}
|
|
|
|
/* the pool matched all filters, it may stay */
|
|
|
|
continue;
|
|
|
|
|
2014-03-25 06:53:59 +00:00
|
|
|
remove_entry:
|
2012-09-04 15:55:20 +00:00
|
|
|
/* the pool has to be removed as it failed one of the filters */
|
|
|
|
virNetworkFree(list->nets[i]);
|
|
|
|
list->nets[i] = NULL;
|
|
|
|
deleted++;
|
|
|
|
}
|
|
|
|
|
2014-03-25 06:53:59 +00:00
|
|
|
finished:
|
2012-09-04 15:55:20 +00:00
|
|
|
/* sort the list */
|
|
|
|
if (list->nets && list->nnets)
|
|
|
|
qsort(list->nets, list->nnets,
|
2015-06-15 16:53:58 +00:00
|
|
|
sizeof(*list->nets), virshNetworkSorter);
|
2012-09-04 15:55:20 +00:00
|
|
|
|
|
|
|
/* truncate the list if filter simulation deleted entries */
|
|
|
|
if (deleted)
|
|
|
|
VIR_SHRINK_N(list->nets, list->nnets, deleted);
|
|
|
|
|
|
|
|
success = true;
|
|
|
|
|
2014-03-25 06:53:59 +00:00
|
|
|
cleanup:
|
2012-09-04 15:55:20 +00:00
|
|
|
for (i = 0; i < nAllNets; i++)
|
|
|
|
VIR_FREE(names[i]);
|
|
|
|
VIR_FREE(names);
|
|
|
|
|
|
|
|
if (!success) {
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkListFree(list);
|
2012-09-04 15:55:20 +00:00
|
|
|
list = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2012-07-23 06:02:14 +00:00
|
|
|
/*
|
|
|
|
* "net-list" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_list[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("list networks")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Returns list of networks.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_list[] = {
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = "inactive",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list inactive networks")
|
|
|
|
},
|
|
|
|
{.name = "all",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list inactive & active networks")
|
|
|
|
},
|
|
|
|
{.name = "persistent",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list persistent networks")
|
|
|
|
},
|
|
|
|
{.name = "transient",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list transient networks")
|
|
|
|
},
|
|
|
|
{.name = "autostart",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list networks with autostart enabled")
|
|
|
|
},
|
|
|
|
{.name = "no-autostart",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list networks with autostart disabled")
|
|
|
|
},
|
2015-06-08 14:13:28 +00:00
|
|
|
{.name = "uuid",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list uuid's only")
|
|
|
|
},
|
|
|
|
{.name = "name",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list network names only")
|
|
|
|
},
|
|
|
|
{.name = "table",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list table (default)")
|
|
|
|
},
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
2017-11-03 12:09:47 +00:00
|
|
|
#define FILTER(NAME, FLAG) \
|
|
|
|
if (vshCommandOptBool(cmd, NAME)) \
|
2015-06-08 14:13:14 +00:00
|
|
|
flags |= (FLAG)
|
2012-07-23 06:02:14 +00:00
|
|
|
static bool
|
|
|
|
cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkListPtr list = NULL;
|
Convert 'int i' to 'size_t i' in tools/ files
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-07-08 14:09:33 +00:00
|
|
|
size_t i;
|
2015-06-08 14:13:28 +00:00
|
|
|
bool ret = false;
|
|
|
|
bool optName = vshCommandOptBool(cmd, "name");
|
|
|
|
bool optTable = vshCommandOptBool(cmd, "table");
|
|
|
|
bool optUUID = vshCommandOptBool(cmd, "uuid");
|
|
|
|
char uuid[VIR_UUID_STRING_BUFLEN];
|
2012-09-04 15:55:20 +00:00
|
|
|
unsigned int flags = VIR_CONNECT_LIST_NETWORKS_ACTIVE;
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2015-06-08 14:13:14 +00:00
|
|
|
if (vshCommandOptBool(cmd, "inactive"))
|
2012-09-04 15:55:20 +00:00
|
|
|
flags = VIR_CONNECT_LIST_NETWORKS_INACTIVE;
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2015-06-08 14:13:14 +00:00
|
|
|
if (vshCommandOptBool(cmd, "all"))
|
2012-09-04 15:55:20 +00:00
|
|
|
flags = VIR_CONNECT_LIST_NETWORKS_ACTIVE |
|
|
|
|
VIR_CONNECT_LIST_NETWORKS_INACTIVE;
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2015-06-08 14:13:14 +00:00
|
|
|
FILTER("persistent", VIR_CONNECT_LIST_NETWORKS_PERSISTENT);
|
|
|
|
FILTER("transient", VIR_CONNECT_LIST_NETWORKS_TRANSIENT);
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2015-06-08 14:13:14 +00:00
|
|
|
FILTER("autostart", VIR_CONNECT_LIST_NETWORKS_AUTOSTART);
|
|
|
|
FILTER("no-autostart", VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART);
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2015-06-08 14:13:28 +00:00
|
|
|
if (optTable + optName + optUUID > 1) {
|
|
|
|
vshError(ctl, "%s",
|
|
|
|
_("Only one argument from --table, --name and --uuid "
|
|
|
|
"may be specified."));
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!optUUID && !optName)
|
|
|
|
optTable = true;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(list = virshNetworkListCollect(ctl, flags)))
|
2012-09-04 15:55:20 +00:00
|
|
|
return false;
|
|
|
|
|
2015-06-08 14:13:28 +00:00
|
|
|
if (optTable) {
|
|
|
|
vshPrintExtra(ctl, " %-20s %-10s %-13s %s\n", _("Name"), _("State"),
|
|
|
|
_("Autostart"), _("Persistent"));
|
|
|
|
vshPrintExtra(ctl,
|
|
|
|
"----------------------------------------------------------\n");
|
|
|
|
}
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2012-09-04 15:55:20 +00:00
|
|
|
for (i = 0; i < list->nnets; i++) {
|
|
|
|
virNetworkPtr network = list->nets[i];
|
|
|
|
const char *autostartStr;
|
|
|
|
int is_autostart = 0;
|
|
|
|
|
2015-06-08 14:13:28 +00:00
|
|
|
if (optTable) {
|
|
|
|
if (virNetworkGetAutostart(network, &is_autostart) < 0)
|
|
|
|
autostartStr = _("no autostart");
|
|
|
|
else
|
|
|
|
autostartStr = is_autostart ? _("yes") : _("no");
|
|
|
|
|
|
|
|
vshPrint(ctl, " %-20s %-10s %-13s %s\n",
|
|
|
|
virNetworkGetName(network),
|
|
|
|
virNetworkIsActive(network) ? _("active") : _("inactive"),
|
|
|
|
autostartStr,
|
|
|
|
virNetworkIsPersistent(network) ? _("yes") : _("no"));
|
|
|
|
} else if (optUUID) {
|
|
|
|
if (virNetworkGetUUIDString(network, uuid) < 0) {
|
|
|
|
vshError(ctl, "%s", _("Failed to get network's UUID"));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
vshPrint(ctl, "%s\n", uuid);
|
|
|
|
} else if (optName) {
|
|
|
|
vshPrint(ctl, "%s\n", virNetworkGetName(network));
|
|
|
|
}
|
2012-07-23 06:02:14 +00:00
|
|
|
}
|
2012-09-04 15:55:20 +00:00
|
|
|
|
2015-06-08 14:13:28 +00:00
|
|
|
ret = true;
|
|
|
|
cleanup:
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkListFree(list);
|
2015-06-08 14:13:28 +00:00
|
|
|
return ret;
|
2012-07-23 06:02:14 +00:00
|
|
|
}
|
2015-06-08 14:13:14 +00:00
|
|
|
#undef FILTER
|
2012-07-23 06:02:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-name" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_name[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("convert a network UUID to network name")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = ""
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_name[] = {
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = "network",
|
|
|
|
.type = VSH_OT_DATA,
|
|
|
|
.flags = VSH_OFLAG_REQ,
|
|
|
|
.help = N_("network uuid")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkName(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetworkBy(ctl, cmd, NULL,
|
|
|
|
VIRSH_BYUUID)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
vshPrint(ctl, "%s\n", virNetworkGetName(network));
|
|
|
|
virNetworkFree(network);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-start" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_start[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("start a (previously defined) inactive network")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Start a network.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_start[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(VIR_CONNECT_LIST_NETWORKS_INACTIVE),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkStart(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
bool ret = true;
|
|
|
|
const char *name = NULL;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, &name)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if (virNetworkCreate(network) == 0) {
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s started\n"), name);
|
2012-07-23 06:02:14 +00:00
|
|
|
} else {
|
|
|
|
vshError(ctl, _("Failed to start network %s"), name);
|
|
|
|
ret = false;
|
|
|
|
}
|
|
|
|
virNetworkFree(network);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-undefine" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_undefine[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
2014-08-19 02:59:51 +00:00
|
|
|
.data = N_("undefine a persistent network")
|
2013-02-07 15:25:10 +00:00
|
|
|
},
|
|
|
|
{.name = "desc",
|
2014-08-19 02:59:51 +00:00
|
|
|
.data = N_("Undefine the configuration for a persistent network.")
|
2013-02-07 15:25:10 +00:00
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_undefine[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(VIR_CONNECT_LIST_NETWORKS_PERSISTENT),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
bool ret = true;
|
|
|
|
const char *name;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, &name)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if (virNetworkUndefine(network) == 0) {
|
2016-08-24 14:14:23 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s has been undefined\n"), name);
|
2012-07-23 06:02:14 +00:00
|
|
|
} else {
|
|
|
|
vshError(ctl, _("Failed to undefine network %s"), name);
|
|
|
|
ret = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
virNetworkFree(network);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
/*
|
|
|
|
* "net-update" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_update[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("update parts of an existing network's configuration")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = ""
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_update[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(0),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = "command",
|
|
|
|
.type = VSH_OT_DATA,
|
|
|
|
.flags = VSH_OFLAG_REQ,
|
|
|
|
.help = N_("type of update (add-first, add-last (add), delete, or modify)")
|
|
|
|
},
|
|
|
|
{.name = "section",
|
|
|
|
.type = VSH_OT_DATA,
|
|
|
|
.flags = VSH_OFLAG_REQ,
|
|
|
|
.help = N_("which section of network configuration to update")
|
|
|
|
},
|
|
|
|
{.name = "xml",
|
|
|
|
.type = VSH_OT_DATA,
|
|
|
|
.flags = VSH_OFLAG_REQ,
|
|
|
|
.help = N_("name of file containing xml (or, if it starts with '<', the complete "
|
|
|
|
"xml element itself) to add/modify, or to be matched for search")
|
|
|
|
},
|
|
|
|
{.name = "parent-index",
|
|
|
|
.type = VSH_OT_INT,
|
|
|
|
.help = N_("which parent object to search through")
|
|
|
|
},
|
2016-01-09 13:36:26 +00:00
|
|
|
VIRSH_COMMON_OPT_CONFIG(N_("affect next network startup")),
|
2016-01-09 13:36:27 +00:00
|
|
|
VIRSH_COMMON_OPT_LIVE(N_("affect running network")),
|
2016-01-09 13:36:28 +00:00
|
|
|
VIRSH_COMMON_OPT_CURRENT(N_("affect current state of network")),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
VIR_ENUM_DECL(virNetworkUpdateCommand)
|
|
|
|
VIR_ENUM_IMPL(virNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST,
|
|
|
|
"none", "modify", "delete", "add-last", "add-first");
|
|
|
|
|
|
|
|
VIR_ENUM_DECL(virNetworkSection)
|
|
|
|
VIR_ENUM_IMPL(virNetworkSection, VIR_NETWORK_SECTION_LAST,
|
|
|
|
"none", "bridge", "domain", "ip", "ip-dhcp-host",
|
|
|
|
"ip-dhcp-range", "forward", "forward-interface",
|
|
|
|
"forward-pf", "portgroup", "dns-host", "dns-txt",
|
|
|
|
"dns-srv");
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
bool ret = false;
|
|
|
|
virNetworkPtr network;
|
|
|
|
const char *commandStr = NULL;
|
|
|
|
const char *sectionStr = NULL;
|
|
|
|
int command, section, parentIndex = -1;
|
|
|
|
const char *xml = NULL;
|
|
|
|
char *xmlFromFile = NULL;
|
|
|
|
bool config = vshCommandOptBool(cmd, "config");
|
|
|
|
bool live = vshCommandOptBool(cmd, "live");
|
2016-02-22 12:33:20 +00:00
|
|
|
unsigned int flags = VIR_NETWORK_UPDATE_AFFECT_CURRENT;
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
|
2016-02-22 12:33:20 +00:00
|
|
|
VSH_EXCLUSIVE_OPTIONS("current", "live");
|
|
|
|
VSH_EXCLUSIVE_OPTIONS("current", "config");
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, NULL)))
|
2013-08-26 10:51:08 +00:00
|
|
|
return false;
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
|
2013-01-21 16:22:17 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "command", &commandStr) < 0)
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (STREQ(commandStr, "add")) {
|
|
|
|
/* "add" is a synonym for "add-last" */
|
|
|
|
command = VIR_NETWORK_UPDATE_COMMAND_ADD_LAST;
|
|
|
|
} else {
|
|
|
|
command = virNetworkUpdateCommandTypeFromString(commandStr);
|
|
|
|
if (command <= 0 || command >= VIR_NETWORK_UPDATE_COMMAND_LAST) {
|
|
|
|
vshError(ctl, _("unrecognized command name '%s'"), commandStr);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-21 16:22:17 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "section", §ionStr) < 0)
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
goto cleanup;
|
2013-01-21 16:22:17 +00:00
|
|
|
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
section = virNetworkSectionTypeFromString(sectionStr);
|
|
|
|
if (section <= 0 || section >= VIR_NETWORK_SECTION_LAST) {
|
|
|
|
vshError(ctl, _("unrecognized section name '%s'"), sectionStr);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2015-06-02 09:17:29 +00:00
|
|
|
if (vshCommandOptInt(ctl, cmd, "parent-index", &parentIndex) < 0)
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
/* The goal is to have a full xml element in the "xml"
|
|
|
|
* string. This is provided in the --xml option, either directly
|
|
|
|
* (detected by the first character being "<"), or indirectly by
|
|
|
|
* supplying a filename (first character isn't "<") that contains
|
|
|
|
* the desired xml.
|
|
|
|
*/
|
|
|
|
|
2013-01-21 16:22:17 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0)
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
if (*xml != '<') {
|
|
|
|
/* contents of xmldata is actually the name of a file that
|
|
|
|
* contains the xml.
|
|
|
|
*/
|
|
|
|
if (virFileReadAll(xml, VSH_MAX_XML_FILE, &xmlFromFile) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
/* NB: the original xml is just a const char * that points
|
|
|
|
* to a string owned by the vshCmd object, and will be freed
|
|
|
|
* by vshCommandFree, so it's safe to lose its pointer here.
|
|
|
|
*/
|
|
|
|
xml = xmlFromFile;
|
|
|
|
}
|
|
|
|
|
2016-02-22 12:33:20 +00:00
|
|
|
if (config)
|
|
|
|
flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG;
|
|
|
|
if (live)
|
|
|
|
flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE;
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
|
|
|
|
if (virNetworkUpdate(network, command,
|
|
|
|
section, parentIndex, xml, flags) < 0) {
|
|
|
|
vshError(ctl, _("Failed to update network %s"),
|
|
|
|
virNetworkGetName(network));
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config) {
|
|
|
|
if (live)
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Updated network %s persistent config and "
|
|
|
|
"live state"),
|
|
|
|
virNetworkGetName(network));
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
else
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Updated network %s persistent config"),
|
|
|
|
virNetworkGetName(network));
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
} else if (live) {
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Updated network %s live state"),
|
|
|
|
virNetworkGetName(network));
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
} else if (virNetworkIsActive(network)) {
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Updated network %s live state"),
|
|
|
|
virNetworkGetName(network));
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
} else {
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Updated network %s persistent config"),
|
|
|
|
virNetworkGetName(network));
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = true;
|
2014-03-25 06:53:59 +00:00
|
|
|
cleanup:
|
virsh: new net-update command
This command uses the new virNetworkUpdate() API to modify an existing
network definition, and optionally have those modifications take
effect immediately without restarting the network.
An example usage:
virsh net-update mynet add-last ip-dhcp-host \
"<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \
--live --config
If you like, you can instead put the xml into a file, and call like
this:
virsh net-update mynet add ip-dhcp-host /tmp/myxml.xml
--live --config
virsh will autodetect whether the argument is itself an xml element,
or if it's a file, by looking at the first character - the first
character of an xml element is always "<", and the first character of
a file is almost always *not* "<" (in the rare case that it is, the
user could specify "./<filename...").
A --parent-index option is also available (to give the index within a
list of parent objects, e.g. the index of the parent <ip> element when
updating ip-dhcp-host elements), but is optional and at least for now
will probably be used rarely.
--live, --config, and --current options - if you specify --live, only
the live state of the network will be updated. If you also specify
--config, then the persistent configuration will also be updated;
these two commands can be given separately, or both together. If you
don't specify either (you can optionally specify "--current" for the
same effect), then the "current" config will be updated (i.e. if the
network is active, then only its live config is affected, but if the
network is inactive, only the persistent config is affected).
2012-09-19 11:38:43 +00:00
|
|
|
vshReportError(ctl);
|
|
|
|
virNetworkFree(network);
|
|
|
|
VIR_FREE(xmlFromFile);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-07-23 06:02:14 +00:00
|
|
|
/*
|
|
|
|
* "net-uuid" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_uuid[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("convert a network name to network UUID")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = ""
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_uuid[] = {
|
2018-05-15 11:18:22 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK(N_("network name"), 0),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr network;
|
|
|
|
char uuid[VIR_UUID_STRING_BUFLEN];
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetworkBy(ctl, cmd, NULL,
|
|
|
|
VIRSH_BYNAME)))
|
2012-07-23 06:02:14 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if (virNetworkGetUUIDString(network, uuid) != -1)
|
|
|
|
vshPrint(ctl, "%s\n", uuid);
|
|
|
|
else
|
|
|
|
vshError(ctl, "%s", _("failed to get network UUID"));
|
|
|
|
|
|
|
|
virNetworkFree(network);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-edit" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_edit[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "help",
|
|
|
|
.data = N_("edit XML configuration for a network")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Edit the XML configuration for a network.")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_edit[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(0),
|
2013-01-14 14:28:17 +00:00
|
|
|
{.name = NULL}
|
2012-07-23 06:02:14 +00:00
|
|
|
};
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
static char *virshNetworkGetXMLDesc(virNetworkPtr network)
|
2012-07-23 06:02:14 +00:00
|
|
|
{
|
|
|
|
unsigned int flags = VIR_NETWORK_XML_INACTIVE;
|
|
|
|
char *doc = virNetworkGetXMLDesc(network, flags);
|
|
|
|
|
|
|
|
if (!doc && last_error->code == VIR_ERR_INVALID_ARG) {
|
|
|
|
/* The server side libvirt doesn't support
|
|
|
|
* VIR_NETWORK_XML_INACTIVE, so retry without it.
|
|
|
|
*/
|
2012-07-25 11:41:49 +00:00
|
|
|
vshResetLibvirtError();
|
2012-07-23 06:02:14 +00:00
|
|
|
flags &= ~VIR_NETWORK_XML_INACTIVE;
|
|
|
|
doc = virNetworkGetXMLDesc(network, flags);
|
|
|
|
}
|
|
|
|
return doc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
bool ret = false;
|
|
|
|
virNetworkPtr network = NULL;
|
|
|
|
virNetworkPtr network_edited = NULL;
|
2015-06-15 16:53:58 +00:00
|
|
|
virshControlPtr priv = ctl->privData;
|
2012-07-23 06:02:14 +00:00
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
network = virshCommandOptNetwork(ctl, cmd, NULL);
|
2012-07-23 06:02:14 +00:00
|
|
|
if (network == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
#define EDIT_GET_XML virshNetworkGetXMLDesc(network)
|
2017-11-03 12:09:47 +00:00
|
|
|
#define EDIT_NOT_CHANGED \
|
|
|
|
do { \
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s XML configuration not changed.\n"), \
|
2017-11-03 12:09:47 +00:00
|
|
|
virNetworkGetName(network)); \
|
|
|
|
ret = true; \
|
|
|
|
goto edit_cleanup; \
|
2014-11-14 14:57:17 +00:00
|
|
|
} while (0)
|
2012-07-23 06:02:14 +00:00
|
|
|
#define EDIT_DEFINE \
|
2015-06-15 16:53:58 +00:00
|
|
|
(network_edited = virNetworkDefineXML(priv->conn, doc_edited))
|
2012-07-23 06:02:14 +00:00
|
|
|
#include "virsh-edit.c"
|
|
|
|
|
2016-11-04 14:22:26 +00:00
|
|
|
vshPrintExtra(ctl, _("Network %s XML configuration edited.\n"),
|
|
|
|
virNetworkGetName(network_edited));
|
2012-07-23 06:02:14 +00:00
|
|
|
|
|
|
|
ret = true;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (network)
|
|
|
|
virNetworkFree(network);
|
|
|
|
if (network_edited)
|
|
|
|
virNetworkFree(network_edited);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2012-07-23 07:19:04 +00:00
|
|
|
|
2014-02-15 00:19:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* "net-event" command
|
|
|
|
*/
|
2015-06-15 16:53:58 +00:00
|
|
|
VIR_ENUM_DECL(virshNetworkEvent)
|
|
|
|
VIR_ENUM_IMPL(virshNetworkEvent,
|
virsh: use more compact VIR_ENUM_IMPL
Dan Berrange suggested that using VIR_ENUM_IMPL is more compact
than open-coding switch statements, and still just as forceful
at making us remember to update lists if we add enum values
in the future. Make this change throughout virsh.
Sure enough, doing this change caught that we missed at least
VIR_STORAGE_VOL_NETDIR.
* tools/virsh-domain-monitor.c (vshDomainIOErrorToString)
(vshDomainControlStateToString, vshDomainStateToString)
(vshDomainStateReasonToString): Change switch to enum lookup.
(cmdDomControl, cmdDominfo): Update caller.
* tools/virsh-domain.c (vshDomainVcpuStateToString)
(vshDomainEventToString, vshDomainEventDetailToString): Change
switch to enum lookup.
(vshDomainBlockJobToString, vshDomainJobToString): New functions.
(cmdVcpuinfo, cmdBlockJob, cmdDomjobinfo, cmdEvent): Update
callers.
* tools/virsh-network.c (vshNetworkEventToString): Change switch
to enum lookup.
* tools/virsh-pool.c (vshStoragePoolStateToString): New function.
(cmdPoolList, cmdPoolInfo): Update callers.
* tools/virsh-volume.c (vshVolumeTypeToString): Change switch to
enum lookup.
(cmdVolInfo, cmdVolList): Update callers.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-02-21 19:55:06 +00:00
|
|
|
VIR_NETWORK_EVENT_LAST,
|
|
|
|
N_("Defined"),
|
|
|
|
N_("Undefined"),
|
|
|
|
N_("Started"),
|
|
|
|
N_("Stopped"))
|
|
|
|
|
2014-02-15 00:19:32 +00:00
|
|
|
static const char *
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkEventToString(int event)
|
2014-02-15 00:19:32 +00:00
|
|
|
{
|
2015-06-15 16:53:58 +00:00
|
|
|
const char *str = virshNetworkEventTypeToString(event);
|
virsh: use more compact VIR_ENUM_IMPL
Dan Berrange suggested that using VIR_ENUM_IMPL is more compact
than open-coding switch statements, and still just as forceful
at making us remember to update lists if we add enum values
in the future. Make this change throughout virsh.
Sure enough, doing this change caught that we missed at least
VIR_STORAGE_VOL_NETDIR.
* tools/virsh-domain-monitor.c (vshDomainIOErrorToString)
(vshDomainControlStateToString, vshDomainStateToString)
(vshDomainStateReasonToString): Change switch to enum lookup.
(cmdDomControl, cmdDominfo): Update caller.
* tools/virsh-domain.c (vshDomainVcpuStateToString)
(vshDomainEventToString, vshDomainEventDetailToString): Change
switch to enum lookup.
(vshDomainBlockJobToString, vshDomainJobToString): New functions.
(cmdVcpuinfo, cmdBlockJob, cmdDomjobinfo, cmdEvent): Update
callers.
* tools/virsh-network.c (vshNetworkEventToString): Change switch
to enum lookup.
* tools/virsh-pool.c (vshStoragePoolStateToString): New function.
(cmdPoolList, cmdPoolInfo): Update callers.
* tools/virsh-volume.c (vshVolumeTypeToString): Change switch to
enum lookup.
(cmdVolInfo, cmdVolList): Update callers.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-02-21 19:55:06 +00:00
|
|
|
return str ? _(str) : _("unknown");
|
2014-02-15 00:19:32 +00:00
|
|
|
}
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
struct virshNetEventData {
|
2014-02-15 00:19:32 +00:00
|
|
|
vshControl *ctl;
|
|
|
|
bool loop;
|
2016-01-08 10:50:55 +00:00
|
|
|
bool timestamp;
|
2014-02-15 00:19:32 +00:00
|
|
|
int count;
|
|
|
|
};
|
2015-06-15 16:53:58 +00:00
|
|
|
typedef struct virshNetEventData virshNetEventData;
|
2014-02-15 00:19:32 +00:00
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
VIR_ENUM_DECL(virshNetworkEventId)
|
|
|
|
VIR_ENUM_IMPL(virshNetworkEventId,
|
2014-02-15 00:19:32 +00:00
|
|
|
VIR_NETWORK_EVENT_ID_LAST,
|
|
|
|
"lifecycle")
|
|
|
|
|
|
|
|
static void
|
|
|
|
vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|
|
|
virNetworkPtr net,
|
|
|
|
int event,
|
|
|
|
int detail ATTRIBUTE_UNUSED,
|
|
|
|
void *opaque)
|
|
|
|
{
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetEventData *data = opaque;
|
2014-02-15 00:19:32 +00:00
|
|
|
|
|
|
|
if (!data->loop && data->count)
|
|
|
|
return;
|
2016-01-08 10:50:55 +00:00
|
|
|
|
|
|
|
if (data->timestamp) {
|
|
|
|
char timestamp[VIR_TIME_STRING_BUFLEN];
|
|
|
|
|
|
|
|
if (virTimeStringNowRaw(timestamp) < 0)
|
|
|
|
timestamp[0] = '\0';
|
|
|
|
|
|
|
|
vshPrint(data->ctl, _("%s: event 'lifecycle' for network %s: %s\n"),
|
|
|
|
timestamp,
|
|
|
|
virNetworkGetName(net), virshNetworkEventToString(event));
|
|
|
|
} else {
|
|
|
|
vshPrint(data->ctl, _("event 'lifecycle' for network %s: %s\n"),
|
|
|
|
virNetworkGetName(net), virshNetworkEventToString(event));
|
|
|
|
}
|
|
|
|
|
2014-02-15 00:19:32 +00:00
|
|
|
data->count++;
|
|
|
|
if (!data->loop)
|
|
|
|
vshEventDone(data->ctl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const vshCmdInfo info_network_event[] = {
|
2014-03-31 13:05:33 +00:00
|
|
|
{.name = "help",
|
2014-02-15 00:19:32 +00:00
|
|
|
.data = N_("Network Events")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("List event types, or wait for network events to occur")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_event[] = {
|
2018-05-15 11:18:20 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_OT_STRING(N_("filter by network name or uuid"), 0),
|
2014-02-15 00:19:32 +00:00
|
|
|
{.name = "event",
|
2014-12-11 02:46:15 +00:00
|
|
|
.type = VSH_OT_STRING,
|
2014-02-15 00:19:32 +00:00
|
|
|
.help = N_("which event type to wait for")
|
|
|
|
},
|
|
|
|
{.name = "loop",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("loop until timeout or interrupt, rather than one-shot")
|
|
|
|
},
|
|
|
|
{.name = "timeout",
|
|
|
|
.type = VSH_OT_INT,
|
|
|
|
.help = N_("timeout seconds")
|
|
|
|
},
|
|
|
|
{.name = "list",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("list valid event types")
|
|
|
|
},
|
2016-01-08 10:50:55 +00:00
|
|
|
{.name = "timestamp",
|
|
|
|
.type = VSH_OT_BOOL,
|
|
|
|
.help = N_("show timestamp for each printed event")
|
|
|
|
},
|
2014-02-15 00:19:32 +00:00
|
|
|
{.name = NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
virNetworkPtr net = NULL;
|
|
|
|
bool ret = false;
|
|
|
|
int eventId = -1;
|
|
|
|
int timeout = 0;
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetEventData data;
|
2014-02-15 00:19:32 +00:00
|
|
|
const char *eventName = NULL;
|
|
|
|
int event;
|
2015-06-15 16:53:58 +00:00
|
|
|
virshControlPtr priv = ctl->privData;
|
2014-02-15 00:19:32 +00:00
|
|
|
|
|
|
|
if (vshCommandOptBool(cmd, "list")) {
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
for (i = 0; i < VIR_NETWORK_EVENT_ID_LAST; i++)
|
2015-06-15 16:53:58 +00:00
|
|
|
vshPrint(ctl, "%s\n", virshNetworkEventIdTypeToString(i));
|
2014-02-15 00:19:32 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-12-03 12:42:35 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0)
|
2014-02-15 00:19:32 +00:00
|
|
|
return false;
|
|
|
|
if (!eventName) {
|
2016-09-06 11:14:34 +00:00
|
|
|
vshError(ctl, "%s", _("either --list or --event <type> is required"));
|
2014-02-15 00:19:32 +00:00
|
|
|
return false;
|
|
|
|
}
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((event = virshNetworkEventIdTypeFromString(eventName)) < 0) {
|
2014-02-15 00:19:32 +00:00
|
|
|
vshError(ctl, _("unknown event type %s"), eventName);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
data.ctl = ctl;
|
|
|
|
data.loop = vshCommandOptBool(cmd, "loop");
|
2016-01-08 10:50:55 +00:00
|
|
|
data.timestamp = vshCommandOptBool(cmd, "timestamp");
|
2014-02-15 00:19:32 +00:00
|
|
|
data.count = 0;
|
|
|
|
if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (vshCommandOptBool(cmd, "network"))
|
2015-06-15 16:53:58 +00:00
|
|
|
net = virshCommandOptNetwork(ctl, cmd, NULL);
|
2014-02-15 00:19:32 +00:00
|
|
|
if (vshEventStart(ctl, timeout) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if ((eventId = virConnectNetworkEventRegisterAny(priv->conn, net, event,
|
2014-02-15 00:19:32 +00:00
|
|
|
VIR_NETWORK_EVENT_CALLBACK(vshEventLifecyclePrint),
|
|
|
|
&data, NULL)) < 0)
|
|
|
|
goto cleanup;
|
|
|
|
switch (vshEventWait(ctl)) {
|
|
|
|
case VSH_EVENT_INTERRUPT:
|
|
|
|
vshPrint(ctl, "%s", _("event loop interrupted\n"));
|
|
|
|
break;
|
|
|
|
case VSH_EVENT_TIMEOUT:
|
|
|
|
vshPrint(ctl, "%s", _("event loop timed out\n"));
|
|
|
|
break;
|
|
|
|
case VSH_EVENT_DONE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
vshPrint(ctl, _("events received: %d\n"), data.count);
|
|
|
|
if (data.count)
|
|
|
|
ret = true;
|
|
|
|
|
2014-03-25 06:53:59 +00:00
|
|
|
cleanup:
|
2014-02-15 00:19:32 +00:00
|
|
|
vshEventCleanup(ctl);
|
|
|
|
if (eventId >= 0 &&
|
2015-06-15 16:53:58 +00:00
|
|
|
virConnectNetworkEventDeregisterAny(priv->conn, eventId) < 0)
|
2014-02-15 00:19:32 +00:00
|
|
|
ret = false;
|
|
|
|
if (net)
|
|
|
|
virNetworkFree(net);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-06-23 21:01:52 +00:00
|
|
|
/*
|
|
|
|
* "net-dhcp-leases" command
|
|
|
|
*/
|
|
|
|
static const vshCmdInfo info_network_dhcp_leases[] = {
|
|
|
|
{.name = "help",
|
|
|
|
.data = N_("print lease info for a given network")
|
|
|
|
},
|
|
|
|
{.name = "desc",
|
|
|
|
.data = N_("Print lease info for a given network")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static const vshCmdOptDef opts_network_dhcp_leases[] = {
|
2018-05-15 11:18:21 +00:00
|
|
|
VIRSH_COMMON_OPT_NETWORK_FULL(0),
|
2014-06-23 21:01:52 +00:00
|
|
|
{.name = "mac",
|
2014-12-11 02:46:15 +00:00
|
|
|
.type = VSH_OT_STRING,
|
2014-06-23 21:01:52 +00:00
|
|
|
.flags = VSH_OFLAG_NONE,
|
|
|
|
.help = N_("MAC address")
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
2015-06-15 16:53:58 +00:00
|
|
|
virshNetworkDHCPLeaseSorter(const void *a, const void *b)
|
2014-06-23 21:01:52 +00:00
|
|
|
{
|
|
|
|
int rv = -1;
|
|
|
|
|
|
|
|
virNetworkDHCPLeasePtr *lease1 = (virNetworkDHCPLeasePtr *) a;
|
|
|
|
virNetworkDHCPLeasePtr *lease2 = (virNetworkDHCPLeasePtr *) b;
|
|
|
|
|
|
|
|
if (*lease1 && !*lease2)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (!*lease1)
|
|
|
|
return *lease2 != NULL;
|
|
|
|
|
|
|
|
rv = vshStrcasecmp((*lease1)->mac, (*lease2)->mac);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd)
|
|
|
|
{
|
|
|
|
const char *name = NULL;
|
|
|
|
const char *mac = NULL;
|
|
|
|
virNetworkDHCPLeasePtr *leases = NULL;
|
|
|
|
int nleases = 0;
|
|
|
|
bool ret = false;
|
|
|
|
size_t i;
|
|
|
|
unsigned int flags = 0;
|
|
|
|
virNetworkPtr network = NULL;
|
|
|
|
|
2015-12-03 12:42:35 +00:00
|
|
|
if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0)
|
2014-06-23 21:01:52 +00:00
|
|
|
return false;
|
|
|
|
|
2015-06-15 16:53:58 +00:00
|
|
|
if (!(network = virshCommandOptNetwork(ctl, cmd, &name)))
|
2014-06-23 21:01:52 +00:00
|
|
|
return false;
|
|
|
|
|
2014-06-26 14:08:34 +00:00
|
|
|
if ((nleases = virNetworkGetDHCPLeases(network, mac, &leases, flags)) < 0) {
|
2014-06-23 21:01:52 +00:00
|
|
|
vshError(ctl, _("Failed to get leases info for %s"), name);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sort the list according to MAC Address/IAID */
|
2015-06-15 16:53:58 +00:00
|
|
|
qsort(leases, nleases, sizeof(*leases), virshNetworkDHCPLeaseSorter);
|
2014-06-23 21:01:52 +00:00
|
|
|
|
|
|
|
vshPrintExtra(ctl, " %-20s %-18s %-9s %-25s %-15s %s\n%s%s\n",
|
|
|
|
_("Expiry Time"), _("MAC address"), _("Protocol"),
|
|
|
|
_("IP address"), _("Hostname"), _("Client ID or DUID"),
|
|
|
|
"----------------------------------------------------------",
|
|
|
|
"---------------------------------------------------------");
|
|
|
|
|
|
|
|
for (i = 0; i < nleases; i++) {
|
2014-09-04 19:08:49 +00:00
|
|
|
const char *typestr = NULL;
|
2014-06-23 21:01:52 +00:00
|
|
|
char *cidr_format = NULL;
|
|
|
|
virNetworkDHCPLeasePtr lease = leases[i];
|
|
|
|
time_t expirytime_tmp = lease->expirytime;
|
|
|
|
struct tm ts;
|
|
|
|
char expirytime[32];
|
2016-06-08 09:32:09 +00:00
|
|
|
localtime_r(&expirytime_tmp, &ts);
|
2014-06-23 21:01:52 +00:00
|
|
|
strftime(expirytime, sizeof(expirytime), "%Y-%m-%d %H:%M:%S", &ts);
|
|
|
|
|
2014-09-04 19:08:49 +00:00
|
|
|
if (lease->type == VIR_IP_ADDR_TYPE_IPV4)
|
|
|
|
typestr = "ipv4";
|
|
|
|
else if (lease->type == VIR_IP_ADDR_TYPE_IPV6)
|
|
|
|
typestr = "ipv6";
|
2014-06-23 21:01:52 +00:00
|
|
|
|
|
|
|
ignore_value(virAsprintf(&cidr_format, "%s/%d",
|
|
|
|
lease->ipaddr, lease->prefix));
|
|
|
|
|
2014-11-01 10:41:20 +00:00
|
|
|
vshPrint(ctl, " %-20s %-18s %-9s %-25s %-15s %s\n",
|
|
|
|
expirytime, EMPTYSTR(lease->mac),
|
|
|
|
EMPTYSTR(typestr), cidr_format,
|
|
|
|
EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid));
|
2014-10-30 02:35:14 +00:00
|
|
|
|
|
|
|
VIR_FREE(cidr_format);
|
2014-06-23 21:01:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = true;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
if (leases) {
|
|
|
|
for (i = 0; i < nleases; i++)
|
|
|
|
virNetworkDHCPLeaseFree(leases[i]);
|
|
|
|
VIR_FREE(leases);
|
|
|
|
}
|
|
|
|
virNetworkFree(network);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-08-20 21:43:25 +00:00
|
|
|
const vshCmdDef networkCmds[] = {
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "net-autostart",
|
|
|
|
.handler = cmdNetworkAutostart,
|
|
|
|
.opts = opts_network_autostart,
|
|
|
|
.info = info_network_autostart,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-create",
|
|
|
|
.handler = cmdNetworkCreate,
|
|
|
|
.opts = opts_network_create,
|
|
|
|
.info = info_network_create,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-define",
|
|
|
|
.handler = cmdNetworkDefine,
|
|
|
|
.opts = opts_network_define,
|
|
|
|
.info = info_network_define,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-destroy",
|
|
|
|
.handler = cmdNetworkDestroy,
|
|
|
|
.opts = opts_network_destroy,
|
|
|
|
.info = info_network_destroy,
|
|
|
|
.flags = 0
|
|
|
|
},
|
2014-06-23 21:01:52 +00:00
|
|
|
{.name = "net-dhcp-leases",
|
|
|
|
.handler = cmdNetworkDHCPLeases,
|
|
|
|
.opts = opts_network_dhcp_leases,
|
|
|
|
.info = info_network_dhcp_leases,
|
|
|
|
.flags = 0,
|
|
|
|
},
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "net-dumpxml",
|
|
|
|
.handler = cmdNetworkDumpXML,
|
|
|
|
.opts = opts_network_dumpxml,
|
|
|
|
.info = info_network_dumpxml,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-edit",
|
|
|
|
.handler = cmdNetworkEdit,
|
|
|
|
.opts = opts_network_edit,
|
|
|
|
.info = info_network_edit,
|
|
|
|
.flags = 0
|
|
|
|
},
|
2014-02-15 00:19:32 +00:00
|
|
|
{.name = "net-event",
|
|
|
|
.handler = cmdNetworkEvent,
|
|
|
|
.opts = opts_network_event,
|
|
|
|
.info = info_network_event,
|
|
|
|
.flags = 0
|
|
|
|
},
|
2013-02-07 15:25:10 +00:00
|
|
|
{.name = "net-info",
|
|
|
|
.handler = cmdNetworkInfo,
|
|
|
|
.opts = opts_network_info,
|
|
|
|
.info = info_network_info,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-list",
|
|
|
|
.handler = cmdNetworkList,
|
|
|
|
.opts = opts_network_list,
|
|
|
|
.info = info_network_list,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-name",
|
|
|
|
.handler = cmdNetworkName,
|
|
|
|
.opts = opts_network_name,
|
|
|
|
.info = info_network_name,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-start",
|
|
|
|
.handler = cmdNetworkStart,
|
|
|
|
.opts = opts_network_start,
|
|
|
|
.info = info_network_start,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-undefine",
|
|
|
|
.handler = cmdNetworkUndefine,
|
|
|
|
.opts = opts_network_undefine,
|
|
|
|
.info = info_network_undefine,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-update",
|
|
|
|
.handler = cmdNetworkUpdate,
|
|
|
|
.opts = opts_network_update,
|
|
|
|
.info = info_network_update,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = "net-uuid",
|
|
|
|
.handler = cmdNetworkUuid,
|
|
|
|
.opts = opts_network_uuid,
|
|
|
|
.info = info_network_uuid,
|
|
|
|
.flags = 0
|
|
|
|
},
|
|
|
|
{.name = NULL}
|
2012-07-23 07:19:04 +00:00
|
|
|
};
|