Merge "Add coverage-reset command to reset Nova coverage data."

This commit is contained in:
Jenkins 2013-04-14 22:49:00 +00:00 committed by Gerrit Code Review
commit 74132e5078
5 changed files with 22 additions and 1 deletions

View File

@ -54,3 +54,9 @@ class CoverageManager(base.ManagerWithFind):
self.run_hooks('modify_body_for_action', body)
url = '/os-coverage/action'
return self.api.client.post(url, body=body)
def reset(self):
body = {'reset': {}}
self.run_hooks('modify_body_for_action', body)
url = '/os-coverage/action'
return self.api.client.post(url, body=body)

View File

@ -2520,6 +2520,12 @@ def do_coverage_report(cs, args):
print("Report path: %s" % cov[-1]['path'])
def do_coverage_reset(cs, args):
"""Reset coverage data."""
cs.coverage.reset()
print("Coverage data reset")
@utils.arg('--matching', metavar='<hostname>', default=None,
help='List hypervisors matching the given <hostname>.')
def do_hypervisor_list(cs, args):

View File

@ -1566,7 +1566,7 @@ class FakeHTTPClient(base_client.HTTPClient):
return (202, {}, None)
def post_os_coverage_action(self, body, **kw):
if 'start' in body:
if 'start' in body or 'reset' in body:
return (200, {}, None)
elif 'stop' in body:
return (200, {}, {'path': '/tmp/tmpdir/'})

View File

@ -41,3 +41,7 @@ class CoverageTest(utils.TestCase):
c = cs.coverage.report('report')
return_dict = {'path': '/tmp/tmpdir/report'}
cs.assert_called_anytime('POST', '/os-coverage/action')
def test_reset_coverage(self):
c = cs.coverage.reset()
cs.assert_called_anytime('POST', '/os-coverage/action')

View File

@ -957,6 +957,11 @@ class ShellTest(utils.TestCase):
body = {'report': {'xml': True, 'file': 'report'}}
self.assert_called_anytime('POST', '/os-coverage/action', body)
def test_coverage_reset(self):
self.run_command('coverage-reset')
body = {'reset': {}}
self.assert_called_anytime('POST', '/os-coverage/action', body)
def test_hypervisor_list(self):
self.run_command('hypervisor-list')
self.assert_called('GET', '/os-hypervisors')