xm-test: Fix memset 01 and 02 tests: add support for sysfs memory interface

From: Andreas Florath <xen@flonatel.org>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

2 files changed, 8 insertions, 41 deletions

diff --git a/tools/xm-test/tests/memset/01_memset_basic_pos.py b/tools/xm-test/tests/memset/01_memset_basic_pos.py
index 1eb81b5c2f..7e769307ea 100644
--- a/tools/xm-test/tests/memset/01_memset_basic_pos.py
+++ b/tools/xm-test/tests/memset/01_memset_basic_pos.py
@@ -40,17 +40,10 @@ try:
     console.runCmd("ls")
 except ConsoleError, e:
     FAIL(str(e))
-    
-try:
-    run = console.runCmd("cat /proc/xen/balloon | grep Current");
-except ConsoleError, e:
-    FAIL(str(e))
 
-match = re.match("[^0-9]+([0-9]+)", run["output"])
-if not match:
-    FAIL("Invalid domU meminfo line")
-        
-origmem = int(match.group(1)) / 1024
+xen_mem = XenMemory(console)
+    
+origmem = xen_mem.get_mem_from_domU()
 newmem = origmem - 1
 
 # set mem-set for less than default
@@ -76,17 +69,7 @@ elif mem != newmem:
     FAIL("Dom0 failed to verify %i MB; got %i MB" % newmem,mem)
 
 # verify memory set internally
-try:
-    run = console.runCmd("cat /proc/xen/balloon | grep Current")
-except ConsoleError, e:
-    FAIL(str(e))
-
-# Check the output of 'cat /proc/xen/balloon'
-m = re.match("^Current allocation:\s+(\d+)\skB", run["output"])
-if not m: 
-    FAIL("The DomU command 'cat /proc/xen/balloon' failed.")
-
-domUmem = int(m.group(1)) / 1024
+domUmem = xen_mem.get_mem_from_domU()
 
 if domUmem != newmem:
     FAIL("DomU reported incorrect memory amount: %i MB" % (domUmem))
diff --git a/tools/xm-test/tests/memset/03_memset_random_pos.py b/tools/xm-test/tests/memset/03_memset_random_pos.py
index f5393a4090..25937019b1 100644
--- a/tools/xm-test/tests/memset/03_memset_random_pos.py
+++ b/tools/xm-test/tests/memset/03_memset_random_pos.py
@@ -23,16 +23,9 @@ except DomainError, e:
 
 times = random.randint(10,50)
 
-try:
-    run = console.runCmd("cat /proc/xen/balloon | grep Current");
-except ConsoleError, e:
-    FAIL(str(e))
+xen_mem = XenMemory(console)
 
-match = re.match("[^0-9]+([0-9]+)", run["output"])
-if not match:
-    FAIL("Invalid domU meminfo line")
-        
-origmem = int(match.group(1)) / 1024
+origmem = xen_mem.get_mem_from_domU()
 currmem = origmem
 
 for i in range(0,times):
@@ -57,17 +50,8 @@ for i in range(0,times):
             print "mem-set failed:"
             print output
         FAIL("mem-set from %i to %i failed" % (currmem, target))
-
-    try:
-        run = console.runCmd("cat /proc/xen/balloon | grep Current");
-    except ConsoleError, e:
-        FAIL(str(e))
-
-    match = re.match("[^0-9]+([0-9]+)", run["output"])
-    if not match:
-        FAIL("Invalid domU meminfo line")
-        
-    domUmem = int(match.group(1)) / 1024
+    
+    domUmem = xen_mem.get_mem_from_domU()
 
     currmem = target
     actual = int(getDomInfo(domain.getName(), "Mem"))