Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 5df1d0d4 编写于 作者: J John Ferlan
浏览文件
操作

test: Use consistent variable names for network test driver APIs 

A virNetworkObjPtr will be an 'obj'.

A virNetworkPtr will be a 'net'.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 f444e5b4
隐藏空白更改
内联 并排
Showing with 91 addition and 91 deletion
src/test/test_driver.c
浏览文件 @ 5df1d0d4
...@@ -3213,17 +3213,17 @@ static virNetworkObjPtr ...@@ -3213,17 +3213,17 @@ static virNetworkObjPtr
testNetworkObjFindByUUID(testDriverPtr privconn, testNetworkObjFindByUUID(testDriverPtr privconn,
const unsigned char *uuid) const unsigned char *uuid)
{ {
virNetworkObjPtr net; virNetworkObjPtr obj;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
if (!(net = virNetworkObjFindByUUID(privconn->networks, uuid))) { if (!(obj = virNetworkObjFindByUUID(privconn->networks, uuid))) {
virUUIDFormat(uuid, uuidstr); virUUIDFormat(uuid, uuidstr);
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
_("no network with matching uuid '%s'"), _("no network with matching uuid '%s'"),
uuidstr); uuidstr);
} }
return net; return obj;
} }
...@@ -3232,17 +3232,17 @@ testNetworkLookupByUUID(virConnectPtr conn, ...@@ -3232,17 +3232,17 @@ testNetworkLookupByUUID(virConnectPtr conn,
const unsigned char *uuid) const unsigned char *uuid)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virNetworkObjPtr net; virNetworkObjPtr obj;
virNetworkPtr ret = NULL; virNetworkPtr net = NULL;
if (!(net = testNetworkObjFindByUUID(privconn, uuid))) if (!(obj = testNetworkObjFindByUUID(privconn, uuid)))
goto cleanup; goto cleanup;
ret = virGetNetwork(conn, net->def->name, net->def->uuid); net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
cleanup: cleanup:
virNetworkObjEndAPI(&net); virNetworkObjEndAPI(&obj);
return ret; return net;
} }
...@@ -3250,14 +3250,14 @@ static virNetworkObjPtr ...@@ -3250,14 +3250,14 @@ static virNetworkObjPtr
testNetworkObjFindByName(testDriverPtr privconn, testNetworkObjFindByName(testDriverPtr privconn,
const char *name) const char *name)
{ {
virNetworkObjPtr net; virNetworkObjPtr obj;
if (!(net = virNetworkObjFindByName(privconn->networks, name))) if (!(obj = virNetworkObjFindByName(privconn->networks, name)))
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
_("no network with matching name '%s'"), _("no network with matching name '%s'"),
name); name);
return net; return obj;
} }
...@@ -3266,17 +3266,17 @@ testNetworkLookupByName(virConnectPtr conn, ...@@ -3266,17 +3266,17 @@ testNetworkLookupByName(virConnectPtr conn,
const char *name) const char *name)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virNetworkObjPtr net; virNetworkObjPtr obj;
virNetworkPtr ret = NULL; virNetworkPtr net = NULL;
if (!(net = testNetworkObjFindByName(privconn, name))) if (!(obj = testNetworkObjFindByName(privconn, name)))
goto cleanup; goto cleanup;
ret = virGetNetwork(conn, net->def->name, net->def->uuid); net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
cleanup: cleanup:
virNetworkObjEndAPI(&net); virNetworkObjEndAPI(&obj);
return ret; return net;
} }
...@@ -3386,31 +3386,31 @@ testNetworkCreateXML(virConnectPtr conn, const char *xml) ...@@ -3386,31 +3386,31 @@ testNetworkCreateXML(virConnectPtr conn, const char *xml)
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virNetworkDefPtr def; virNetworkDefPtr def;
virNetworkObjPtr net = NULL; virNetworkObjPtr obj = NULL;
virNetworkPtr ret = NULL; virNetworkPtr net = NULL;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
if ((def = virNetworkDefParseString(xml)) == NULL) if ((def = virNetworkDefParseString(xml)) == NULL)
goto cleanup; goto cleanup;
if (!(net = virNetworkObjAssignDef(privconn->networks, def, if (!(obj = virNetworkObjAssignDef(privconn->networks, def,
VIR_NETWORK_OBJ_LIST_ADD_LIVE | VIR_NETWORK_OBJ_LIST_ADD_LIVE |
VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE))) VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE)))
goto cleanup; goto cleanup;
def = NULL; def = NULL;
net->active = 1; obj->active = 1;
event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
VIR_NETWORK_EVENT_STARTED, VIR_NETWORK_EVENT_STARTED,
0); 0);
ret = virGetNetwork(conn, net->def->name, net->def->uuid); net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
cleanup: cleanup:
virNetworkDefFree(def); virNetworkDefFree(def);
testObjectEventQueue(privconn, event); testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&net); virNetworkObjEndAPI(&obj);
return ret; return net;
} }
...@@ -3420,58 +3420,58 @@ testNetworkDefineXML(virConnectPtr conn, ...@@ -3420,58 +3420,58 @@ testNetworkDefineXML(virConnectPtr conn,
{ {
testDriverPtr privconn = conn->privateData; testDriverPtr privconn = conn->privateData;
virNetworkDefPtr def; virNetworkDefPtr def;
virNetworkObjPtr net = NULL; virNetworkObjPtr obj = NULL;
virNetworkPtr ret = NULL; virNetworkPtr net = NULL;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
if ((def = virNetworkDefParseString(xml)) == NULL) if ((def = virNetworkDefParseString(xml)) == NULL)
goto cleanup; goto cleanup;
if (!(net = virNetworkObjAssignDef(privconn->networks, def, 0))) if (!(obj = virNetworkObjAssignDef(privconn->networks, def, 0)))
goto cleanup; goto cleanup;
def = NULL; def = NULL;
event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid, event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
VIR_NETWORK_EVENT_DEFINED, VIR_NETWORK_EVENT_DEFINED,
0); 0);
ret = virGetNetwork(conn, net->def->name, net->def->uuid); net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
cleanup: cleanup:
virNetworkDefFree(def); virNetworkDefFree(def);
testObjectEventQueue(privconn, event); testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&net); virNetworkObjEndAPI(&obj);
return ret; return net;
} }
static int static int
testNetworkUndefine(virNetworkPtr network) testNetworkUndefine(virNetworkPtr net)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
int ret = -1; int ret = -1;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
if (virNetworkObjIsActive(privnet)) { if (virNetworkObjIsActive(obj)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Network '%s' is still running"), network->name); _("Network '%s' is still running"), net->name);
goto cleanup; goto cleanup;
} }
event = virNetworkEventLifecycleNew(network->name, network->uuid, event = virNetworkEventLifecycleNew(net->name, net->uuid,
VIR_NETWORK_EVENT_UNDEFINED, VIR_NETWORK_EVENT_UNDEFINED,
0); 0);
virNetworkObjRemoveInactive(privconn->networks, privnet); virNetworkObjRemoveInactive(privconn->networks, obj);
ret = 0; ret = 0;
cleanup: cleanup:
testObjectEventQueue(privconn, event); testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
...@@ -3485,20 +3485,20 @@ testNetworkUpdate(virNetworkPtr net, ...@@ -3485,20 +3485,20 @@ testNetworkUpdate(virNetworkPtr net,
unsigned int flags) unsigned int flags)
{ {
testDriverPtr privconn = net->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr network = NULL; virNetworkObjPtr obj = NULL;
int isActive, ret = -1; int isActive, ret = -1;
virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE |
VIR_NETWORK_UPDATE_AFFECT_CONFIG, VIR_NETWORK_UPDATE_AFFECT_CONFIG,
-1); -1);
if (!(network = testNetworkObjFindByUUID(privconn, net->uuid))) if (!(obj = testNetworkObjFindByUUID(privconn, net->uuid)))
goto cleanup; goto cleanup;
/* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network
* is active, else change CONFIG * is active, else change CONFIG
*/ */
isActive = virNetworkObjIsActive(network); isActive = virNetworkObjIsActive(obj);
if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE
| VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) ==
VIR_NETWORK_UPDATE_AFFECT_CURRENT) { VIR_NETWORK_UPDATE_AFFECT_CURRENT) {
...@@ -3509,155 +3509,155 @@ testNetworkUpdate(virNetworkPtr net, ...@@ -3509,155 +3509,155 @@ testNetworkUpdate(virNetworkPtr net,
} }
/* update the network config in memory/on disk */ /* update the network config in memory/on disk */
if (virNetworkObjUpdate(network, command, section, parentIndex, xml, flags) < 0) if (virNetworkObjUpdate(obj, command, section, parentIndex, xml, flags) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;
cleanup: cleanup:
virNetworkObjEndAPI(&network); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
static int static int
testNetworkCreate(virNetworkPtr network) testNetworkCreate(virNetworkPtr net)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
int ret = -1; int ret = -1;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
if (virNetworkObjIsActive(privnet)) { if (virNetworkObjIsActive(obj)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("Network '%s' is already running"), network->name); _("Network '%s' is already running"), net->name);
goto cleanup; goto cleanup;
} }
privnet->active = 1; obj->active = 1;
event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
VIR_NETWORK_EVENT_STARTED, VIR_NETWORK_EVENT_STARTED,
0); 0);
ret = 0; ret = 0;
cleanup: cleanup:
testObjectEventQueue(privconn, event); testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
static int static int
testNetworkDestroy(virNetworkPtr network) testNetworkDestroy(virNetworkPtr net)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
int ret = -1; int ret = -1;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
privnet->active = 0; obj->active = 0;
event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid, event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
VIR_NETWORK_EVENT_STOPPED, VIR_NETWORK_EVENT_STOPPED,
0); 0);
if (!privnet->persistent) if (!obj->persistent)
virNetworkObjRemoveInactive(privconn->networks, privnet); virNetworkObjRemoveInactive(privconn->networks, obj);
ret = 0; ret = 0;
cleanup: cleanup:
testObjectEventQueue(privconn, event); testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
static char * static char *
testNetworkGetXMLDesc(virNetworkPtr network, testNetworkGetXMLDesc(virNetworkPtr net,
unsigned int flags) unsigned int flags)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
char *ret = NULL; char *ret = NULL;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
ret = virNetworkDefFormat(privnet->def, flags); ret = virNetworkDefFormat(obj->def, flags);
cleanup: cleanup:
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
static char * static char *
testNetworkGetBridgeName(virNetworkPtr network) testNetworkGetBridgeName(virNetworkPtr net)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
char *bridge = NULL; char *bridge = NULL;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
if (!(privnet->def->bridge)) { if (!(obj->def->bridge)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("network '%s' does not have a bridge name."), _("network '%s' does not have a bridge name."),
privnet->def->name); obj->def->name);
goto cleanup; goto cleanup;
} }
ignore_value(VIR_STRDUP(bridge, privnet->def->bridge)); ignore_value(VIR_STRDUP(bridge, obj->def->bridge));
cleanup: cleanup:
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return bridge; return bridge;
} }
static int static int
testNetworkGetAutostart(virNetworkPtr network, testNetworkGetAutostart(virNetworkPtr net,
int *autostart) int *autostart)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
int ret = -1; int ret = -1;
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
*autostart = privnet->autostart; *autostart = obj->autostart;
ret = 0; ret = 0;
cleanup: cleanup:
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
static int static int
testNetworkSetAutostart(virNetworkPtr network, testNetworkSetAutostart(virNetworkPtr net,
int autostart) int autostart)
{ {
testDriverPtr privconn = network->conn->privateData; testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr obj;
int ret = -1; int ret = -1;
if (!(privnet = testNetworkObjFindByName(privconn, network->name))) if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup; goto cleanup;
privnet->autostart = autostart ? 1 : 0; obj->autostart = autostart ? 1 : 0;
ret = 0; ret = 0;
cleanup: cleanup:
virNetworkObjEndAPI(&privnet); virNetworkObjEndAPI(&obj);
return ret; return ret;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或