From 6151a299491c71d8dc7de951f5153e9ef2ae064c Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Fri, 12 Oct 2012 16:11:17 -0400 Subject: [PATCH] CLOUDSTACK-326: Combining Marvin Sandbox README with README.tools.md Signed-off-by: Chip Childers --- README.tools.md | 31 ++++++++++++++++++++++++++ tools/marvin/marvin/sandbox/README.txt | 30 ------------------------- 2 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 tools/marvin/marvin/sandbox/README.txt diff --git a/README.tools.md b/README.tools.md index 0319707b815..a5261f3bc10 100644 --- a/README.tools.md +++ b/README.tools.md @@ -206,6 +206,37 @@ The following files contain these P1 cases: 13. test_project_usage.py - Project usage related tests 14. test_projects - Projects functionality tests +Marvin Sandbox +========================================================= +In: tools/marvin/marvin/sandbox + +In here you should find a few common deployment models of CloudStack that you +can configure with properties files to suit your own deployment. One deployment +model for each of - advanced zone, basic zone and a simulator demo are given. + +$ ls - +basic/ +advanced/ +simulator/ + +Each property file is divided into logical sections and should be familiar to +those who have deployed CloudStack before. Once you have your properties file +you will have to create a JSON configuration of your deployment using the +python script provided in the respective folder. + +The demo files are from the tutorial for testing with python that can be found at + https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python + +A common deployment model of a simulator.cfg that can be used for debugging is +included. This will configure an advanced zone with simulators that can be used +for debugging purposes when you do not have hardware to debug with. + +To do this: +$ cd cloudstack-oss/ +$ ant run-simulator #This will start up the mgmt server with the simulator seeded + +## In another shell +$ ant run-simulator test/conf - EC2 script ========================================================= diff --git a/tools/marvin/marvin/sandbox/README.txt b/tools/marvin/marvin/sandbox/README.txt deleted file mode 100644 index bb4d35e10e3..00000000000 --- a/tools/marvin/marvin/sandbox/README.txt +++ /dev/null @@ -1,30 +0,0 @@ -Welcome to the marvin sandbox ----------------------------------- - -In here you should find a few common deployment models of CloudStack that you -can configure with properties files to suit your own deployment. One deployment -model for each of - advanced zone, basic zone and a simulator demo are given. - -$ ls - -basic/ -advanced/ -simulator/ - -Each property file is divided into logical sections and should be familiar to -those who have deployed CloudStack before. Once you have your properties file -you will have to create a JSON configuration of your deployment using the -python script provided in the respective folder. - -The demo files are from the tutorial for testing with python that can be found at - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python - -A common deployment model of a simulator.cfg that can be used for debugging is -included. This will configure an advanced zone with simulators that can be used -for debugging purposes when you do not have hardware to debug with. - -To do this: -$ cd cloudstack-oss/ -$ ant run-simulator #This will start up the mgmt server with the simulator seeded - -## In another shell -$ ant run-simulator