|
 |
898951 |
From 5b8a0bcaacd16703b069ba1cf70e8259534eaf69 Mon Sep 17 00:00:00 2001
|
|
|
898951 |
Message-Id: <5b8a0bcaacd16703b069ba1cf70e8259534eaf69@dist-git>
|
|
|
898951 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
898951 |
Date: Thu, 22 Jan 2015 15:53:49 +0100
|
|
|
898951 |
Subject: [PATCH] test: Add <metadata> support into the test driver
|
|
|
898951 |
|
|
|
898951 |
https://bugzilla.redhat.com/show_bug.cgi?id=1184929
|
|
|
898951 |
|
|
|
898951 |
(cherry picked from commit f616fbf2a4a31a2f944aae0b75d6e2ab3bef3573)
|
|
|
898951 |
|
|
|
898951 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
898951 |
---
|
|
|
898951 |
src/test/test_driver.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
898951 |
1 file changed, 68 insertions(+)
|
|
|
898951 |
|
|
|
898951 |
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
|
|
|
898951 |
index f7eaf06..4d23738 100644
|
|
|
898951 |
--- a/src/test/test_driver.c
|
|
|
898951 |
+++ b/src/test/test_driver.c
|
|
|
898951 |
@@ -2528,6 +2528,72 @@ cleanup:
|
|
|
898951 |
return ret;
|
|
|
898951 |
}
|
|
|
898951 |
|
|
|
898951 |
+static char *testDomainGetMetadata(virDomainPtr dom,
|
|
|
898951 |
+ int type,
|
|
|
898951 |
+ const char *uri,
|
|
|
898951 |
+ unsigned int flags)
|
|
|
898951 |
+{
|
|
|
898951 |
+ testConnPtr privconn = dom->conn->privateData;
|
|
|
898951 |
+ virDomainObjPtr privdom;
|
|
|
898951 |
+ char *ret = NULL;
|
|
|
898951 |
+
|
|
|
898951 |
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
|
|
898951 |
+ VIR_DOMAIN_AFFECT_CONFIG, NULL);
|
|
|
898951 |
+
|
|
|
898951 |
+ testDriverLock(privconn);
|
|
|
898951 |
+ privdom = virDomainObjListFindByName(privconn->domains,
|
|
|
898951 |
+ dom->name);
|
|
|
898951 |
+ testDriverUnlock(privconn);
|
|
|
898951 |
+
|
|
|
898951 |
+ if (privdom == NULL) {
|
|
|
898951 |
+ virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
898951 |
+ goto cleanup;
|
|
|
898951 |
+ }
|
|
|
898951 |
+
|
|
|
898951 |
+ ret = virDomainObjGetMetadata(privdom, type, uri, privconn->caps,
|
|
|
898951 |
+ privconn->xmlopt, flags);
|
|
|
898951 |
+
|
|
|
898951 |
+cleanup:
|
|
|
898951 |
+ if (privdom)
|
|
|
898951 |
+ virObjectUnlock(privdom);
|
|
|
898951 |
+ return ret;
|
|
|
898951 |
+}
|
|
|
898951 |
+
|
|
|
898951 |
+static int testDomainSetMetadata(virDomainPtr dom,
|
|
|
898951 |
+ int type,
|
|
|
898951 |
+ const char *metadata,
|
|
|
898951 |
+ const char *key,
|
|
|
898951 |
+ const char *uri,
|
|
|
898951 |
+ unsigned int flags)
|
|
|
898951 |
+{
|
|
|
898951 |
+ testConnPtr privconn = dom->conn->privateData;
|
|
|
898951 |
+ virDomainObjPtr privdom;
|
|
|
898951 |
+ int ret = -1;
|
|
|
898951 |
+
|
|
|
898951 |
+ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
|
|
|
898951 |
+ VIR_DOMAIN_AFFECT_CONFIG, -1);
|
|
|
898951 |
+
|
|
|
898951 |
+ testDriverLock(privconn);
|
|
|
898951 |
+ privdom = virDomainObjListFindByName(privconn->domains,
|
|
|
898951 |
+ dom->name);
|
|
|
898951 |
+ testDriverUnlock(privconn);
|
|
|
898951 |
+
|
|
|
898951 |
+ if (privdom == NULL) {
|
|
|
898951 |
+ virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
|
|
898951 |
+ goto cleanup;
|
|
|
898951 |
+ }
|
|
|
898951 |
+
|
|
|
898951 |
+ ret = virDomainObjSetMetadata(privdom, type, metadata, key, uri,
|
|
|
898951 |
+ privconn->caps, privconn->xmlopt,
|
|
|
898951 |
+ NULL, flags);
|
|
|
898951 |
+
|
|
|
898951 |
+cleanup:
|
|
|
898951 |
+ if (privdom)
|
|
|
898951 |
+ virObjectUnlock(privdom);
|
|
|
898951 |
+ return ret;
|
|
|
898951 |
+}
|
|
|
898951 |
+
|
|
|
898951 |
+
|
|
|
898951 |
static int testNodeGetCellsFreeMemory(virConnectPtr conn,
|
|
|
898951 |
unsigned long long *freemems,
|
|
|
898951 |
int startCell, int maxCells) {
|
|
|
898951 |
@@ -5815,6 +5881,8 @@ static virDriver testDriver = {
|
|
|
898951 |
.connectIsAlive = testConnectIsAlive, /* 0.9.8 */
|
|
|
898951 |
.nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */
|
|
|
898951 |
.domainScreenshot = testDomainScreenshot, /* 1.0.5 */
|
|
|
898951 |
+ .domainGetMetadata = testDomainGetMetadata, /* 1.1.3 */
|
|
|
898951 |
+ .domainSetMetadata = testDomainSetMetadata, /* 1.1.3 */
|
|
|
898951 |
};
|
|
|
898951 |
|
|
|
898951 |
static virNetworkDriver testNetworkDriver = {
|
|
|
898951 |
--
|
|
|
898951 |
2.2.1
|
|
|
898951 |
|