fixed the calling caliper container issue

Signed-off-by: Tong Li <litong01@us.ibm.com>

Author: Tong Li

app/app.js

@@ -3,7 +3,7 @@
 module.exports.info  = 'Template callback';
 
 const contractID = 'samplecc';
-const version = '0.0.1';
+const version = '1.0';
 
 let bc, ctx, clientArgs, clientIdx;
 
@@ -12,30 +12,16 @@ module.exports.init = async function(blockchain, context, args) {
     ctx = context;
     clientArgs = args;
     clientIdx = context.clientIdx.toString();
-    for (let i=0; i<clientArgs.assets; i++) {
-        try {
-            const assetID = `${clientIdx}_${i}`;
-            console.log(`Client ${clientIdx}: Creating asset ${assetID}`);
-            const myArgs = {
-                chaincodeFunction: 'createCar',
-                invokerIdentity: 'Admin@org1.example.com',
-                chaincodeArguments: [assetID,'blue','ford','fiesta','Jamie']
-            };
-            await bc.bcObj.invokeSmartContract(ctx, contractID, version, myArgs);
-        } catch (error) {
-            console.log(`Client ${clientIdx}: Smart Contract threw with error: ${error}` );
-        }
-    }
 };
 
 module.exports.run = function() {
     const randomId = Math.floor(Math.random()*clientArgs.assets);
     const myArgs = {
-        chaincodeFunction: 'queryCar',
-        invokerIdentity: 'Admin@org1.example.com',
-        chaincodeArguments: [`${clientIdx}_${randomId}`]
+        chaincodeFunction: 'invoke',
+        invokerIdentity: 'Admin@org0.example.com',
+        chaincodeArguments: ['put', `${clientIdx}_${randomId}`, `${clientIdx}_${randomId}`]
     };
-    return bc.bcObj.querySmartContract(ctx, contractID, version, myArgs);
+    return bc.bcObj.invokeSmartContract(ctx, contractID, version, myArgs);
 };
 
 module.exports.end = async function() {

playbooks/ops/caliperrun/apply.yaml

@@ -4,5 +4,16 @@
     src: "{{ pjroot }}/playbooks/ops/caliperrun/templates/{{ item.name }}"
     dest: "{{ pjroot }}/vars/run/{{ item.target }}"
   with_items:
-  - {name: 'networkconfig.j2', target: 'networkconfig.json'}
-  - {name: 'benchmarkconfig.j2', target: 'benchmarkconfig.yaml'}
+  - {name: 'networkconfig.j2', target: 'calipernetworkconfig.json'}
+  - {name: 'benchmarkconfig.j2', target: 'caliperbenchmarkconfig.yaml'}
+
+- name: Launch caliper test
+  command: >-
+    docker run --network {{ NETNAME }} --name calipertester --hostname calipertester
+    -e "ROOTPATH=/vars/keyfiles"
+    -v /var/run/docker.sock:/var/run/docker.sock
+    -v {{ hostroot }}/vars:/vars
+    hyperledger/caliper:0.3.2
+    "launch master --caliper-benchconfig /vars/run/caliperbenchmarkconfig.yaml
+    --caliper-networkconfig /vars/run/calipernetworkconfig.json
+    --caliper-flow-only-test --caliper-fabric-gateway-usegateway --caliper-fabric-gateway-discovery"

playbooks/ops/caliperrun/templates/benchmarkconfig.j2

@@ -13,7 +13,7 @@ test:
           type: fixed-backlog
           opts:
             unfinished_per_client: 2
-        callback: benchmarks/callbacks/queryAssetBenchmarks.js
+        callback: /vars/app/app.js
         arguments:
           assets: 10