cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [17/50] [abbrv] git commit: updated refs/heads/marvin-refactor to bbaf354
Date Wed, 02 Oct 2013 16:41:47 GMT
marvin_refactor: correcting references to random_gen

random_gen moves to marvin.legacy.utils from marvin.utils

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

Branch: refs/heads/marvin-refactor
Commit: b19faeaf7dc76b8f1d46a90d7982f27802bc3a54
Parents: 8cdac50
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Sep 7 11:01:07 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Oct 2 20:27:27 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/factory/data/account.py              | 2 +-
 tools/marvin/marvin/factory/data/cluster.py              | 2 +-
 tools/marvin/marvin/factory/data/diskoffering.py         | 2 +-
 tools/marvin/marvin/factory/data/serviceoffering.py      | 2 +-
 tools/marvin/marvin/factory/data/user.py                 | 2 +-
 tools/marvin/marvin/factory/data/vm.py                   | 2 --
 tools/marvin/marvin/factory/data/zone.py                 | 2 +-
 tools/marvin/marvin/marvinPlugin.py                      | 3 +--
 tools/marvin/marvin/sandbox/advanced/advanced_env.py     | 4 +---
 tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py | 4 +---
 tools/marvin/marvin/sandbox/basic/basic_env.py           | 4 +---
 11 files changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/account.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/account.py b/tools/marvin/marvin/factory/data/account.py
index b0fcd7b..97caf16 100644
--- a/tools/marvin/marvin/factory/data/account.py
+++ b/tools/marvin/marvin/factory/data/account.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.account import AccountFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class UserAccountFactory(AccountFactory):
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/cluster.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/cluster.py b/tools/marvin/marvin/factory/data/cluster.py
index 321252b..c51321d 100644
--- a/tools/marvin/marvin/factory/data/cluster.py
+++ b/tools/marvin/marvin/factory/data/cluster.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import factory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 from marvin.factory.cluster import ClusterFactory
 
 class XenClusterFactory(ClusterFactory):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/diskoffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/diskoffering.py b/tools/marvin/marvin/factory/data/diskoffering.py
index ee58c27..48526b8 100644
--- a/tools/marvin/marvin/factory/data/diskoffering.py
+++ b/tools/marvin/marvin/factory/data/diskoffering.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.diskoffering import DiskOfferingFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class SharedDiskOfferingFactory(DiskOfferingFactory):
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/serviceoffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/serviceoffering.py b/tools/marvin/marvin/factory/data/serviceoffering.py
index b3a7639..955657e 100644
--- a/tools/marvin/marvin/factory/data/serviceoffering.py
+++ b/tools/marvin/marvin/factory/data/serviceoffering.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.serviceoffering import ServiceOfferingFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class SmallServiceOfferingFactory(ServiceOfferingFactory):
     cpunumber = 1

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/user.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/user.py b/tools/marvin/marvin/factory/data/user.py
index d3bde0d..d5fa456 100644
--- a/tools/marvin/marvin/factory/data/user.py
+++ b/tools/marvin/marvin/factory/data/user.py
@@ -18,7 +18,7 @@
 import factory
 from marvin.factory.user import UserFactory
 from marvin.factory.data.account import UserAccountFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class UserFactory(UserFactory):
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/vm.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/vm.py b/tools/marvin/marvin/factory/data/vm.py
index a938603..0d7aac0 100644
--- a/tools/marvin/marvin/factory/data/vm.py
+++ b/tools/marvin/marvin/factory/data/vm.py
@@ -15,9 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import factory
 from marvin.factory.virtualmachine import VirtualMachineFactory
-from marvin.utils import random_gen
 
 
 class VirtualMachineIsolatedNetwork(VirtualMachineFactory):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/factory/data/zone.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/zone.py b/tools/marvin/marvin/factory/data/zone.py
index 2936c0b..67c1cb4 100644
--- a/tools/marvin/marvin/factory/data/zone.py
+++ b/tools/marvin/marvin/factory/data/zone.py
@@ -17,7 +17,7 @@
 
 import factory
 from marvin.factory.zone import ZoneFactory
-from marvin.utils import random_gen
+from marvin.legacy.utils import random_gen
 
 class AdvancedZoneFactory(ZoneFactory):
     name = factory.Sequence(lambda n: "advzone" + random_gen())

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index aded17c..b98b5a6 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -15,13 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import marvin
 import sys
 import logging
 import nose.core
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin import deployDataCenter
 from nose.plugins.base import Plugin
+from marvin.deployer import deployDataCenter
 
 
 class MarvinPlugin(Plugin):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/sandbox/advanced/advanced_env.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/advanced/advanced_env.py b/tools/marvin/marvin/sandbox/advanced/advanced_env.py
index 4a2fbfb..5483ad7 100644
--- a/tools/marvin/marvin/sandbox/advanced/advanced_env.py
+++ b/tools/marvin/marvin/sandbox/advanced/advanced_env.py
@@ -22,11 +22,9 @@
 #    * Only a sandbox
 ############################################################
 '''
-import random
-import marvin
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser
-from marvin.configGenerator import *
+from marvin.deployer.configGenerator import *
 
 
 def getGlobalSettings(config):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
index 9cf4a0a..a44bf95 100644
--- a/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
+++ b/tools/marvin/marvin/sandbox/advancedsg/advancedsg_env.py
@@ -22,11 +22,9 @@
 #    * Only a sandbox
 ############################################################
 '''
-import random
-import marvin
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser
-from marvin.configGenerator import *
+from marvin.deployer.configGenerator import *
 
 
 def getGlobalSettings(config):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b19faeaf/tools/marvin/marvin/sandbox/basic/basic_env.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/basic/basic_env.py b/tools/marvin/marvin/sandbox/basic/basic_env.py
index bf106fc..c60b41d 100644
--- a/tools/marvin/marvin/sandbox/basic/basic_env.py
+++ b/tools/marvin/marvin/sandbox/basic/basic_env.py
@@ -23,11 +23,9 @@
 #    * Only a sandbox
 ############################################################
 '''
-import random
-import marvin
 from ConfigParser import SafeConfigParser
 from optparse import OptionParser
-from marvin.configGenerator import *
+from marvin.deployer.configGenerator import *
 
 
 def getGlobalSettings(config):


Mime
View raw message