diff --git a/tools/marvin/marvin/sandbox/basic/setup.properties b/tools/marvin/marvin/sandbox/basic/setup.properties new file mode 100644 index 00000000000..08cdb79abea --- /dev/null +++ b/tools/marvin/marvin/sandbox/basic/setup.properties @@ -0,0 +1,43 @@ +[globals] +#global settings in cloudstack +expunge.delay=60 +expunge.interval=60 +storage.cleanup.interval=300 +account.cleanup.interval=600 +expunge.workers=3 +workers=10 +use.user.concentrated.pod.allocation=false +vm.allocation.algorithm=random +vm.op.wait.interval=5 +guest.domain.suffix=sandbox.kvm +instance.name=QA +direct.agent.load.size=1000 +default.page.size=10000 +check.pod.cidrs=true +secstorage.allowed.internal.sites=10.147.28.0/24 +[environment] +dns=10.147.28.6 +mshost=localhost +mysql.host=localhost +mysql.cloud.user=cloud +mysql.cloud.passwd=cloud +[cloudstack] +#guest VLAN +zone.vlan=675-679 +#management network +private.gateway=10.147.29.1 +private.pod.startip=10.147.29.150 +private.pod.endip=10.147.29.159 +private.netmask=255.255.255.0 +#public network +public.gateway=10.147.31.1 +public.vlan.startip=10.147.31.150 +public.vlan.endip=10.147.31.159 +public.netmask=255.255.255.0 +#hypervisor host information +hypervisor=Simulator +host=sim +host.password=password +#storage pools +primary.pool=nfs://10.147.28.6:/export/home/sandbox/kamakura +secondary.pool=nfs://10.147.28.6:/export/home/sandbox/sstor diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index b2d6a40cd4b..211011d9885 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -36,7 +36,6 @@ setup(name="Marvin", packages=["marvin", "marvin.cloudstackAPI", "marvin.sandbox", "marvin.sandbox.advanced", "marvin.sandbox.basic", "marvin.pymysql", "marvin.pymysql.constants", "marvin.pymysql.tests"], license="LICENSE.txt", install_requires=[ - "Python>=2.7", "paramiko", "nose" ],