geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [04/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.
Date Sat, 21 Jan 2017 18:22:43 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml b/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml
deleted file mode 100644
index d35398a..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts10M.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">1</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>50</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>10485760</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder"/>
-
-
-  <test name="96 client with 10M values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 10M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml b/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml
deleted file mode 100644
index 28195b5..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts1K.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>524288</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>1024</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 1k values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">0</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">1</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="33" count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">2</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="65" count="32" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 1k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1000</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml b/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml
deleted file mode 100644
index 9b72179..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts32K.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>16384</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>32768</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 32k values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">0</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">1</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="33" count="32" name="Client"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="redundancyLevel">2</data>
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set begin="65" count="32" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set begin="33" count="24" name="Client"/>
-      <client-set begin="65" count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="16" name="Client"/>
-      <client-set begin="33" count="16" name="Client"/>
-      <client-set begin="65" count="16" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 32k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">200</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">50</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="8" name="Client"/>
-      <client-set begin="33" count="8" name="Client"/>
-      <client-set begin="65" count="8" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/latencyPuts5M.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts5M.xml b/src/tests/cpp/xml/NativeHA/latencyPuts5M.xml
deleted file mode 100644
index 97a89b4..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts5M.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">1</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>5242880</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 5M values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 5M values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">1</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">1</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/latencyPuts8K.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/latencyPuts8K.xml b/src/tests/cpp/xml/NativeHA/latencyPuts8K.xml
deleted file mode 100644
index ffa76bd..0000000
--- a/src/tests/cpp/xml/NativeHA/latencyPuts8K.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-  <data name="BBName">CacheServer</data>
-  <data name="timedInterval">30</data>
-  <data name="keyType">str</data>
-  <data name="opsSecond">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>65536</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>8192</item>
-    </list>
-  </data>
-
-  <!-- Loop variables must be lists -->
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-            client-notification="false"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="ThinClientRegionWithListener">
-    <snippet>
-      <region name="TestTCHAR1">
-        <region-attributes caching-enabled="false"
-           client-notification="true">
-          <cache-listener library="perftests" function="createLatencyListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-
-  <client-set count="96" name="Client"/>
-  <client-set count="1" name="JCS1" hostGroup="CS"/>
-  <client-set count="1" name="JCS2" hostGroup="CS"/>
-  <client-set count="1" name="JCS3" hostGroup="CS"/>
-  <client-set count="1" name="Feeder" hostGroup="CS"/>
-
-
-  <test name="96 client with 8k values" description="Feed latency testing">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set count="1" name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">96</data>
-      <client-set count="96" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 32 clients per server -->
-    <task name="Measure Feed Latency with 3 servers, 32 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">96</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="96" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 24 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">72</data>
-      <client-set count="72" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 24 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 24 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">72</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="72" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 16 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">48</data>
-      <client-set count="48" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 16 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 16 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">48</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="48" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!--test with 8 clients per server and 8k values-->
-    <task name="Init Feeder" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="Populate server regions" action="doPopServers" container="perftests" waitTime="1h">
-      <data name="opsSecond">500</data>
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="CreateClients" action="doCreateRegion" container="perftests" waitTime="10m">
-      <data name="regionSpec">ThinClientRegionWithListener</data>
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-    </task>
-    <task name="Populate Client Regions" action="doPopClient" container="perftests" waitTime="1h">
-      <data name="clientCount">24</data>
-      <client-set count="24" name="Client"/>
-    </task>
-
-    <!-- Latency measurement with 3 servers, 8 clients per server -->
-    <task name="Measure Feed Latency with 3 server, 8 client per server" action="doLatencyPuts" container="perftests" waitTime="1h">
-      <client-set count="1" name="Feeder"/>
-      <data name="opsSecond">100</data>
-      <data name="clientCount">24</data>
-    </task>
-    <task name="Destroys-entries" action="doDestroys" container="perftests" waitTime="10m">
-      <client-set count="1" name="Feeder"/>
-    </task>
-    <task name="DestroyRegion" action="doLocalDestroyRegion" container="perftests" waitTime="10m">
-      <client-set count="24" name="Client"/>
-      <client-set count="1" name="Feeder"/>
-    </task>
-
-    <!-- Close the clients and the servers -->
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml b/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml
deleted file mode 100644
index 9d4cb77..0000000
--- a/src/tests/cpp/xml/NativeHA/mixedRedundancyTestHA.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">7m</data>
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="perftests" function="createPerfTestCacheListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set count="10" name="ThinClientHA1"/>
-  <client-set count="10" name="ThinClientHA2"/>
-  <client-set count="10" name="ThinClientHA3"/>
-
-  <test name="TcrHAMixedRedundancy" description="Thin Client HA mixed redundancy test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion1" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClientHA1"/>
-      <data name="redundancyLevel">0</data>
-    </task>
-    <task name="CreateRegion2" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClientHA2"/>
-      <data name="redundancyLevel">1</data>
-    </task>
-    <task name="CreateRegion3" action="doCreateRegion" container="perftests" waitTime="3m">
-      <client-set count="10" name="ThinClientHA3"/>
-      <data name="redundancyLevel">2</data>
-    </task>
-    <task name="Populating Entries" action="doPuts" container="perftests" waitTime="30m">
-      <client-set begin="6" count="1" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 1" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA1"/>
-    </task>
-    <task name="Register Partial Interest List 2" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA2"/>
-    </task>
-    <task name="Register Partial Interest List 3" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">1000</data>
-      <data name="keyIndexBegin">100</data>
-      <client-set count="10" name="ThinClientHA3"/>
-    </task>
-
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="30m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-
-    <task name="Gets1" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Gets2" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Gets3" action="doGets" container="perftests" waitTime="30m" parallel="true">
-      <client-set count="5" name="ThinClientHA3"/>
-    </task>
-    <task name="Puts1" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClientHA1"/>
-    </task>
-    <task name="Puts2" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClientHA2"/>
-    </task>
-    <task name="Puts3" action="doPuts" container="perftests" waitTime="30m" parallel="true">
-      <client-set begin="6" count="5" name="ThinClientHA3"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
deleted file mode 100644
index 0620127..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S2R1.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
deleted file mode 100644
index 97bef50..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R2.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">2</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml b/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
deleted file mode 100644
index 6f6c453..0000000
--- a/src/tests/cpp/xml/NativeHA/perfTestPutGetDestroy_FullInterestTCRHA_S3R3.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="timedInterval">100</data>
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">3</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>100000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>10</item>
-    </list>
-  </data>
-
-  <data name="keyType">str</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true"
-            initial-capacity="18500" client-notification="true"/>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="JCS3" hostGroup="CS"/>
-  <client-set name="Putter1"/>
-  <client-set name="Getter1"/>
-  <client-set name="Destroyer1"/>
-  <client-set name="Putter2"/>
-  <client-set name="Getter2"/>
-  <client-set name="Destroyer2"/>
-
-  <test name="ThinClientPerf" description="Thin Client perf test">
-    <task name="SetupCacheServers" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 3 NativeHA/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StartCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-
-    <task name="CreateRegion" action="doCreateRegion" container="perftests" waitTime="5m">
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Register Interest List" action="doRegisterInterestList" container="perftests" waitTime="15m">
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <client-set name="Putter1"/>
-      <client-set name="Getter1"/>
-      <client-set name="Destroyer1"/>
-      <client-set name="Putter2"/>
-      <client-set name="Getter2"/>
-      <client-set name="Destroyer2"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-    </task>
-    <task name="Measure Put Throughput" action="doPuts" container="perftests" waitTime="15m">
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Measure Get Throughput" action="doGets" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter1"/>
-    </task>
-    <task name="Update Entries from Publisher" action="doPuts" container="perftests" waitTime="15m">
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-      <client-set name="Putter2"/>
-    </task>
-    <task name="Wait for updates" action="doSleep" container="utils" waitTime="2m">
-      <data name="sleepTime">60</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter1"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="perftests" waitTime="15m">
-      <client-set name="Getter2"/>
-      <data name="registerKeys">100000</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">200</data>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer1"/>
-    </task>
-    <task name="Measure Destroy Throughput" action="doDestroys" container="perftests" waitTime="15m">
-      <client-set name="Destroyer2"/>
-    </task>
-
-    <task name="Close Cache" action="doCloseCache" container="perftests" waitTime="5m"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="StopCacheServer 3" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">3</data>
-      <client-set name="JCS3"/>
-    </task>
-  </test>
-
-</test-driver>


Mime
View raw message