[31/50] [abbrv] git commit: updated refs/heads/marvin_refactor to b784012

[ts...@apache.org]

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/dad9ce21
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dad9ce21
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dad9ce21

Branch: refs/heads/marvin_refactor
Commit: dad9ce211aa7c28f25ba22c17afe4da9ad6bd3fa
Parents: 8a816e5
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Sep 13 15:58:12 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Oct 31 13:54:24 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/dad9ce21/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/dad9ce21/tools/marvin/marvin/legacy/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/legacy/utils.py b/tools/marvin/marvin/legacy/utils.py
index fcfa338..3170ea7 100644
--- a/tools/marvin/marvin/legacy/utils.py
+++ b/tools/marvin/marvin/legacy/utils.py
@@ -242,7 +242,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"