From eeb8009a141ac754b770ceeae08087f212a450f0 Mon Sep 17 00:00:00 2001 From: "nkl199@yahoo.co.uk" Date: Wed, 3 Jun 2020 14:31:41 +0100 Subject: [PATCH] Docs update to match Fabric gateway configuration changes Signed-off-by: nkl199@yahoo.co.uk --- docs/vNext/Fabric_Configuration.md | 6 +++--- docs/vNext/Runtime_Configuration.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/vNext/Fabric_Configuration.md b/docs/vNext/Fabric_Configuration.md index c712610f3..c91f830c5 100644 --- a/docs/vNext/Fabric_Configuration.md +++ b/docs/vNext/Fabric_Configuration.md @@ -51,7 +51,7 @@ or from various [other sources](./Runtime_Configuration.md). ### Binding with Fabric SDK 2.0.x > Note that when using the binding target for the Fabric SDK 2.0.x there are capability restrictions: > * The 2.0 SDK does not facilitate administration actions. It it not possible to create/join channels, nor install/instantiate chaincode. Consequently the 2.0 binding only facilitates operation with a `--caliper-flow-only-test` flag -> * The 2.0 SDK currently only supports operation using a `gateway`. Consequently the 2.0.0 binding requires a `--caliper-fabric-gateway-usegateway` flag +> * The 2.0 SDK currently only supports operation using a `gateway`. Consequently the 2.0.0 binding requires a `--caliper-fabric-gateway-enabled` flag > > When testing with the 2.0 SDK, it is recommended to configure the system in advance with a network tool of your choice, or using Caliper bound to a 1.4 SDK. The 2.0 SDK may then be bound to Caliper and used for testing. > Caliper does not support the Fabric v2.0 chaincode lifecycle, however the legacy commands of install/instantiate are still valid, and so Caliper can perform basic network configuration using 1.4 SDK bindings. @@ -69,11 +69,11 @@ The above settings are processed when starting Caliper. Modifying them during te > caliper: > fabric: > gateway: -> usegateway: true +> enabled: true > discovery: true > ``` > After naming the [project settings](./Runtime_Configuration.md#project-level) file `caliper.yaml` and placing it in the root of your workspace directory, it will override the following two setting keys with the following values: -> * Setting `caliper-fabric-gateway-usegateway` is set to `true` +> * Setting `caliper-fabric-gateway-enabled` is set to `true` > * Setting `caliper-fabric-gateway-discovery` is set to `true` > > __The other settings remain unchanged.__ diff --git a/docs/vNext/Runtime_Configuration.md b/docs/vNext/Runtime_Configuration.md index 72a298020..8572fbc76 100644 --- a/docs/vNext/Runtime_Configuration.md +++ b/docs/vNext/Runtime_Configuration.md @@ -321,9 +321,9 @@ A default/fallback configuration file is shipped with the Caliper-related packag | caliper-fabric-countqueryasload | Indicates whether to count queries as workload, i.e., whether the generated report should include them. | | caliper-fabric-gateway-discovery | Indicates whether to use the Fabric discovery mechanism (via Gateway API). | | caliper-fabric-gateway-eventstrategy | Sets the event strategy to use. | -| caliper-fabric-gateway-gatewaylocalhost | Indicates whether to use the localhost default within the Fabric Gateway API. | +| caliper-fabric-gateway-localhost | Indicates whether to use the localhost default within the Fabric Gateway API. | | caliper-fabric-gateway-querystrategy | Sets the query strategy to use. | -| caliper-fabric-gateway-usegateway | Indicates whether to use the gateway-based SDK API. | +| caliper-fabric-gateway-enabled | Indicates whether to use the Fabric gateway-based SDK API. | | caliper-fabric-latencythreshold | Determines the reported commit time of a transaction based on the given percentage of event sources. | | caliper-fabric-loadbalancing | Determines how automatic load balancing is applied. | | caliper-fabric-overwritegopath | Indicates whether to temporarily set the GOPATH environment variable to the workspace directory. |