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>

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):
 

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):

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):
 

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

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):
 

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):

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())

tools/marvin/marvin/marvinPlugin.py

@@ -15,14 +15,13 @@
 # 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
 import time
+from marvin.deployer import deployDataCenter
 
 
 class MarvinPlugin(Plugin):

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):

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):

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):