basic environment config generration

tools/marvin/marvin/sandbox/basic/basic_env.py

@@ -44,8 +44,7 @@ def describeResources(config):
     v.startip = config.get('cloudstack', 'public.vlan.startip')
     v.endip = config.get('cloudstack', 'public.vlan.endip') 
     v.netmask = config.get('cloudstack', 'public.netmask')
-    v.vlan = config.get('cloudstack', 'public.vlan')
-    z.ipranges.append(v)
+    p.guestIpRanges.append(v)
 
     c = cluster()
     c.clustername = 'C0'

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