提交 68fcfdb8 编写于 作者: O Osier Yang

virsh: Accept UUID as an argument for net-info and net-start

上级 05f8917f
...@@ -8505,7 +8505,7 @@ static const vshCmdInfo info_network_info[] = { ...@@ -8505,7 +8505,7 @@ static const vshCmdInfo info_network_info[] = {
}; };
static const vshCmdOptDef opts_network_info[] = { static const vshCmdOptDef opts_network_info[] = {
{"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name")}, {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name or uuid")},
{NULL, 0, 0, NULL} {NULL, 0, 0, NULL}
}; };
...@@ -8522,8 +8522,7 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) ...@@ -8522,8 +8522,7 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd)
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
return false; return false;
if (!(network = vshCommandOptNetworkBy(ctl, cmd, NULL, if (!(network = vshCommandOptNetwork(ctl, cmd, NULL)))
VSH_BYNAME)))
return false; return false;
vshPrint(ctl, "%-15s %s\n", _("Name"), virNetworkGetName(network)); vshPrint(ctl, "%-15s %s\n", _("Name"), virNetworkGetName(network));
...@@ -8778,7 +8777,7 @@ static const vshCmdInfo info_network_start[] = { ...@@ -8778,7 +8777,7 @@ static const vshCmdInfo info_network_start[] = {
}; };
static const vshCmdOptDef opts_network_start[] = { static const vshCmdOptDef opts_network_start[] = {
{"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("name of the inactive network")}, {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name or uuid")},
{NULL, 0, 0, NULL} {NULL, 0, 0, NULL}
}; };
...@@ -8787,19 +8786,18 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) ...@@ -8787,19 +8786,18 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd)
{ {
virNetworkPtr network; virNetworkPtr network;
bool ret = true; bool ret = true;
const char *name = NULL;
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
return false; return false;
if (!(network = vshCommandOptNetworkBy(ctl, cmd, NULL, VSH_BYNAME))) if (!(network = vshCommandOptNetwork(ctl, cmd, &name)))
return false; return false;
if (virNetworkCreate(network) == 0) { if (virNetworkCreate(network) == 0) {
vshPrint(ctl, _("Network %s started\n"), vshPrint(ctl, _("Network %s started\n"), name);
virNetworkGetName(network));
} else { } else {
vshError(ctl, _("Failed to start network %s"), vshError(ctl, _("Failed to start network %s"), name);
virNetworkGetName(network));
ret = false; ret = false;
} }
virNetworkFree(network); virNetworkFree(network);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册