You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/10/02 18:41:55 UTC
[25/50] [abbrv] git commit: updated refs/heads/marvin-refactor to
bbaf354
marvin_refactor: fix imports for local deployer modules
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d0e53d5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d0e53d5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d0e53d5
Branch: refs/heads/marvin-refactor
Commit: 4d0e53d516275cbb77b2325a1b2a3b3635522695
Parents: e58cd11
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Sep 10 14:27:02 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Oct 2 20:27:42 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/deployAndRun.py | 4 ++--
tools/marvin/marvin/deployer/configGenerator.py | 3 +--
tools/marvin/marvin/deployer/deployDataCenter.py | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d0e53d5/tools/marvin/marvin/deployAndRun.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployAndRun.py b/tools/marvin/marvin/deployAndRun.py
index d162fb3..b7485aa 100644
--- a/tools/marvin/marvin/deployAndRun.py
+++ b/tools/marvin/marvin/deployAndRun.py
@@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
-import deployDataCenter
import TestCaseExecuteEngine
-import sys
+from deployer import deployDataCenter
from argparse import ArgumentParser
+
if __name__ == "__main__":
parser = ArgumentParser()
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d0e53d5/tools/marvin/marvin/deployer/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployer/configGenerator.py b/tools/marvin/marvin/deployer/configGenerator.py
index 3f20dfd..0e2f434 100644
--- a/tools/marvin/marvin/deployer/configGenerator.py
+++ b/tools/marvin/marvin/deployer/configGenerator.py
@@ -18,8 +18,7 @@
import json
import os
from optparse import OptionParser
-import jsonHelper
-
+from marvin import jsonHelper
class managementServer(object):
def __init__(self):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d0e53d5/tools/marvin/marvin/deployer/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployer/deployDataCenter.py b/tools/marvin/marvin/deployer/deployDataCenter.py
index 2ce8757..0c1c639 100644
--- a/tools/marvin/marvin/deployer/deployDataCenter.py
+++ b/tools/marvin/marvin/deployer/deployDataCenter.py
@@ -16,14 +16,14 @@
# under the License.
"""Deploy datacenters according to a json configuration file"""
-import cloudstackException
-import cloudstackTestClient
import logging
-from cloudstackAPI import *
+import configGenerator
from os import path
from time import sleep
+from cloudstackAPI import *
from optparse import OptionParser
-from marvin.deployer import configGenerator
+from marvin import cloudstackTestClient
+from marvin import cloudstackException
class deployDataCenters(object):