cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [20/50] [abbrv] git commit: updated refs/heads/marvin_refactor to b784012
Date Mon, 18 Nov 2013 08:50:27 GMT
marvin_refactor: fix imports for local deployer modules

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4ea9a2c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4ea9a2c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4ea9a2c4

Branch: refs/heads/marvin_refactor
Commit: 4ea9a2c4027b28f0df7afd7976060c78f15e8bf8
Parents: 73193ec
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue Sep 10 14:27:02 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Oct 31 13:54:23 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/4ea9a2c4/tools/marvin/marvin/deployAndRun.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployAndRun.py b/tools/marvin/marvin/deployAndRun.py
index 8a758a1..8bb24b3 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/4ea9a2c4/tools/marvin/marvin/deployer/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployer/configGenerator.py b/tools/marvin/marvin/deployer/configGenerator.py
index 5e511d6..ff7a2a8 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/4ea9a2c4/tools/marvin/marvin/deployer/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployer/deployDataCenter.py b/tools/marvin/marvin/deployer/deployDataCenter.py
index c260ddb..1c9b48f 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):


Mime
View raw message