You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/03 03:54:13 UTC

[23/30] git commit: Removing the obsolete scripts directory from agent-simulator

Removing the obsolete scripts directory from agent-simulator

These are legacy bash scripts which were used to setup configurations of
mgmt server when testing its scalability.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1a18d5ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1a18d5ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1a18d5ca

Branch: refs/heads/vpc
Commit: 1a18d5ca7f1cd671644423aa73566abc161f9a13
Parents: 714a9fa
Author: Prasanna Santhanam <Pr...@citrix.com>
Authored: Thu Aug 2 19:44:17 2012 +0530
Committer: Prasanna Santhanam <Pr...@citrix.com>
Committed: Thu Aug 2 19:44:17 2012 +0530

----------------------------------------------------------------------
 agent-simulator/scripts/__old__/deletePod.sh       |   26 --
 .../scripts/__old__/deleteServiceOffering.sh       |   25 --
 agent-simulator/scripts/__old__/deleteVlan.sh      |   26 --
 .../scripts/__old__/deployVirtualMachine.sh        |   26 --
 agent-simulator/scripts/__old__/listRouters.sh     |   22 --
 .../scripts/__old__/listVirtualMachine.sh          |   22 --
 .../scripts/__old__/queryAsyncJobResult.sh         |   53 ---
 agent-simulator/scripts/__old__/run.sh             |   25 --
 agent-simulator/scripts/__old__/setupDirectPods.sh |   31 --
 agent-simulator/scripts/__old__/setupHosts.sh      |   23 --
 .../scripts/__old__/setupPodAndNetwork.sh          |   39 ---
 .../scripts/__old__/setupServiceOffering.sh        |   24 --
 agent-simulator/scripts/__old__/setupVlan.sh       |   26 --
 .../scripts/__old__/simulator_advanced.sh          |   55 ---
 agent-simulator/scripts/__old__/simulator_basic.sh |   53 ---
 agent-simulator/scripts/__old__/startRouter.sh     |   26 --
 agent-simulator/scripts/__old__/testQuery.sh       |   22 --
 agent-simulator/scripts/addHostStats.py            |   52 ---
 agent-simulator/scripts/addHosts.png               |  Bin 44302 -> 0 bytes
 .../scripts/guava/__old__/1000routers.sh           |   37 --
 .../scripts/guava/__old__/createAdminAccount.sh    |   24 --
 .../scripts/guava/__old__/createStoragePool.sh     |   20 --
 .../scripts/guava/__old__/createUserAccount.sh     |   24 --
 .../scripts/guava/__old__/deleteAccount.sh         |   25 --
 agent-simulator/scripts/guava/__old__/deletePod.sh |   26 --
 .../scripts/guava/__old__/deleteServiceOffering.sh |   25 --
 .../scripts/guava/__old__/deleteVlan.sh            |   26 --
 .../scripts/guava/__old__/deployVirtualMachine.sh  |   27 --
 .../scripts/guava/__old__/destroyVirtualMachine.sh |   25 --
 .../scripts/guava/__old__/listCapacity.sh          |   22 --
 .../scripts/guava/__old__/listEvents.sh            |   22 --
 agent-simulator/scripts/guava/__old__/listHosts.sh |   22 --
 .../scripts/guava/__old__/listRouters.sh           |   22 --
 .../scripts/guava/__old__/listTemplates.sh         |   22 --
 .../scripts/guava/__old__/listVirtualMachine.sh    |   22 --
 agent-simulator/scripts/guava/__old__/load.sh      |   31 --
 .../scripts/guava/__old__/networkShutDown.sh       |   24 --
 .../scripts/guava/__old__/networkStart.sh          |   24 --
 .../scripts/guava/__old__/reconnectStats.sh        |   28 --
 agent-simulator/scripts/guava/__old__/setup.sh     |   44 ---
 .../scripts/guava/__old__/setupDirectPods.sh       |   31 --
 .../scripts/guava/__old__/setupHosts.sh            |   23 --
 .../scripts/guava/__old__/setupPodAndNetwork.sh    |   39 ---
 .../scripts/guava/__old__/setupServiceOffering.sh  |   24 --
 agent-simulator/scripts/guava/__old__/setupVlan.sh |   26 --
 .../scripts/guava/__old__/startRouter.sh           |   26 --
 .../scripts/guava/__old__/startVirtualMachine.sh   |   26 --
 .../scripts/guava/__old__/stopVirtualMachine.sh    |   26 --
 agent-simulator/scripts/guava/__old__/stress.sh    |   55 ---
 agent-simulator/scripts/guava/__old__/stress2.sh   |  127 -------
 agent-simulator/scripts/guava/setup.py             |  147 --------
 .../scripts/guava/tests/testProvision.py           |  139 --------
 agent-simulator/scripts/kumquat/setup.py           |  194 -----------
 .../scripts/kumquat/tests/testProvision.py         |  259 ---------------
 agent-simulator/scripts/run.bat                    |   19 -
 .../scripts/zucchini/__old__/deletePod.sh          |   26 --
 .../zucchini/__old__/deleteServiceOffering.sh      |   25 --
 .../scripts/zucchini/__old__/deleteVlan.sh         |   26 --
 .../scripts/zucchini/__old__/deployBulk-sg.sh      |  206 ------------
 .../scripts/zucchini/__old__/deployBulk.sh         |  159 ---------
 .../zucchini/__old__/deployVirtualMachine.sh       |   26 --
 .../scripts/zucchini/__old__/destroySystemVm.sh    |   52 ---
 .../zucchini/__old__/destroyVirtualMachine.sh      |   25 --
 .../scripts/zucchini/__old__/listCapacity.sh       |   22 --
 .../scripts/zucchini/__old__/listEvents.sh         |   22 --
 .../scripts/zucchini/__old__/listHosts.sh          |   22 --
 .../scripts/zucchini/__old__/listRouters.sh        |   22 --
 .../scripts/zucchini/__old__/listTemplates.sh      |   22 --
 .../scripts/zucchini/__old__/listVirtualMachine.sh |   22 --
 .../scripts/zucchini/__old__/monitor.sh            |   36 --
 .../scripts/zucchini/__old__/newsetup.sh           |  228 -------------
 .../scripts/zucchini/__old__/reconnectStats.sh     |   28 --
 agent-simulator/scripts/zucchini/__old__/setup.sh  |   90 -----
 .../scripts/zucchini/__old__/setupDirectPods.sh    |   31 --
 .../scripts/zucchini/__old__/setupHosts.sh         |   23 --
 .../scripts/zucchini/__old__/setupPodAndNetwork.sh |   39 ---
 .../zucchini/__old__/setupServiceOffering.sh       |   24 --
 .../scripts/zucchini/__old__/setupVlan.sh          |   26 --
 .../scripts/zucchini/__old__/setup_sg.sh           |  252 --------------
 agent-simulator/scripts/zucchini/__old__/small.sh  |  158 ---------
 .../scripts/zucchini/__old__/so_setup.sh           |   21 --
 .../scripts/zucchini/__old__/startRouter.sh        |   26 --
 .../zucchini/__old__/startVirtualMachine.sh        |   26 --
 .../scripts/zucchini/__old__/stopRouter.sh         |   49 ---
 .../scripts/zucchini/__old__/stopVirtualMachine.sh |   49 ---
 .../scripts/zucchini/__old__/zucchini219.sh        |  119 -------
 agent-simulator/scripts/zucchini/setup.py          |  217 ------------
 .../scripts/zucchini/tests/testListVm.py           |   53 ---
 .../scripts/zucchini/tests/testProvision.py        |  184 ----------
 .../scripts/zucchini/zucchini.configuration.sql    |   46 ---
 90 files changed, 0 insertions(+), 4681 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/deletePod.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deletePod.sh b/agent-simulator/scripts/__old__/deletePod.sh
deleted file mode 100755
index 01cb7ce..0000000
--- a/agent-simulator/scripts/__old__/deletePod.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-pod_query="GET  http://10.91.30.226:8096/client/?command=deletePod&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $pod_query | nc -v -q 20 10.91.30.226 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/deleteServiceOffering.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deleteServiceOffering.sh b/agent-simulator/scripts/__old__/deleteServiceOffering.sh
deleted file mode 100755
index 1a6c808..0000000
--- a/agent-simulator/scripts/__old__/deleteServiceOffering.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-delete_so="GET  http://10.91.30.226:8096/client/?command=deleteServiceOffering&id=$x	HTTP/1.0\n\n"
-
-echo -e $delete_so | nc -v -q 20 10.91.30.226 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/deleteVlan.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deleteVlan.sh b/agent-simulator/scripts/__old__/deleteVlan.sh
deleted file mode 100755
index 34ced90..0000000
--- a/agent-simulator/scripts/__old__/deleteVlan.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-vlan_query="GET  http://10.91.30.226:8096/client/?command=deleteVlanIpRange&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $vlan_query | nc -v -q 20 10.91.30.226 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/deployVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/deployVirtualMachine.sh b/agent-simulator/scripts/__old__/deployVirtualMachine.sh
deleted file mode 100755
index 15539d2..0000000
--- a/agent-simulator/scripts/__old__/deployVirtualMachine.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-zoneid=$1
-templateId=$2
-serviceOfferingId=$3
-
-query="GET	http://10.91.30.226:8096/client/?command=deployVirtualMachine&zoneId=$1&templateId=$2&serviceOfferingId=$3&account=admin&domainid=1	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 20 10.91.30.226 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/listRouters.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/listRouters.sh b/agent-simulator/scripts/__old__/listRouters.sh
deleted file mode 100755
index d98a8e5..0000000
--- a/agent-simulator/scripts/__old__/listRouters.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.30.226:8096/client/?command=listRouters&zoneId=$1&account=admin&domainid=1	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v 10.91.30.226 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/listVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/listVirtualMachine.sh b/agent-simulator/scripts/__old__/listVirtualMachine.sh
deleted file mode 100755
index 40e2a44..0000000
--- a/agent-simulator/scripts/__old__/listVirtualMachine.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.28.33:8096/client/?command=listVirtualMachines&zoneId=$1&account=admin&domainid=1	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 20 10.91.28.33 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/queryAsyncJobResult.sh b/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
deleted file mode 100755
index 768b331..0000000
--- a/agent-simulator/scripts/__old__/queryAsyncJobResult.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-usage() {
-  printf "Query job result Usage: %s: -h management-server -j jobid\n" $(basename $0) >&2
-}
-
-#options
-jflag=
-hflag=
-
-jobid=
-host="127.0.0.1" #defaults to localhost
-
-while getopts 'h:j:' OPTION
-do
- case $OPTION in
-  h)	hflag=1
-        host="$OPTARG"
-        ;;
-  j)    jflag=1
-        jobid="$OPTARG"
-        ;;
-  ?)	usage
-		exit 2
-		;;
-  esac
-done
-
-if [ $jflag != "1" ]
-then
- usage
- exit 2
-fi
-
-
-job_query="GET  http://$host:8096/client/?command=queryAsyncJobResult&jobid=$jobid	HTTP/1.0\n\n"
-echo -e $job_query | nc -v -w 60 $host 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/run.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/run.sh b/agent-simulator/scripts/__old__/run.sh
deleted file mode 100644
index 015f3f7..0000000
--- a/agent-simulator/scripts/__old__/run.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
- 
-
-#run.sh runs the agent simulator client.
-java -cp cloud-utils.jar:agent-simulator.jar:log4j-1.2.15.jar:apache-log4j-extras-1.0.jar:ws-commons-util-1.0.2.jar:xmlrpc-client-3.1.3.jar:cloud-agent.jar:cloud-core.jar:xmlrpc-common-3.1.3.jar:javaee-api-5.0-1.jar:gson-1.3.jar:commons-httpclient-3.1.jar:commons-logging-1.1.1.jar:commons-codec-1.4.jar:commons-collections-3.2.1.jar:commons-pool-1.4.jar:.:./conf com.cloud.agent.AgentSimulator $@
-
- 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/setupDirectPods.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupDirectPods.sh b/agent-simulator/scripts/__old__/setupDirectPods.sh
deleted file mode 100755
index 2a252d4..0000000
--- a/agent-simulator/scripts/__old__/setupDirectPods.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-y=$2
-name=$3
-
-pod_query="GET  http://10.91.30.226:8096/client/?command=createPod&zoneId=1&name=SSP$name&cidr=182.$x.$y.0%2F24&startIp=182.$x.$y.2&endIp=182.$x.$y.252&gateway=182.$x.$y.1
-HTTP/1.0\n\n"
-
-echo -e $pod_query | nc -v -q 20 10.91.30.226 8096
-
-#vlan_query="GET http://10.91.30.226/client/?command=createVlanIpRange&vlan=untagged&zoneid=1&podId=$name&forVirtualNetwork=false&gateway=172.$y.$x.1&netmask=255.255.255.0&startip=172.$y.$x.2&endip=172.$y.$x.252        HTTP/1.0\n\n"
-
-#echo -e $vlan_query | nc -v -q 20 10.91.30.226 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/setupHosts.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupHosts.sh b/agent-simulator/scripts/__old__/setupHosts.sh
deleted file mode 100755
index b36d728..0000000
--- a/agent-simulator/scripts/__old__/setupHosts.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-name=$1
-
-host_query="GET	http://10.91.30.226:8096/client/?command=addHost&zoneId=1&podId=$((name+250))&username=sim&password=sim&clustername=simulator-$name&hosttags=RP$name&url=http%3A%2F%2Fsim	HTTP/1.0\n\n"
-echo -e $host_query | nc -v -w 60 10.91.30.226 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/setupPodAndNetwork.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupPodAndNetwork.sh b/agent-simulator/scripts/__old__/setupPodAndNetwork.sh
deleted file mode 100755
index 8b22436..0000000
--- a/agent-simulator/scripts/__old__/setupPodAndNetwork.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-workers=$1
-x=$2 #CIDR - 16bytes
-y=$3 #CIDR - 8 bytes
-
-for name in `seq 1 $workers`
-do
-	pod_query="GET  http://10.91.30.226:8096/client/?command=createPod&zoneId=1&name=RP$name&cidr=182.$x.$y.0%2F24&startIp=182.$x.$y.2&endIp=182.$x.$y.252&gateway=182.$x.$y.1	HTTP/1.0\n\n"
-	vlan_query="GET http://10.91.30.226:8096/client/?command=createVlanIpRange&vlan=untagged&zoneid=1&podId=$((name+250))&forVirtualNetwork=false&gateway=182.$y.$x.1&netmask=255.255.255.0&startip=182.$y.$x.2&endip=182.$y.$x.252        HTTP/1.0\n\n"
-	so_query="GET	http://10.91.30.226:8096/client/?command=createServiceOffering&name=RP$name&displayText=RP$name&storageType=local&cpuNumber=1&cpuSpeed=1000&memory=512&offerha=false&usevirtualnetwork=false&hosttags=RP$name	HTTP/1.0\n\n"
-
-	echo -e $pod_query | nc -v -w 20 10.91.30.226 8096
-	echo -e $vlan_query | nc -v -w 20 10.91.30.226 8096
-	echo -e $so_query | nc -v -w 20 10.91.30.226 8096
-
-	let x+=1
-	let y+=1
-done
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/setupServiceOffering.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupServiceOffering.sh b/agent-simulator/scripts/__old__/setupServiceOffering.sh
deleted file mode 100755
index fecf242..0000000
--- a/agent-simulator/scripts/__old__/setupServiceOffering.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-so_query="GET	http://10.91.30.226:8096/client/?command=createServiceOffering&name=SO$x&displayText=SO$x&storageType=local&cpuNumber=1&cpuSpeed=1000&memory=512&offerha=false&usevirtualnetwork=false&hosttags=SP$x	HTTP/1.0\n\n"
-
-echo -e $so_query | nc -v -q 20 10.91.30.226 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/setupVlan.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/setupVlan.sh b/agent-simulator/scripts/__old__/setupVlan.sh
deleted file mode 100755
index 983dcec..0000000
--- a/agent-simulator/scripts/__old__/setupVlan.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-y=$2
-name=$3
-
-vlan_query="GET http://10.91.30.226/client/?command=createVlanIpRange&vlan=untagged&zoneid=1&podId=$name&forVirtualNetwork=false&gateway=172.$x.$y.1&netmask=255.255.255.0&startip=172.$x.$y.2&endip=172.$x.$y.252        HTTP/1.0\n\n"
-
-echo -e $vlan_query | nc -v -q 20 10.91.30.226 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/simulator_advanced.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/simulator_advanced.sh b/agent-simulator/scripts/__old__/simulator_advanced.sh
deleted file mode 100755
index e353c0a..0000000
--- a/agent-simulator/scripts/__old__/simulator_advanced.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-a=$1 #CIDR - 16bytes
-b=$2 #CIDR - 8 bytes
-host=$3
-zoneid=$4
-
-zone_query="GET  http://$host/client/?command=createZone&networktype=Advanced&securitygroupenabled=false&name=SimulatorAdvanced&dns1=4.2.2.2&internaldns1=4.2.2.2&vlan=10-4000&guestcidraddress=10.1.1.0%2F24  HTTP/1.0\n\n"
-echo -e $zone_query | nc -v -w 120 $host 8096
-
-let x=a
-let y=b
-for name in `seq 1 1`
-do
-	pod_query="GET  http://$host/client/?command=createPod&zoneid=$zoneid&name=POD$name&netmask=255.255.0.0&startIp=172.$x.$y.2&endIp=172.$x.$y.252&gateway=172.$x.$y.1	HTTP/1.0\n\n"
-	vlan_query="GET http://$host/client/?command=createVlanIpRange&forVirtualNetwork=true&vlan=untagged&zoneid=$zoneid&podId=$name&gateway=172.$y.$x.1&netmask=255.255.255.0&startip=172.$y.$x.2&endip=172.$y.$x.252        HTTP/1.0\n\n"
-	echo -e $pod_query | nc -v -w 20 $host 8096
-	echo -e $vlan_query | nc -v -w 20 $host 8096
-done
-let x+=1
-let y+=1
-
-name=1
-
-clusterid=1
-for cluster in `seq 1 1`
-do
-	cluster_query="GET  http://$host/client/?command=addCluster&hypervisor=Simulator&clustertype=CloudManaged&zoneid=$zoneid&podId=1&clustername=POD$name-CLUSTER$cluster HTTP/1.0\n\n"
-	echo -e $cluster_query | nc -v -w 120 $host 8096
-
-	host_query="GET	http://$host/client/?command=addHost&zoneid=$zoneid&podId=1&username=sim&password=sim&clusterid=$cluster&hypervisor=Simulator&clustertype=CloudManaged&url=http%3A%2F%2Fsim	HTTP/1.0\n\n"
-	echo -e $host_query | nc -v -w 6000 $host 8096
-
-	spool_query="GET	http://$host/client/?command=createStoragePool&zoneid=$zoneid&podId=1&clusterid=$cluster&name=SPOOL$cluster&url=nfs://172.1.25.$((cluster+1))/export/share/$cluster   HTTP/1.0\n\n"
-	echo -e $spool_query | nc -v -w 6000 $host 8096
-	let clusterid+=1
-done
-
-sstorquery="GET	http://$host/client/?command=addSecondaryStorage&zoneid=$zoneid&url=nfs://172.1.25.32/export/share/   HTTP/1.0\n\n"
-echo -e $sstorquery | nc -v -w 6000 $host 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/simulator_basic.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/simulator_basic.sh b/agent-simulator/scripts/__old__/simulator_basic.sh
deleted file mode 100755
index 11de82a..0000000
--- a/agent-simulator/scripts/__old__/simulator_basic.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-a=$1 #CIDR - 16bytes
-b=$2 #CIDR - 8 bytes
-host=$3 #MSHOST
-zoneid=$4
-
-zone_query="GET  http://$host/client/?command=createZone&networktype=Basic&securitygroupenabled=false&name=SimulatorBasic&dns1=4.2.2.2&internaldns1=4.2.2.2&vlan=10-4000  HTTP/1.0\n\n"
-echo -e $zone_query | nc -v -w 120 $host 8096
-
-let x=a
-let y=b
-
-for name in `seq $zoneid 1`
-do
-	pod_query="GET  http://$host/client/?command=createPod&zoneId=$zoneid&name=POD$name&netmask=255.255.255.0&startIp=172.$x.$y.2&endIp=172.$x.$y.252&gateway=172.$x.$y.1	HTTP/1.0\n\n"
-	vlan_query="GET http://$host/client/?command=createVlanIpRange&vlan=untagged&zoneid=$zoneid&podId=$name&forVirtualNetwork=false&gateway=172.$y.$x.1&netmask=255.255.255.0&startip=172.$y.$x.2&endip=172.$y.$x.252        HTTP/1.0\n\n"
-	echo -e $pod_query | nc -v -w 20 $host 8096
-	echo -e $vlan_query | nc -v -w 20 $host 8096
-
-	let x+=1
-	let y+=1
-done
-
-clusterid=1
-
-for podid in `seq $zoneid 1`
-do
-		cluster_query="GET  http://$host/client/?command=addCluster&hypervisor=Simulator&clustertype=CloudManaged&zoneid=$zoneid&podId=$podid&clustername=POD$name-CLUSTER$cluster HTTP/1.0\n\n"
-		echo -e $cluster_query | nc -v -w 120 $host 8096
-
-		host_query="GET	http://$host/client/?command=addHost&zoneId=$zoneid&podId=$podid&username=sim&password=sim&clusterid=$clusterid&url=http%3A%2F%2Fsim&hypervisor=Simulator&clustertype=CloudManaged	HTTP/1.0\n\n"
-		echo -e $host_query | nc -v -w 6000 $host 8096
-	let clusterid+=1
-done
-
-sstorquery="GET	http://$host/client/?command=addSecondaryStorage&zoneid=$zoneid&url=nfs://172.1.25.32/export/share/   HTTP/1.0\n\n"
-echo -e $sstorquery | nc -v -w 6000 $host 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/startRouter.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/startRouter.sh b/agent-simulator/scripts/__old__/startRouter.sh
deleted file mode 100755
index 8f36d65..0000000
--- a/agent-simulator/scripts/__old__/startRouter.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-start_router="GET  http://10.91.30.226:8096/client/?command=startRouter&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $start_router | nc -v -q 60 10.91.30.226 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/__old__/testQuery.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/__old__/testQuery.sh b/agent-simulator/scripts/__old__/testQuery.sh
deleted file mode 100755
index 5571fd2..0000000
--- a/agent-simulator/scripts/__old__/testQuery.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-test="GET	http://10.91.30.226:8096/?command=listEvents&page=1     HTTP/1.0\n\n"
-echo -e $test | nc -v -q 20 10.91.30.226 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/addHostStats.py
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/addHostStats.py b/agent-simulator/scripts/addHostStats.py
deleted file mode 100644
index c53e0d5..0000000
--- a/agent-simulator/scripts/addHostStats.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-from datetime import datetime
-import sys
-import matplotlib.cbook as cbook
-import matplotlib.image as image
-import matplotlib.pyplot as plt
-
-def formGraph(list_timedelta):
-    """ Draw a graph of the performance of host add response """
-    plt.plot(list(map(lambda x:x.seconds, list_timedelta)))
-    plt.ylabel("time(s) to add host")
-    plt.xlabel("number of hosts")
-    plt.title("Add Host Performance")
-    plt.grid(True)
-    plt.show()
-
-
-if __name__=='__main__':
-    time_file=open(sys.argv[1], 'r')
-    timelist=[]
-    diffs=[]
-    for line in time_file.readlines():
-        try:
-            timelist.append(datetime.strptime(line.strip(), "%d %b %Y %H:%M:%S"))
-        except ValueError:
-            print "Unable to parse:",line
-
-    stime=timelist[:-1]
-    btime=timelist[1:]
-
-    diffs=list(map(lambda x,y: y - x,stime,btime))
-    
-    formGraph(diffs)
-
-    
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/addHosts.png
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/addHosts.png b/agent-simulator/scripts/addHosts.png
deleted file mode 100644
index ae40e50..0000000
Binary files a/agent-simulator/scripts/addHosts.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/1000routers.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/1000routers.sh b/agent-simulator/scripts/guava/__old__/1000routers.sh
deleted file mode 100755
index 78717d8..0000000
--- a/agent-simulator/scripts/guava/__old__/1000routers.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
-zoneid=$1
-templateId=$2
-serviceOfferingId=$3
-
-for j in `seq 1 100`
-do
-	let add=0
-	for i in `seq 1 10`
-	do
-		let account=$(($i+$add))
-		echo Account Name: , $account
-		query="GET	http://127.0.0.1/client/?command=deployVirtualMachine&zoneId=$1&hypervisor=Simulator&templateId=$2&serviceOfferingId=$3&account=DummyAccount$account&domainid=1	HTTP/1.0\n\n"
-	  echo -e $query | nc -v -q 20 127.0.0.1 8096
-	done
-	let add=add+10
-	sleep 60s
-done

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/createAdminAccount.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/createAdminAccount.sh b/agent-simulator/scripts/guava/__old__/createAdminAccount.sh
deleted file mode 100755
index fc1ea1c..0000000
--- a/agent-simulator/scripts/guava/__old__/createAdminAccount.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-name=$1
-
-account_query="GET	http://127.0.0.1/client/?command=createAccount&accounttype=1&email=simulator%40simulator.com&username=$name&firstname=first$name&lastname=last$name&password=5f4dcc3b5aa765d61d8327deb882cf99&account=$name&domainid=1	HTTP/1.1\n\n"
-
-echo -e $account_query | nc -v -q 120 127.0.0.1 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/createStoragePool.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/createStoragePool.sh b/agent-simulator/scripts/guava/__old__/createStoragePool.sh
deleted file mode 100755
index 22c58fe..0000000
--- a/agent-simulator/scripts/guava/__old__/createStoragePool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-spool_query="GET        http://127.0.0.1/client/?command=createStoragePool&zoneId=1&podId=1&clusterid=1&name=SPOOL&url=nfs://10.91.25.6/export/share/1   HTTP/1.0\n\n"
-echo -e $spool_query | nc -v -q 60 127.0.0.1 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/createUserAccount.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/createUserAccount.sh b/agent-simulator/scripts/guava/__old__/createUserAccount.sh
deleted file mode 100755
index 4418f4f..0000000
--- a/agent-simulator/scripts/guava/__old__/createUserAccount.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-name=$1
-
-account_query="GET	http://127.0.0.1/client/?command=createAccount&accounttype=0&email=simulator%40simulator.com&username=$name&firstname=first$name&lastname=last$name&password=5f4dcc3b5aa765d61d8327deb882cf99&account=$name&domainid=1	HTTP/1.1\n\n"
-
-echo -e $account_query | nc -v -q 120 127.0.0.1 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/deleteAccount.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/deleteAccount.sh b/agent-simulator/scripts/guava/__old__/deleteAccount.sh
deleted file mode 100755
index 5e06ca6..0000000
--- a/agent-simulator/scripts/guava/__old__/deleteAccount.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-delete="GET  http://127.0.0.1/client/?command=deleteAccount&id=$x	HTTP/1.0\n\n"
-
-echo -e $delete | nc -v -q 60 127.0.0.1 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/deletePod.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/deletePod.sh b/agent-simulator/scripts/guava/__old__/deletePod.sh
deleted file mode 100755
index 588eecd..0000000
--- a/agent-simulator/scripts/guava/__old__/deletePod.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-pod_query="GET  http://10.91.30.219:8096/client/?command=deletePod&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $pod_query | nc -v -q 20 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/deleteServiceOffering.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/deleteServiceOffering.sh b/agent-simulator/scripts/guava/__old__/deleteServiceOffering.sh
deleted file mode 100755
index a5bcd40..0000000
--- a/agent-simulator/scripts/guava/__old__/deleteServiceOffering.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-delete_so="GET  http://10.91.30.219:8096/client/?command=deleteServiceOffering&id=$x	HTTP/1.0\n\n"
-
-echo -e $delete_so | nc -v -q 20 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/deleteVlan.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/deleteVlan.sh b/agent-simulator/scripts/guava/__old__/deleteVlan.sh
deleted file mode 100755
index 48deae4..0000000
--- a/agent-simulator/scripts/guava/__old__/deleteVlan.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-vlan_query="GET  http://10.91.30.219:8096/client/?command=deleteVlanIpRange&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $vlan_query | nc -v -q 20 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/deployVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/deployVirtualMachine.sh b/agent-simulator/scripts/guava/__old__/deployVirtualMachine.sh
deleted file mode 100755
index 3f623ec..0000000
--- a/agent-simulator/scripts/guava/__old__/deployVirtualMachine.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-zoneid=$1
-templateId=$2
-serviceOfferingId=$3
-networkIds=$4
-
-query="GET	http://10.91.30.219/client/?command=deployVirtualMachine&zoneId=$1&hypervisor=Simulator&templateId=$2&serviceOfferingId=$3&networkIds=$4&account=admin&domainid=1	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 20 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/destroyVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/destroyVirtualMachine.sh b/agent-simulator/scripts/guava/__old__/destroyVirtualMachine.sh
deleted file mode 100755
index 089ccb1..0000000
--- a/agent-simulator/scripts/guava/__old__/destroyVirtualMachine.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-destroy="GET  http://10.91.30.219:8096/client/?command=destroyVirtualMachine&id=$x	HTTP/1.0\n\n"
-
-echo -e $destroy | nc -v -q 60 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/listCapacity.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/listCapacity.sh b/agent-simulator/scripts/guava/__old__/listCapacity.sh
deleted file mode 100755
index 9a1117e..0000000
--- a/agent-simulator/scripts/guava/__old__/listCapacity.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.30.219:8096/client/?command=listCapacity&zoneId=$1&podid=$2&response=json	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 120 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/listEvents.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/listEvents.sh b/agent-simulator/scripts/guava/__old__/listEvents.sh
deleted file mode 100755
index 79ecdc3..0000000
--- a/agent-simulator/scripts/guava/__old__/listEvents.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-test="GET	http://10.91.30.219:8096/?command=listEvents     HTTP/1.0\n\n"
-echo -e $test | nc -v -q 120 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/listHosts.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/listHosts.sh b/agent-simulator/scripts/guava/__old__/listHosts.sh
deleted file mode 100755
index bb0fa11..0000000
--- a/agent-simulator/scripts/guava/__old__/listHosts.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.30.219:8096/client/?command=listHosts&zoneId=$1&account=admin&domainid=1&page=$2	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 120 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/listRouters.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/listRouters.sh b/agent-simulator/scripts/guava/__old__/listRouters.sh
deleted file mode 100755
index 716a132..0000000
--- a/agent-simulator/scripts/guava/__old__/listRouters.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.30.219:8096/client/?command=listRouters&zoneId=$1&account=admin&domainid=1	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 120 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/listTemplates.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/listTemplates.sh b/agent-simulator/scripts/guava/__old__/listTemplates.sh
deleted file mode 100755
index a8bd73a..0000000
--- a/agent-simulator/scripts/guava/__old__/listTemplates.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.30.219:8096/client/?command=listTemplates&templatefilter=featured&zoneid=$1	HTTP/1.0\n\n"
-
-echo -e $query | nc -v -q 120 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/listVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/listVirtualMachine.sh b/agent-simulator/scripts/guava/__old__/listVirtualMachine.sh
deleted file mode 100755
index 51a05ed..0000000
--- a/agent-simulator/scripts/guava/__old__/listVirtualMachine.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-query="GET	http://10.91.30.219:8096/client/?command=listVirtualMachines&zoneId=$1&account=admin&domainid=1	HTTP/1.0\n\n"
- 
-echo -e $query | nc -v -q 120 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/load.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/load.sh b/agent-simulator/scripts/guava/__old__/load.sh
deleted file mode 100755
index 8ff3141..0000000
--- a/agent-simulator/scripts/guava/__old__/load.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-do
-	start_vm="GET  http://127.0.0.1:8096/client/?command=startVirtualMachine&id=$x	HTTP/1.0\n\n"
-	echo -e $start_vm | nc -v -q 60 127.0.0.1 8096
-done
-
-sleep 60s
-
-for x in `seq 3 1102`
-do
-	stop_vm="GET  http://127.0.0.1/client/?command=stopVirtualMachine&id=$x	HTTP/1.0\n\n"
-	echo -e $stop_vm | nc -v -q 60 127.0.0.1 8096
-done
-
-sleep 60s

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/networkShutDown.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/networkShutDown.sh b/agent-simulator/scripts/guava/__old__/networkShutDown.sh
deleted file mode 100755
index e9f61e0..0000000
--- a/agent-simulator/scripts/guava/__old__/networkShutDown.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-y=$2
-
-for i in `seq $x $y`
-do
-	stop_vm="GET  http://127.0.0.1/client/?command=stopVirtualMachine&id=$i	HTTP/1.0\n\n"
-	echo -e $stop_vm | nc -v -q 60 127.0.0.1 8096
-done

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/networkStart.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/networkStart.sh b/agent-simulator/scripts/guava/__old__/networkStart.sh
deleted file mode 100755
index 088496e..0000000
--- a/agent-simulator/scripts/guava/__old__/networkStart.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-y=$2
-
-for i in `seq $x $y`
-do
-	start_vm="GET  http://127.0.0.1:8096/client/?command=startVirtualMachine&id=$i	HTTP/1.0\n\n"
-	echo -e $start_vm | nc -v -q 60 127.0.0.1 8096
-done

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/reconnectStats.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/reconnectStats.sh b/agent-simulator/scripts/guava/__old__/reconnectStats.sh
deleted file mode 100755
index 8cba78a..0000000
--- a/agent-simulator/scripts/guava/__old__/reconnectStats.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
- 
-
-name=$1
-while [ 1 ]
-do
-	mysql -s -r -uroot -Dcloud -h10.1.1.215 -e"select count(id),now(),max(disconnected),mgmt_server_id,status from host group by mgmt_server_id,status;" >> $1
-	sleep 5
-	echo --------------------------------------------------------------------------------------------------------------------- >> $1
-done

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/setup.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/setup.sh b/agent-simulator/scripts/guava/__old__/setup.sh
deleted file mode 100755
index 3a93527..0000000
--- a/agent-simulator/scripts/guava/__old__/setup.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
- 
-
-
-#1. 1 host per cluster
-
-zone_query="GET  http://10.91.30.219/client/?command=createZone&networktype=Advanced&securitygroupenabled=false&name=Go&dns1=4.2.2.2&internaldns1=4.2.2.2&vlan=500-1000&guestcidraddress=10.1.1.0%2F24	HTTP/1.0\n\n"
-echo -e $zone_query | nc -v -q 120 10.91.30.219 8096
-
-pod_query="GET  http://10.91.30.219/client/?command=createPod&zoneId=1&name=Guava&netmask=255.255.0.0&startIp=172.1.2.2&endIp=172.1.255.252&gateway=172.1.2.1	HTTP/1.0\n\n"
-echo -e $pod_query | nc -v -q 120 10.91.30.219 8096
-
-vlan_query="GET http://10.91.30.219/client/?command=createVlanIpRange&forVirtualNetwork=true&zoneId=1&vlan=untagged&gateway=172.2.1.1&netmask=255.255.0.0&startip=172.2.1.2&endip=172.2.255.254	HTTP/1.0\n\n"
-echo -e $vlan_query | nc -v -q 120 10.91.30.219 8096
-
-for name in `seq 1 100`
-do
-	cluster_query="GET	http://10.91.30.219/client/?command=addCluster&hypervisor=Simulator&clustertype=CloudManaged&zoneId=1&podId=1&clustername=CS$name	HTTP/1.0\n\n"
-	echo -e $cluster_query | nc -v -q 120 10.91.30.219 8096
-
-	host_query="GET	http://10.91.30.219/client/api?_=1302625706202&command=addHost&zoneId=1&podId=1&clusterid=$name&hypervisor=Simulator&clustertype=CloudManaged&hosttags=&username=sim&password=sim&url=http%3A%2F%2Fsim	HTTP/1.0\n\n"
-	echo -e $host_query | nc -v -q 60 10.91.30.219 8096
-
-	spool_query="GET	http://10.91.30.219/client/?command=createStoragePool&zoneId=1&podId=1&clusterid=$name&name=SPOOL$name&url=nfs://172.1.25.$name/export/share/$name   HTTP/1.0\n\n"
-	echo -e $spool_query | nc -v -q 60 10.91.30.219 8096
-done

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/setupDirectPods.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/setupDirectPods.sh b/agent-simulator/scripts/guava/__old__/setupDirectPods.sh
deleted file mode 100755
index 594a15b..0000000
--- a/agent-simulator/scripts/guava/__old__/setupDirectPods.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-y=$2
-name=$3
-
-pod_query="GET  http://10.91.30.219:8096/client/?command=createPod&zoneId=1&name=SSP$name&cidr=182.$x.$y.0%2F24&startIp=182.$x.$y.2&endIp=182.$x.$y.252&gateway=182.$x.$y.1
-HTTP/1.0\n\n"
-
-echo -e $pod_query | nc -v -q 20 10.91.30.219 8096
-
-#vlan_query="GET http://10.91.30.219/client/?command=createVlanIpRange&vlan=untagged&zoneid=1&podId=$name&forVirtualNetwork=false&gateway=172.$y.$x.1&netmask=255.255.255.0&startip=172.$y.$x.2&endip=172.$y.$x.252        HTTP/1.0\n\n"
-
-#echo -e $vlan_query | nc -v -q 20 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/setupHosts.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/setupHosts.sh b/agent-simulator/scripts/guava/__old__/setupHosts.sh
deleted file mode 100755
index f2235af..0000000
--- a/agent-simulator/scripts/guava/__old__/setupHosts.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-name=$1
-
-host_query="GET	http://10.91.30.219:8096/client/?command=addHost&zoneId=1&podId=$((name+250))&username=sim&password=sim&clustername=simulator-$name&hosttags=RP$name&url=http%3A%2F%2Fsim	HTTP/1.0\n\n"
-echo -e $host_query | nc -v -q 60 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/setupPodAndNetwork.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/setupPodAndNetwork.sh b/agent-simulator/scripts/guava/__old__/setupPodAndNetwork.sh
deleted file mode 100755
index d11ecc3..0000000
--- a/agent-simulator/scripts/guava/__old__/setupPodAndNetwork.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-workers=$1
-x=$2 #CIDR - 16bytes
-y=$3 #CIDR - 8 bytes
-
-for name in `seq 1 $workers`
-do
-	pod_query="GET  http://10.91.30.219:8096/client/?command=createPod&zoneId=1&name=RP$name&cidr=182.$x.$y.0%2F24&startIp=182.$x.$y.2&endIp=182.$x.$y.252&gateway=182.$x.$y.1	HTTP/1.0\n\n"
-	vlan_query="GET http://10.91.30.219:8096/client/?command=createVlanIpRange&vlan=untagged&zoneid=1&podId=$((name+250))&forVirtualNetwork=false&gateway=182.$y.$x.1&netmask=255.255.255.0&startip=182.$y.$x.2&endip=182.$y.$x.252        HTTP/1.0\n\n"
-	so_query="GET	http://10.91.30.219:8096/client/?command=createServiceOffering&name=RP$name&displayText=RP$name&storageType=local&cpuNumber=1&cpuSpeed=1000&memory=512&offerha=false&usevirtualnetwork=false&hosttags=RP$name	HTTP/1.0\n\n"
-
-	echo -e $pod_query | nc -v -q 20 10.91.30.219 8096
-	echo -e $vlan_query | nc -v -q 20 10.91.30.219 8096
-	echo -e $so_query | nc -v -q 20 10.91.30.219 8096
-
-	let x+=1
-	let y+=1
-done
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/setupServiceOffering.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/setupServiceOffering.sh b/agent-simulator/scripts/guava/__old__/setupServiceOffering.sh
deleted file mode 100755
index 763812a..0000000
--- a/agent-simulator/scripts/guava/__old__/setupServiceOffering.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-so_query="GET	http://10.91.30.219:8096/client/?command=createServiceOffering&name=SO$x&displayText=SO$x&storageType=local&cpuNumber=1&cpuSpeed=1000&memory=512&offerha=false&usevirtualnetwork=false&hosttags=SP$x	HTTP/1.0\n\n"
-
-echo -e $so_query | nc -v -q 20 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/setupVlan.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/setupVlan.sh b/agent-simulator/scripts/guava/__old__/setupVlan.sh
deleted file mode 100755
index e282f36..0000000
--- a/agent-simulator/scripts/guava/__old__/setupVlan.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-y=$2
-name=$3
-
-vlan_query="GET http://10.91.30.219/client/?command=createVlanIpRange&vlan=untagged&zoneid=1&podId=$name&forVirtualNetwork=false&gateway=172.$x.$y.1&netmask=255.255.255.0&startip=172.$x.$y.2&endip=172.$x.$y.252        HTTP/1.0\n\n"
-
-echo -e $vlan_query | nc -v -q 20 10.91.30.219 8096

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/startRouter.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/startRouter.sh b/agent-simulator/scripts/guava/__old__/startRouter.sh
deleted file mode 100755
index 1b3e040..0000000
--- a/agent-simulator/scripts/guava/__old__/startRouter.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-start_router="GET  http://10.91.30.219:8096/client/?command=startRouter&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $start_router | nc -v -q 60 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/startVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/startVirtualMachine.sh b/agent-simulator/scripts/guava/__old__/startVirtualMachine.sh
deleted file mode 100755
index 287d2c4..0000000
--- a/agent-simulator/scripts/guava/__old__/startVirtualMachine.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-start_vm="GET  http://10.91.30.219:8096/client/?command=startVirtualMachine&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $start_vm | nc -v -q 60 10.91.30.219 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/stopVirtualMachine.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/stopVirtualMachine.sh b/agent-simulator/scripts/guava/__old__/stopVirtualMachine.sh
deleted file mode 100755
index d20c7b6..0000000
--- a/agent-simulator/scripts/guava/__old__/stopVirtualMachine.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
- 
-
-x=$1
-
-stop_vm="GET  http://127.0.0.1/client/?command=stopVirtualMachine&id=$x	HTTP/1.0\n\n"
-
-
-echo -e $stop_vm | nc -v -q 60 127.0.0.1 8096
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a18d5ca/agent-simulator/scripts/guava/__old__/stress.sh
----------------------------------------------------------------------
diff --git a/agent-simulator/scripts/guava/__old__/stress.sh b/agent-simulator/scripts/guava/__old__/stress.sh
deleted file mode 100755
index a02670a..0000000
--- a/agent-simulator/scripts/guava/__old__/stress.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-templateid=3
-account="u"
-x=$1
-y=$2
-p=$3
-q=$4
-
-for i in `seq 1 3`
-do
-	serviceOfferingId=10
-	query="GET	http://127.0.0.1/client/?command=deployVirtualMachine&zoneId=$zoneid&hypervisor=Simulator&templateId=$templateid&serviceOfferingId=$serviceOfferingId&account=$account&domainid=1	HTTP/1.0\n\n"
-	echo -e $query | nc -v -q 20 127.0.0.1 8096
-done
-
-sleep 15s
-
-for x in `seq $x $y`
-do
-	destroy="GET  http://127.0.0.1:8096/client/?command=destroyVirtualMachine&id=$x	HTTP/1.0\n\n"
-	echo -e $destroy | nc -v -q 60 127.0.0.1 8096
-done
-
-sleep 240s
-
-for i in `seq 1 30`
-do
-	serviceOfferingId=9
-	query="GET	http://127.0.0.1/client/?command=deployVirtualMachine&zoneId=$zoneid&hypervisor=Simulator&templateId=$templateid&serviceOfferingId=$serviceOfferingId&account=$account&domainid=1	HTTP/1.0\n\n"
-	echo -e $query | nc -v -q 20 127.0.0.1 8096
-done
-
-sleep 150s
-
-for x in `seq $p $q`
-do
-	destroy="GET  http://127.0.0.1:8096/client/?command=destroyVirtualMachine&id=$x	HTTP/1.0\n\n"
-	echo -e $destroy | nc -v -q 60 127.0.0.1 8096
-done