Updated Branches: refs/heads/bvt 274174389 -> bbd7046b0
sync: revert sync via marvin sync happens via codegenerator. Add sync capability back into the noseplugin later. Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bbd7046b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbd7046b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbd7046b Branch: refs/heads/bvt Commit: bbd7046b0a23308796a3339badf3f82bd321ef8d Parents: 2741743 Author: Prasanna Santhanam <t...@apache.org> Authored: Thu Mar 28 19:41:16 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Thu Mar 28 19:41:16 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/cloudstackTestClient.py | 8 -------- tools/marvin/marvin/marvinPlugin.py | 16 +--------------- 2 files changed, 1 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbd7046b/tools/marvin/marvin/cloudstackTestClient.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py index 4bfb90b..e4735e4 100644 --- a/tools/marvin/marvin/cloudstackTestClient.py +++ b/tools/marvin/marvin/cloudstackTestClient.py @@ -148,14 +148,6 @@ class cloudstackTestClient(object): return self.userApiClient return None - def synchronize(self): - """ - synchronize the api from an endpoint - """ - apiclient = self.getApiClient() - cmd = listApis.listApisCmd() - response = apiclient.listApis(cmd) - '''FixME, httplib has issue if more than one thread submitted''' def submitCmdsAndWait(self, cmds, workers=1): http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbd7046b/tools/marvin/marvin/marvinPlugin.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py index 518f27f..46a8a4f 100644 --- a/tools/marvin/marvin/marvinPlugin.py +++ b/tools/marvin/marvin/marvinPlugin.py @@ -21,7 +21,6 @@ import logging import nose.core from marvin.cloudstackTestCase import cloudstackTestCase from marvin import deployDataCenter -from marvin import apiSynchronizer from nose.plugins.base import Plugin from functools import partial @@ -40,10 +39,6 @@ class MarvinPlugin(Plugin): self.enableOpt = "--with-marvin" self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s") - if options.sync: - self.do_sync(options.config) - return - if options.debug_log: self.logger = logging.getLogger("NoseTestExecuteEngine") self.debug_stream = logging.FileHandler(options.debug_log) @@ -71,13 +66,6 @@ class MarvinPlugin(Plugin): self.testrunner = nose.core.TextTestRunner(stream=self.result_stream, descriptions=True, verbosity=2, config=config) - def do_sync(self, config): - """ - Use the ApiDiscovery plugin exposed by the CloudStack mgmt server to rebuild the cloudStack API - """ - apiSynchronizer.sync(config) - - def options(self, parser, env): """ Register command line options @@ -96,9 +84,7 @@ class MarvinPlugin(Plugin): help="The path to the testcase debug logs [DEBUG_LOG]") parser.add_option("--load", action="store_true", default=False, dest="load", help="Only load the deployment configuration given") - parser.add_option("--sync", action="store_true", default=False, dest="sync", - help="Sync the APIs from the CloudStack endpoint in marvin-config") - + Plugin.options(self, parser, env) def __init__(self):
