Merge pull request apache#902 from sanju1010/simulator

remibergsma · remibergsma · commit 2af9611c2053 · 2015-11-04T13:05:43.000+01:00
CLOUDSTACK-8924: Enable dynamic scaling to run test_scale_vm.py test on simulatorSimulator setup uses the config file from following location: tools/marvin/marvin/config/setup.cfg Added global setting parameter "enable.dynamic.scale.vm" to above config file, so that dynamic scale vm tests can be run on simulator. * pr/902: CLOUDSTACK-8924: Made changes based on the comments from @pvr9711 Signed-off-by: Remi Bergsma <github@remi.nl>
diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg
@@ -168,6 +168,10 @@
         {
             "name": "check.pod.cidrs",
             "value": "true"
+        },
+        {
+            "name": "enable.dynamic.scale.vm",
+            "value": "true"
         }
     ],
     "mgtSvr": [

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,10 @@`
`168`	`168`	`{`
`169`	`169`	`"name": "check.pod.cidrs",`
`170`	`170`	`"value": "true"`
	`171`	`+ },`
	`172`	`+ {`
	`173`	`+ "name": "enable.dynamic.scale.vm",`
	`174`	`+ "value": "true"`
`171`	`175`	`}`
`172`	`176`	`],`
`173`	`177`	`"mgtSvr": [`