marvin_refactor: changes to legacy's imports
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b82d7c5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b82d7c5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b82d7c5 Branch: refs/heads/marvin-refactor Commit: 1b82d7c56572c22e69cb4ee62fa02f14419d1828 Parents: 5eebce1 Author: Prasanna Santhanam <[email protected]> Authored: Fri Sep 13 15:58:12 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Oct 2 20:27:49 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/legacy/common.py | 2 +- tools/marvin/marvin/legacy/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b82d7c5/tools/marvin/marvin/legacy/common.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/legacy/common.py b/tools/marvin/marvin/legacy/common.py index 63bff7c..cfb8ea6 100644 --- a/tools/marvin/marvin/legacy/common.py +++ b/tools/marvin/marvin/legacy/common.py @@ -21,7 +21,7 @@ from marvin.cloudstackAPI import * from marvin.remoteSSHClient import remoteSSHClient from marvin.legacy.utils import * -from marvin.integration.lib.base import Configurations +from marvin.legacy.base import Configurations #Import System modules import time http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b82d7c5/tools/marvin/marvin/legacy/utils.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/legacy/utils.py b/tools/marvin/marvin/legacy/utils.py index 44a6e96..f1b8e03 100644 --- a/tools/marvin/marvin/legacy/utils.py +++ b/tools/marvin/marvin/legacy/utils.py @@ -241,7 +241,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid): @return: True if snapshot is found, False otherwise """ - from entity import ImageStore, Snapshot + from base import ImageStore, Snapshot secondaryStores = ImageStore.list(apiclient, zoneid=zoneid) assert isinstance(secondaryStores, list), "Not a valid response for listImageStores"
