Use microfab for fabric integration tests

Signed-off-by: CaptainIRS <[email protected]>

packages/caliper-tests-integration/fabric_tests/.gitignore

@@ -1,4 +1,9 @@
 **/*.log
+*.tar.gz
+_cfg
+bin
+config
 report.html
 fabric-samples
 vendor
+microfab

packages/caliper-tests-integration/fabric_tests/docker-compose.yaml

@@ -51,7 +51,7 @@ services:
         - /sys:/sys:ro
         - /var/lib/docker/:/var/lib/docker:ro
         ports:
-        - 8080:8080
+        - 8888:8080
         restart: always
 
 ###############
@@ -68,8 +68,3 @@ services:
         - "9001:9001"
         volumes:
         - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
-
-networks:
-  default:
-    name: fabric_test
-    external: true

packages/caliper-tests-integration/fabric_tests/init.js

@@ -64,7 +64,7 @@ class MarblesInitWorkload extends WorkloadModuleBase {
             contractId: this.txIndex % 2 === 0 ? 'mymarbles' : 'yourmarbles',
             contractFunction: 'initMarble',
             contractArguments: [marbleName, marbleColor, marbleSize, marbleOwner],
-            invokerIdentity: 'client0.org1.example.com',
+            invokerIdentity: 'client0.org1.127-0-0-1.nip.io:8080',
             timeout: 5,
             readOnly: false
         };

packages/caliper-tests-integration/fabric_tests/initByChannel.js

@@ -64,10 +64,10 @@ class MarblesInitByChannelWorkload extends WorkloadModuleBase {
             contractId: this.txIndex % 2 === 0 ? 'mymarbles' : 'yourmarbles',
             contractVersion: 'v0',
             contractFunction: 'initMarble',
-            invokerIdentity: 'client0.org1.example.com',
+            invokerIdentity: 'client0.org1.127-0-0-1.nip.io:8080',
             channel: this.txIndex % 2 === 0 ? 'mychannel' : 'yourchannel',
             contractArguments: [marbleName, marbleColor, marbleSize, marbleOwner],
-            timeout: 5,
+            timeout: 10,
             readOnly: false
         };
 

packages/caliper-tests-integration/fabric_tests/phase2/ccp-org1.yaml

@@ -25,47 +25,43 @@ organizations:
   Org1:
     mspid: Org1MSP
     peers:
-    - peer0.org1.example.com
+    - org1peer-api.127-0-0-1.nip.io:8080
 
 orderers:
-    orderer.example.com:
-        url: grpcs://localhost:7050
-        grpcOptions:
-            ssl-target-name-override: orderer.example.com
+    orderer-api.127-0-0-1.nip.io:8080:
+        url: grpcs://orderer-api.127-0-0-1.nip.io:8080
         tlsCACerts:
-            path: ./fabric-samples/test-network/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+            path: './_cfg/uf/_msp/tls/orderer/tlsca-orderer-cert.pem'
 
 peers:
-    peer0.org1.example.com:
-        url: grpcs://localhost:7051
+    org1peer-api.127-0-0-1.nip.io:8080:
+        url: grpcs://org1peer-api.127-0-0-1.nip.io:8080
         grpcOptions:
-            ssl-target-name-override: peer0.org1.example.com
-            grpc.keepalive_time_ms: 600000
+            grpc.keepalive_time_ms: 600000\
         tlsCACerts:
-            path: ./fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+           path: './_cfg/uf/_msp/tls/org1peer/tlsca-org1peer-cert.pem'
 
-    peer0.org2.example.com:
-        url: grpcs://localhost:9051
+    org2peer-api.127-0-0-1.nip.io:8080:
+        url: grpcs://org2peer-api.127-0-0-1.nip.io:8080
         grpcOptions:
-            ssl-target-name-override: peer0.org2.example.com
             grpc.keepalive_time_ms: 600000
         tlsCACerts:
-            path: ./fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
+            path: './_cfg/uf/_msp/tls/org2peer/tlsca-org2peer-cert.pem'
 
 channels:
     mychannel:
         orderers:
-        - orderer.example.com
+        - orderer-api.127-0-0-1.nip.io:8080
         peers:
-            peer0.org1.example.com:
+            org1peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true
-            peer0.org2.example.com:
+            org2peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true
     yourchannel:
         orderers:
-        - orderer.example.com
+        - orderer-api.127-0-0-1.nip.io:8080
         peers:
-            peer0.org1.example.com:
+            org1peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true
-            peer0.org2.example.com:
+            org2peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true

packages/caliper-tests-integration/fabric_tests/phase2/ccp-org2.yaml

@@ -25,47 +25,43 @@ organizations:
   Org2:
     mspid: Org2MSP
     peers:
-    - peer0.org2.example.com
+    - org2peer-api.127-0-0-1.nip.io:8080
 
 orderers:
-    orderer.example.com:
-        url: grpcs://localhost:7050
-        grpcOptions:
-            ssl-target-name-override: orderer.example.com
+    orderer-api.127-0-0-1.nip.io:8080:
+        url: grpc://orderer-api.127-0-0-1.nip.io:8080
         tlsCACerts:
-            path: ./fabric-samples/test-network/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+            path: './_cfg/uf/_msp/tls/orderer/tlsca-orderer-cert.pem'
 
 peers:
-    peer0.org1.example.com:
-        url: grpcs://localhost:7051
+    org1peer-api.127-0-0-1.nip.io:8080:
+        url: grpc://org1peer-api.127-0-0-1.nip.io:8080
         grpcOptions:
-            ssl-target-name-override: peer0.org1.example.com
             grpc.keepalive_time_ms: 600000
         tlsCACerts:
-            path: ./fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+           path: './_cfg/uf/_msp/tls/org1peer/tlsca-org1peer-cert.pem'
 
-    peer0.org2.example.com:
-        url: grpcs://localhost:9051
+    org2peer-api.127-0-0-1.nip.io:8080:
+        url: grpc://org2peer-api.127-0-0-1.nip.io:8080
         grpcOptions:
-            ssl-target-name-override: peer0.org2.example.com
             grpc.keepalive_time_ms: 600000
         tlsCACerts:
-            path: ./fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
+            path: './_cfg/uf/_msp/tls/org2peer/tlsca-org2peer-cert.pem'
 
 channels:
     mychannel:
         orderers:
-        - orderer.example.com
+        - orderer-api.127-0-0-1.nip.io:8080
         peers:
-            peer0.org1.example.com:
+            org1peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true
-            peer0.org2.example.com:
+            org2peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true
     yourchannel:
         orderers:
-        - orderer.example.com
+        - orderer-api.127-0-0-1.nip.io:8080
         peers:
-            peer0.org1.example.com:
+            org1peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true
-            peer0.org2.example.com:
+            org2peer-api.127-0-0-1.nip.io:8080:
                 eventSource: true

packages/caliper-tests-integration/fabric_tests/phase2/networkconfig.yaml

@@ -32,23 +32,23 @@ organizations:
   - mspid: Org1MSP
     identities:
       certificates:
-      - name: 'client0.org1.example.com'
+      - name: 'client0.org1.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/priv_sk'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/signcerts/cert.pem'
     connectionProfile:
       path: './ccp-org1.yaml'
       discover: false
 
   - mspid: Org2MSP
     identities:
       certificates:
-      - name: 'client0.org2.example.com'
+      - name: 'client0.org2.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/priv_sk'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/signcerts/cert.pem'
     connectionProfile:
       path: './ccp-org2.yaml'
       discover: false

packages/caliper-tests-integration/fabric_tests/phase3/benchconfig.yaml

@@ -74,4 +74,4 @@ monitors:
     - module: docker
       options:
         interval: 4
-        containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']
+        containers: ['microfab']

packages/caliper-tests-integration/fabric_tests/phase3/networkconfig.yaml

@@ -32,23 +32,23 @@ organizations:
   - mspid: Org1MSP
     identities:
       certificates:
-      - name: 'client0.org1.example.com'
+      - name: 'client0.org1.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/priv_sk'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/signcerts/cert.pem'
     connectionProfile:
-      path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/connection-org1.yaml'
+      path: '../_cfg/uf/_gateways/org1gateway.json'
       discover: true
 
   - mspid: Org2MSP
     identities:
       certificates:
-      - name: 'client0.org2.example.com'
+      - name: 'client0.org2.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/priv_sk'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/signcerts/cert.pem'
     connectionProfile:
-      path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/connection-org2.yaml'
+      path: '../_cfg/uf/_gateways/org2gateway.json'
       discover: true

packages/caliper-tests-integration/fabric_tests/phase4/networkconfig.yaml

@@ -32,23 +32,23 @@ organizations:
   - mspid: Org1MSP
     identities:
       certificates:
-      - name: 'client0.org1.example.com'
+      - name: 'client0.org1.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/priv_sk'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/signcerts/cert.pem'
     connectionProfile:
-      path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/connection-org1.yaml'
+      path: '../_cfg/uf/_gateways/org1gateway.json'
       discover: true
 
   - mspid: Org2MSP
     identities:
       certificates:
-      - name: 'client0.org2.example.com'
+      - name: 'client0.org2.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/priv_sk'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/signcerts/cert.pem'
     connectionProfile:
-      path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/connection-org2.yaml'
+      path: '../_cfg/uf/_gateways/org2gateway.json'
       discover: true

packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml

@@ -77,5 +77,5 @@ monitors:
     - module: docker
       options:
         interval: 4
-        containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']
+        containers: ['org1peer-api.127-0-0-1.nip.io:8080', 'org2peer-api.127-0-0-1.nip.io:8080', 'orderer-api.127-0-0-1.nip.io:8080']
 

packages/caliper-tests-integration/fabric_tests/phase5/networkconfig.yaml

@@ -32,31 +32,29 @@ organizations:
   - mspid: Org1MSP
     identities:
       certificates:
-      - name: 'client0.org1.example.com'
+      - name: 'client0.org1.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/priv_sk'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+          path: '../_cfg/uf/_msp/Org1/org1admin/msp/signcerts/cert.pem'
     peers:
-      - endpoint: localhost:7051
+      - endpoint: org1peer-api.127-0-0-1.nip.io:8080
         grpcOptions:
-          ssl-target-name-override: peer0.org1.example.com
           grpc.keepalive_time_ms: 600000
         tlsCACerts:
-          path: ../fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
+          path: '../_cfg/uf/_msp/tls/org1peer/tlsca-org1peer-cert.pem'
 
   - mspid: Org2MSP
     identities:
       certificates:
-      - name: 'client0.org2.example.com'
+      - name: 'client0.org2.127-0-0-1.nip.io:8080'
         clientPrivateKey:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/keystore/priv_sk'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/keystore/cert_sk'
         clientSignedCert:
-          path: '../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/users/[email protected]/msp/signcerts/[email protected]cert.pem'
+            path: '../_cfg/uf/_msp/Org2/org2admin/msp/signcerts/cert.pem'
     peers:
-      - endpoint: localhost:9051
+      - endpoint: org2peer-api.127-0-0-1.nip.io:8080
         grpcOptions:
-          ssl-target-name-override: peer0.org2.example.com
           grpc.keepalive_time_ms: 600000
         tlsCACerts:
-          path: ../fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
+          path: '../_cfg/uf/_msp/tls/org2peer/tlsca-org2peer-cert.pem'

packages/caliper-tests-integration/fabric_tests/phase5/queryByChannelNoTargetPeers.js

@@ -43,7 +43,7 @@ class MarblesQueryByChannelWorkload extends WorkloadModuleBase {
             channel: this.txIndex % 2 === 0 ? 'mychannel' : 'yourchannel',
             contractFunction: 'queryMarblesByOwner',
             contractArguments: [marbleOwner],
-            invokerIdentity: 'client0.org1.example.com',
+            invokerIdentity: 'client0.org1.127-0-0-1.nip.io:8080',
             timeout: 10
         };
 

packages/caliper-tests-integration/fabric_tests/phase5/queryNoTargetPeers.js

@@ -41,7 +41,7 @@ class MarblesQueryWorkload extends WorkloadModuleBase {
             contractId: this.txIndex % 2 === 0 ? 'mymarbles' : 'yourmarbles',
             contractFunction: 'queryMarblesByOwner',
             contractArguments: [marbleOwner],
-            invokerIdentity: 'client0.org1.example.com',
+            invokerIdentity: 'client0.org1.127-0-0-1.nip.io:8080',
             timeout: 10
         };
 

packages/caliper-tests-integration/fabric_tests/prometheus/prometheus-fabric.yml

@@ -5,9 +5,9 @@ scrape_configs:
   - job_name: 'prometheus'
     honor_labels: true # Retain labels, as within PushGateway use
     static_configs:
-    - targets: ['prometheus:9090', 'pushGateway:9091','peer0.org1.example.com:9000', 'peer0.org2.example.com:9000']
+    - targets: ['prometheus:9090', 'pushGateway:9091','org1peer-api.127-0-0-1.nip.io:8080', 'org2peer-api.127-0-0-1.nip.io:8080']
 
   - job_name: cadvisor
     scrape_interval: 1s
     static_configs:
-    - targets: ['cadvisor:8080']
+    - targets: ['cadvisor:8888']

packages/caliper-tests-integration/fabric_tests/query.js

@@ -41,8 +41,8 @@ class MarblesQueryWorkload extends WorkloadModuleBase {
             contractId: this.txIndex % 2 === 0 ? 'mymarbles' : 'yourmarbles',
             contractFunction: 'queryMarblesByOwner',
             contractArguments: [marbleOwner],
-            invokerIdentity: 'client0.org1.example.com',
-            targetPeers: ['peer0.org1.example.com'],
+            invokerIdentity: 'client0.org1.127-0-0-1.nip.io:8080',
+            targetPeers: ['org1peer-api.127-0-0-1.nip.io:8080'],
             timeout: 10
         };
 

packages/caliper-tests-integration/fabric_tests/queryByChannel.js

@@ -43,8 +43,8 @@ class MarblesQueryByChannelWorkload extends WorkloadModuleBase {
             channel: this.txIndex % 2 === 0 ? 'mychannel' : 'yourchannel',
             contractFunction: 'queryMarblesByOwner',
             contractArguments: [marbleOwner],
-            invokerIdentity: 'client0.org1.example.com',
-            targetPeers: ['peer0.org1.example.com'],
+            invokerIdentity: 'client0.org1.127-0-0-1.nip.io:8080',
+            targetPeers: ['org1peer-api.127-0-0-1.nip.io:8080'],
             timeout: 10
         };