Skip to content

Commit 5025d20

Browse files
CaptainIRSCaptainIRS
authored
Migrate Fabric integration tests to test network (#1410)
* Migrate Fabric integration tests to test network Signed-off-by: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com> * Address review comments * Get rid of `rm -fr /tmp/hfc-*` * Merge redundant phases * Upgrade SUT version in docker tests * Remove unnecessary connection profiles * Made `discover = true` Signed-off-by: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com> * Address review comments * Add connection profiles wherever needed Signed-off-by: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com>
1 parent 8a792e0 commit 5025d20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+434
-2396
lines changed

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
report.html
33
node_modules/*
44
package-lock.json
5+
fabric-samples

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/caliper.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ caliper:
1616
benchconfig: ./benchconfig.yaml
1717
networkconfig: ./networkconfig.yaml
1818
bind:
19-
sut: fabric:1.4.1
19+
sut: fabric:2.4
2020
report:
2121
path: ./report.html
2222
logging:

‎packages/caliper-tests-integration/fabric_tests/phase5/ccp-org1.yaml renamed to ‎packages/caliper-tests-integration/fabric_docker_distributed_tests/ccp-org1.yaml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,42 @@ organizations:
2828
- peer0.org1.example.com
2929

3030
orderers:
31-
orderer0.example.com:
32-
url: grpcs://localhost:7050
31+
orderer.example.com:
32+
url: grpcs://orderer.example.com:7050
3333
grpcOptions:
34-
ssl-target-name-override: orderer0.example.com
34+
ssl-target-name-override: orderer.example.com
3535
tlsCACerts:
36-
path: ./config/crypto-config/ordererOrganizations/example.com/orderers/orderer0.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
37-
orderer1.example.com:
38-
url: grpcs://localhost:8050
39-
grpcOptions:
40-
ssl-target-name-override: orderer1.example.com
41-
tlsCACerts:
42-
path: ./config/crypto-config/ordererOrganizations/example.com/orderers/orderer1.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
36+
path: ./fabric-samples/test-network/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
4337

4438
peers:
4539
peer0.org1.example.com:
46-
url: grpcs://localhost:7051
40+
url: grpcs://peer0.org1.example.com:7051
4741
grpcOptions:
4842
ssl-target-name-override: peer0.org1.example.com
4943
grpc.keepalive_time_ms: 600000
5044
tlsCACerts:
51-
path: ./config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
45+
path: ./fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
5246

5347
peer0.org2.example.com:
54-
url: grpcs://localhost:8051
48+
url: grpcs://peer0.org2.example.com:9051
5549
grpcOptions:
5650
ssl-target-name-override: peer0.org2.example.com
5751
grpc.keepalive_time_ms: 600000
5852
tlsCACerts:
59-
path: ./config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
53+
path: ./fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
6054

6155
channels:
6256
mychannel:
6357
orderers:
64-
- orderer0.example.com
65-
- orderer1.example.com
58+
- orderer.example.com
6659
peers:
6760
peer0.org1.example.com:
6861
eventSource: true
6962
peer0.org2.example.com:
7063
eventSource: true
7164
yourchannel:
7265
orderers:
73-
- orderer0.example.com
74-
- orderer1.example.com
66+
- orderer.example.com
7567
peers:
7668
peer0.org1.example.com:
7769
eventSource: true

‎packages/caliper-tests-integration/fabric_tests/phase3/ccp-org2.yaml renamed to ‎packages/caliper-tests-integration/fabric_docker_distributed_tests/ccp-org2.yaml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,42 @@ organizations:
2828
- peer0.org2.example.com
2929

3030
orderers:
31-
orderer0.example.com:
32-
url: grpcs://localhost:7050
31+
orderer.example.com:
32+
url: grpcs://orderer.example.com:7050
3333
grpcOptions:
34-
ssl-target-name-override: orderer0.example.com
34+
ssl-target-name-override: orderer.example.com
3535
tlsCACerts:
36-
path: ./config/crypto-config/ordererOrganizations/example.com/orderers/orderer0.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
37-
orderer1.example.com:
38-
url: grpcs://localhost:8050
39-
grpcOptions:
40-
ssl-target-name-override: orderer1.example.com
41-
tlsCACerts:
42-
path: ./config/crypto-config/ordererOrganizations/example.com/orderers/orderer1.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
36+
path: ./fabric-samples/test-network/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
4337

4438
peers:
4539
peer0.org1.example.com:
46-
url: grpcs://localhost:7051
40+
url: grpcs://peer0.org1.example.com:7051
4741
grpcOptions:
4842
ssl-target-name-override: peer0.org1.example.com
4943
grpc.keepalive_time_ms: 600000
5044
tlsCACerts:
51-
path: ./config/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
45+
path: ./fabric-samples/test-network/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
5246

5347
peer0.org2.example.com:
54-
url: grpcs://localhost:8051
48+
url: grpcs://peer0.org2.example.com:9051
5549
grpcOptions:
5650
ssl-target-name-override: peer0.org2.example.com
5751
grpc.keepalive_time_ms: 600000
5852
tlsCACerts:
59-
path: ./config/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
53+
path: ./fabric-samples/test-network/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
6054

6155
channels:
6256
mychannel:
6357
orderers:
64-
- orderer0.example.com
65-
- orderer1.example.com
58+
- orderer.example.com
6659
peers:
6760
peer0.org1.example.com:
6861
eventSource: true
6962
peer0.org2.example.com:
7063
eventSource: true
7164
yourchannel:
7265
orderers:
73-
- orderer0.example.com
74-
- orderer1.example.com
66+
- orderer.example.com
7567
peers:
7668
peer0.org1.example.com:
7769
eventSource: true

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/clean.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@
1616
# Print all commands.
1717
set -v
1818

19+
# Grab the parent (fabric_tests) directory.
20+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
21+
TEST_NETWORK_DIR=${DIR}/fabric-samples/test-network
22+
23+
cd ${DIR}
24+
1925
docker-compose -p caliper down
20-
(test -z \"$(docker ps -aq)\") || docker rm $(docker ps -aq)
21-
(test -z \"$(docker images dev* -q)\") || docker rmi $(docker images dev* -q)
2226

27+
pushd ${TEST_NETWORK_DIR}
28+
./network.sh down
29+
popd

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/config/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/config/configtx.yaml

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/config/crypto-config.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎packages/caliper-tests-integration/fabric_docker_distributed_tests/config/generate.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)