ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-04 18:09:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix up some JMeter defaults, and allow non-anonymous cash payments from the sampler (#413)

Browse Source 
* Fix up JMeter jmx files.

* Add anon identity flag

(cherry picked from commit f897b1a)

* Add anon identity flag (fixed)

(cherry picked from commit b43f135)
This commit is contained in:
Rick Parker 2018-01-29 10:59:22 +00:00 committed by GitHub
parent 8f0457866f
commit be2ae80b55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/jmeter/src/main/kotlin/com/r3/corda/jmeter/Samplers.kt
View File

@ -67,24 +67,27 @@ class CashIssueAndPaySampler : AbstractSampler() {
companion object JMeterProperties {
val otherParty = Argument("otherPartyName", "", "<meta>", "The X500 name of the payee.")
val coinSelection = Argument("useCoinSelection", "true", "<meta>", "True to use coin selection and false (or anything else) to avoid coin selection.")
val anonymousIdentities = Argument("anonymousIdentities", "true", "<meta>", "True to use anonymous identities and false (or anything else) to use well known identities.")
}
lateinit var counterParty: Party
var useCoinSelection: Boolean = true
var useAnonymousIdentities: Boolean = true
override fun setupTest(rpcProxy: CordaRPCOps, testContext: JavaSamplerContext) {
getNotaryIdentity(rpcProxy,testContext)
counterParty = getIdentity(rpcProxy, testContext, otherParty)
useCoinSelection = testContext.getParameter(coinSelection.name, coinSelection.value).toBoolean()
useAnonymousIdentities = testContext.getParameter(anonymousIdentities.name, anonymousIdentities.value).toBoolean()
}
override fun createFlowInvoke(rpcProxy: CordaRPCOps, testContext: JavaSamplerContext): FlowInvoke<*> {
val amount = 2_000_000.POUNDS
if (useCoinSelection) {
return FlowInvoke<CashIssueAndPaymentFlow>(CashIssueAndPaymentFlow::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, true, notaryIdentity))
return FlowInvoke<CashIssueAndPaymentFlow>(CashIssueAndPaymentFlow::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, useAnonymousIdentities, notaryIdentity))
} else {
return FlowInvoke<CashIssueAndPaymentNoSelection>(CashIssueAndPaymentNoSelection::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, true, notaryIdentity))
return FlowInvoke<CashIssueAndPaymentNoSelection>(CashIssueAndPaymentNoSelection::class.java, arrayOf(amount, OpaqueBytes.of(1), counterParty, useAnonymousIdentities, notaryIdentity))
}
}
@ -92,7 +95,7 @@ class CashIssueAndPaySampler : AbstractSampler() {
}
override val additionalArgs: Set<Argument>
get() = setOf(notary, otherParty, coinSelection)
get() = setOf(notary, otherParty, coinSelection, anonymousIdentities)
}
/**

2
tools/jmeter/src/main/resources/Example Flow Request.jmx
View File

@ -31,7 +31,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value">${___samplerName}</stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">

2
tools/jmeter/src/main/resources/IssueAndPay Request.jmx
View File

@ -31,7 +31,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value">${___samplerName}</stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">

26
tools/jmeter/src/main/resources/LocalBatchNotarise Request.jmx
View File

@ -44,7 +44,7 @@
<connectTime>true</connectTime>
</value>
</objProp>
<stringProp name="filename"></stringProp>
<stringProp name="filename">BatchNotarise2TPS.csv</stringProp>
<boolProp name="ResultCollector.success_only_logging">true</boolProp>
</ResultCollector>
<hashTree/>
@ -54,7 +54,7 @@
<boolProp name="LoopController.continue_forever">false</boolProp>
<intProp name="LoopController.loops">-1</intProp>
</elementProp>
<stringProp name="ThreadGroup.num_threads">3</stringProp>
<stringProp name="ThreadGroup.num_threads">1</stringProp>
<stringProp name="ThreadGroup.ramp_time"></stringProp>
<longProp name="ThreadGroup.start_time">1509455820000</longProp>
<longProp name="ThreadGroup.end_time">1509455820000</longProp>
@ -68,7 +68,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value">${___samplerName}</stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">
@ -78,32 +78,32 @@
</elementProp>
<elementProp name="port" elementType="Argument">
<stringProp name="Argument.name">port</stringProp>
<stringProp name="Argument.value">10004</stringProp>
<stringProp name="Argument.value">10003</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="username" elementType="Argument">
<stringProp name="Argument.name">username</stringProp>
<stringProp name="Argument.value">perf</stringProp>
<stringProp name="Argument.value">default</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="password" elementType="Argument">
<stringProp name="Argument.name">password</stringProp>
<stringProp name="Argument.value">perf</stringProp>
<stringProp name="Argument.value">default</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="notaryName" elementType="Argument">
<stringProp name="Argument.name">notaryName</stringProp>
<stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH,CN=corda.notary.simple</stringProp>
<stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="numStates" elementType="Argument">
<stringProp name="Argument.name">numStates</stringProp>
<stringProp name="Argument.value">100</stringProp>
<stringProp name="Argument.value">10</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="numIterations" elementType="Argument">
<stringProp name="Argument.name">numIterations</stringProp>
<stringProp name="Argument.value">1</stringProp>
<stringProp name="Argument.value">10</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="enableLog" elementType="Argument">
@ -113,7 +113,7 @@
</elementProp>
<elementProp name="transactionsPerSecond" elementType="Argument">
<stringProp name="Argument.name">transactionsPerSecond</stringProp>
<stringProp name="Argument.value">1.0</stringProp>
<stringProp name="Argument.value">2.0</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="repeatInvoke" elementType="Argument">
@ -131,7 +131,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">
@ -175,7 +175,7 @@
</JavaSampler>
<hashTree/>
</hashTree>
<ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
<ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="false">
<stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
<elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
<boolProp name="LoopController.continue_forever">false</boolProp>
@ -258,7 +258,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">

10
tools/jmeter/src/main/resources/LocalIssueAndPay Request.jmx
View File

@ -31,7 +31,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value">${___samplerName}</stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">
@ -41,22 +41,22 @@
</elementProp>
<elementProp name="port" elementType="Argument">
<stringProp name="Argument.name">port</stringProp>
<stringProp name="Argument.value">10004</stringProp>
<stringProp name="Argument.value">10003</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="username" elementType="Argument">
<stringProp name="Argument.name">username</stringProp>
<stringProp name="Argument.value">perf</stringProp>
<stringProp name="Argument.value">default</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="password" elementType="Argument">
<stringProp name="Argument.name">password</stringProp>
<stringProp name="Argument.value">perf</stringProp>
<stringProp name="Argument.value">default</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="notaryName" elementType="Argument">
<stringProp name="Argument.name">notaryName</stringProp>
<stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH,CN=corda.notary.simple</stringProp>
<stringProp name="Argument.value">O=Notary Service,L=Zurich,C=CH</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="otherPartyName" elementType="Argument">

2
tools/jmeter/src/main/resources/Testplans/CashIssuance_40k.jmx
View File

@ -31,7 +31,7 @@
<collectionProp name="Arguments.arguments">
<elementProp name="label" elementType="Argument">
<stringProp name="Argument.name">label</stringProp>
<stringProp name="Argument.value">${___samplerName}</stringProp>
<stringProp name="Argument.value">${__samplerName}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="host" elementType="Argument">