From: John Spray <john.spray@redhat.com>
Date: Wed, 30 Mar 2016 10:43:22 +0000 (+0100)
Subject: qa: update rest test cephfs calls (part 2)
X-Git-Tag: v10.1.1~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d034539c52557fff2c3fcb47d3de80ee7aec3066;p=ceph.git

qa: update rest test cephfs calls (part 2)

"mds stat" now gives fsmap output rather than
mdsmap.  Update the rest api test's expectations.

Fixes: http://tracker.ceph.com/issues/15309
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index 7078da648db4..fb633c0eeb22 100755
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -196,9 +196,9 @@ if __name__ == '__main__':
     r = expect('mds/stat.json', 'GET', 200, 'json')
     expect('mds/set?var=max_mds&val=2', 'PUT', 200, '')
     r = expect('mds/stat.json', 'GET', 200, 'json')
-    assert('info' in r.myjson['output']['mdsmap'])
+    assert('epoch' in r.myjson['output']['fsmap'])
     r = expect('mds/stat.xml', 'GET', 200, 'xml')
-    assert(r.tree.find('output/mds_stat/mdsmap/info') is not None)
+    assert(r.tree.find('output/mds_stat/fsmap/epoch') is not None)
 
     # more content tests below, just check format here
     expect('mon/dump.json', 'GET', 200, 'json')