openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

network: Add virNetworkObj Get/Set API's for @def and @newDef 

In preparation for making the object private, create a couple of API's
to get the obj->def & obj->newDef and set the obj->def.

While altering networkxml2conftest.c to use the virNetworkObjSetDef
API, fix the name of the variable from @dev to @def

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-09 18:38:58 -04:00
parent 062c38ce75
commit db207a6233
6 changed files with 355 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/conf/virnetworkobj.c
View File

@ -107,6 +107,28 @@ virNetworkObjEndAPI(virNetworkObjPtr *net)
}
virNetworkDefPtr
virNetworkObjGetDef(virNetworkObjPtr obj)
{
return obj->def;
}
void
virNetworkObjSetDef(virNetworkObjPtr obj,
virNetworkDefPtr def)
{
obj->def = def;
}
virNetworkDefPtr
virNetworkObjGetNewDef(virNetworkObjPtr obj)
{
return obj->newDef;
}
pid_t
virNetworkObjGetDnsmasqPid(virNetworkObjPtr obj)
{

10
src/conf/virnetworkobj.h
View File

@ -50,6 +50,16 @@ struct _virNetworkObj {
virNetworkObjPtr
virNetworkObjNew(void);
virNetworkDefPtr
virNetworkObjGetDef(virNetworkObjPtr obj);
void
virNetworkObjSetDef(virNetworkObjPtr obj,
virNetworkDefPtr def);
virNetworkDefPtr
virNetworkObjGetNewDef(virNetworkObjPtr obj);
virMacMapPtr
virNetworkObjGetMacMap(virNetworkObjPtr obj);

3
src/libvirt_private.syms
View File

@ -943,9 +943,11 @@ virNetworkObjEndAPI;
virNetworkObjFindByName;
virNetworkObjFindByUUID;
virNetworkObjGetClassIdMap;
virNetworkObjGetDef;
virNetworkObjGetDnsmasqPid;
virNetworkObjGetFloorSum;
virNetworkObjGetMacMap;
virNetworkObjGetNewDef;
virNetworkObjGetPersistentDef;
virNetworkObjGetRadvdPid;
virNetworkObjListExport;
@ -962,6 +964,7 @@ virNetworkObjNew;
virNetworkObjRemoveInactive;
virNetworkObjReplacePersistentDef;
virNetworkObjSaveStatus;
virNetworkObjSetDef;
virNetworkObjSetDefTransient;
virNetworkObjSetDnsmasqPid;
virNetworkObjSetFloorSum;

511
src/network/bridge_driver.c
View File

File diff suppressed because it is too large Load Diff

58
src/test/test_driver.c
View File

@ -3233,12 +3233,14 @@ testNetworkLookupByUUID(virConnectPtr conn,
{
testDriverPtr privconn = conn->privateData;
virNetworkObjPtr obj;
virNetworkDefPtr def;
virNetworkPtr net = NULL;
if (!(obj = testNetworkObjFindByUUID(privconn, uuid)))
goto cleanup;
def = virNetworkObjGetDef(obj);
net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
net = virGetNetwork(conn, def->name, def->uuid);
cleanup:
virNetworkObjEndAPI(&obj);
@ -3267,12 +3269,14 @@ testNetworkLookupByName(virConnectPtr conn,
{
testDriverPtr privconn = conn->privateData;
virNetworkObjPtr obj;
virNetworkDefPtr def;
virNetworkPtr net = NULL;
if (!(obj = testNetworkObjFindByName(privconn, name)))
goto cleanup;
def = virNetworkObjGetDef(obj);
net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
net = virGetNetwork(conn, def->name, def->uuid);
cleanup:
virNetworkObjEndAPI(&obj);
@ -3385,29 +3389,31 @@ static virNetworkPtr
testNetworkCreateXML(virConnectPtr conn, const char *xml)
{
testDriverPtr privconn = conn->privateData;
virNetworkDefPtr def;
virNetworkDefPtr newDef;
virNetworkObjPtr obj = NULL;
virNetworkDefPtr def;
virNetworkPtr net = NULL;
virObjectEventPtr event = NULL;
if ((def = virNetworkDefParseString(xml)) == NULL)
if ((newDef = virNetworkDefParseString(xml)) == NULL)
goto cleanup;
if (!(obj = virNetworkObjAssignDef(privconn->networks, def,
if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef,
VIR_NETWORK_OBJ_LIST_ADD_LIVE |
VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE)))
goto cleanup;
def = NULL;
newDef = NULL;
def = virNetworkObjGetDef(obj);
obj->active = 1;
event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
event = virNetworkEventLifecycleNew(def->name, def->uuid,
VIR_NETWORK_EVENT_STARTED,
0);
net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
net = virGetNetwork(conn, def->name, def->uuid);
cleanup:
virNetworkDefFree(def);
virNetworkDefFree(newDef);
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&obj);
return net;
@ -3419,26 +3425,28 @@ testNetworkDefineXML(virConnectPtr conn,
const char *xml)
{
testDriverPtr privconn = conn->privateData;
virNetworkDefPtr def;
virNetworkDefPtr newDef;
virNetworkObjPtr obj = NULL;
virNetworkDefPtr def;
virNetworkPtr net = NULL;
virObjectEventPtr event = NULL;
if ((def = virNetworkDefParseString(xml)) == NULL)
if ((newDef = virNetworkDefParseString(xml)) == NULL)
goto cleanup;
if (!(obj = virNetworkObjAssignDef(privconn->networks, def, 0)))
if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, 0)))
goto cleanup;
def = NULL;
newDef = NULL;
def = virNetworkObjGetDef(obj);
event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
event = virNetworkEventLifecycleNew(def->name, def->uuid,
VIR_NETWORK_EVENT_DEFINED,
0);
net = virGetNetwork(conn, obj->def->name, obj->def->uuid);
net = virGetNetwork(conn, def->name, def->uuid);
cleanup:
virNetworkDefFree(def);
virNetworkDefFree(newDef);
testObjectEventQueue(privconn, event);
virNetworkObjEndAPI(&obj);
return net;
@ -3524,11 +3532,13 @@ testNetworkCreate(virNetworkPtr net)
{
testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr obj;
virNetworkDefPtr def;
int ret = -1;
virObjectEventPtr event = NULL;
if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup;
def = virNetworkObjGetDef(obj);
if (virNetworkObjIsActive(obj)) {
virReportError(VIR_ERR_OPERATION_INVALID,
@ -3537,7 +3547,7 @@ testNetworkCreate(virNetworkPtr net)
}
obj->active = 1;
event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
event = virNetworkEventLifecycleNew(def->name, def->uuid,
VIR_NETWORK_EVENT_STARTED,
0);
ret = 0;
@ -3554,14 +3564,16 @@ testNetworkDestroy(virNetworkPtr net)
{
testDriverPtr privconn = net->conn->privateData;
virNetworkObjPtr obj;
virNetworkDefPtr def;
int ret = -1;
virObjectEventPtr event = NULL;
if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup;
def = virNetworkObjGetDef(obj);
obj->active = 0;
event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,
event = virNetworkEventLifecycleNew(def->name, def->uuid,
VIR_NETWORK_EVENT_STOPPED,
0);
if (!obj->persistent)
@ -3589,7 +3601,7 @@ testNetworkGetXMLDesc(virNetworkPtr net,
if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup;
ret = virNetworkDefFormat(obj->def, flags);
ret = virNetworkDefFormat(virNetworkObjGetDef(obj), flags);
cleanup:
virNetworkObjEndAPI(&obj);
@ -3603,18 +3615,20 @@ testNetworkGetBridgeName(virNetworkPtr net)
testDriverPtr privconn = net->conn->privateData;
char *bridge = NULL;
virNetworkObjPtr obj;
virNetworkDefPtr def;
if (!(obj = testNetworkObjFindByName(privconn, net->name)))
goto cleanup;
def = virNetworkObjGetDef(obj);
if (!(obj->def->bridge)) {
if (!(def->bridge)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("network '%s' does not have a bridge name."),
obj->def->name);
def->name);
goto cleanup;
}
ignore_value(VIR_STRDUP(bridge, obj->def->bridge));
ignore_value(VIR_STRDUP(bridge, def->bridge));
cleanup:
virNetworkObjEndAPI(&obj);

9
tests/networkxml2conftest.c
View File

@ -23,20 +23,21 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
{
char *actual = NULL;
int ret = -1;
virNetworkDefPtr dev = NULL;
virNetworkDefPtr def = NULL;
virNetworkObjPtr obj = NULL;
virCommandPtr cmd = NULL;
char *pidfile = NULL;
dnsmasqContext *dctx = NULL;
if (!(dev = virNetworkDefParseFile(inxml)))
if (!(def = virNetworkDefParseFile(inxml)))
goto fail;
if (!(obj = virNetworkObjNew()))
goto fail;
obj->def = dev;
dctx = dnsmasqContextNew(dev->name, "/var/lib/libvirt/dnsmasq");
virNetworkObjSetDef(obj, def);
dctx = dnsmasqContextNew(def->name, "/var/lib/libvirt/dnsmasq");
if (dctx == NULL)
goto fail;