Skip to content

Commit 2f62139

Browse files
dpereoweidpereowei
authored
Test: Test CCaaS for Fabric v3 (#603)
1 parent ec38f0c commit 2f62139

15 files changed

+1665
-1586
lines changed

‎.github/workflows/test-on-push.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ jobs:
160160
./fablo-build.sh
161161
162162
- name: Test snapshots
163-
run: e2e-network/docker/test-04-v2-snapshot.sh
163+
run: e2e-network/docker/test-04-v3-snapshot-ccaas.sh
164164

165165
- uses: actions/upload-artifact@v4
166166
if: always()
167167
with:
168168
name: test-04-snapshot
169169
path: |
170-
e2e-network/docker/test-04-v2-snapshot.sh.logs/*
171-
e2e-network/docker/test-04-v2-snapshot.sh.tmpdir/fablo-target/**/*
170+
e2e-network/docker/test-04-v3-snapshot-ccaas.sh.logs/*
171+
e2e-network/docker/test-04-v3-snapshot-ccaas.sh.tmpdir/fablo-target/**/*
172172
173173
test-05-v3:
174174
needs: test-main

‎COVERAGE_TRACKER.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,39 @@ This document provides an overview of Fablo features. The table below tracks fea
1212
| TLS | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
1313
| Orderer Groups | ✓ | ✕ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | [#560](https://github.com/hyperledger-labs/fablo/issues/560) |
1414
| Peer DB - LevelDB | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
15-
| Peer DB - CouchDB | ✓ | ✓ | ✓ | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
15+
| Peer DB - CouchDB | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
1616
| CA DB - SQLite | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
17-
| CA DB - Postgres | ✓ | ✓ | ✓ | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
17+
| CA DB - Postgres | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
1818
| CA DB - MySQL | ✕ | ✕ | ✓ | | [#561](https://github.com/hyperledger-labs/fablo/issues/561) |
1919
| <br>**CHANNELS** | | | | | |
2020
| Channel query scripts | ✓ | ✓ | | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
2121
| <br>**CHAINCODES** | | | | | |
2222
| Node | ✓ | ✓ | | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
2323
| Go | ✓ | ✓ | | | |
2424
| Java | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
25-
| Chaincode-as-a-Service (CCaaS) | ✓ | ✕ | | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
25+
| Chaincode-as-a-Service (CCaaS) | ✓ | ✓ | | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
2626
| Endorsement Policies | ✓ | ✓ | | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
2727
| Multi-org Endorsements | ✓ | ✓ | | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh) | |
2828
| Private Data Collections | ✓ | ✓ | | [03_v2](/e2e-network/docker/test-03-v2-private-data.sh) | |
2929
| Chaincode scripts (list/query/invoke) | ✓ | ✓ | | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [03_v2](/e2e-network/docker/test-03-v2-private-data.sh), [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
3030
| Commands: install / upgrade | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
3131
| <br>**TOOLS** | | | | | |
32-
| Fablo REST | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
33-
| Explorer | ✓ | ✕ | | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
32+
| Fablo REST | ✓ | ✓ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
33+
| Explorer | ✓ | ✕ | | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
3434
| <br>**FABLO COMMANDS** | | | | | |
3535
| `generate` | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
3636
| `up` | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
3737
| `start`, `stop`, `restart` | ✓ | ✓ | ✓ | [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh) | |
3838
| `down`, `reset` | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [02_v2](/e2e-network/docker/test-02-v2-raft-2orgs.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
39-
| `prune`, `recreate` | ✓ | ✓ | ✓ | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
39+
| `prune`, `recreate` | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
4040
| `validate`, `extend-config` | ✓ | ✓ | ✓ | [e2e](/e2e/fabloCommands.test.ts) | |
4141
| `version` | ✓ | ✓ | ✓ | [e2e](/e2e/fabloCommands.test.ts) | |
4242
| `init` (node, rest, dev) | ✓ | ✓ | ✓ | [01_v2](/e2e-network/docker/test-01-v2-simple.sh), [05_v3](/e2e-network/docker/test-05-v3.sh), [06_v3](/e2e-network/docker/test-06-v3-bft.sh) | |
4343
| `export-network-topology` to Mermaid | ✓ | ✓ | ✓ | | [#579](https://github.com/hyperledger-labs/fablo/pull/579) |
4444
| Other `init` options | | | | | [#444](https://github.com/hyperledger-labs/fablo/issues/444) |
4545
| <br>**SNAPSHOT** | | | | | |
46-
| Create snapshot | ✓ | ✓ | ✓ | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
47-
| Restore snapshot | ✓ | ✓ | ✓ | [04_v2](/e2e-network/docker/test-04-v2-snapshot.sh) | |
46+
| Create snapshot | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
47+
| Restore snapshot | ✓ | ✓ | ✓ | [04_v3](/e2e-network/docker/test-04-v3-snapshot-ccaas.sh) | |
4848
| Post-start hook | | | | | [#111](https://github.com/hyperledger-labs/fablo/issues/111) |
4949
| <br>**OTHER FEATURES** | | | | | |
5050
| Peer dev mode | ✓ | ✕ | ✓ | [07_v2](/e2e-network/docker/test-07-v2-peer-dev-mode.sh) | [#472](https://github.com/hyperledger-labs/fablo/issues/472) |

‎e2e-network/docker/test-02-v2-raft-2orgs.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ waitForContainer "peer0.org1.example.com" "Membership view has changed. peers we
8080
waitForContainer "peer1.org1.example.com" "Joining gossip network of channel my-channel2 with 2 organizations"
8181
waitForContainer "peer1.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel2"
8282
waitForContainer "peer1.org1.example.com" "Membership view has changed. peers went online:.*peer1.org2.example.com:7082"
83+
waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
84+
# // the next check is not working because explorer needs needs to be restarted first
85+
# // see the issue: https://github.com/hyperledger-labs/fablo/issues/604
86+
# waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
8387

8488
# check if org2 is ready
8589
waitForContainer "ca.org2.example.com" "Listening on https://0.0.0.0:7054"
@@ -120,6 +124,7 @@ expectInvokeCli "peer1.org2.example.com" "my-channel2" "chaincode2" \
120124
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" stop && "$FABLO_HOME/fablo.sh" start)
121125
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
122126
waitForChaincode "peer0.org2.example.com" "my-channel1" "chaincode1" "0.0.1"
127+
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
123128

124129
# upgrade chaincode
125130
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" chaincode upgrade "chaincode1" "0.0.2")

e2e-network/docker/test-04-v2-snapshot.sh renamed to e2e-network/docker/test-04-v3-snapshot-ccaas.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FABLO_HOME="$TEST_TMP/../../.."
88

99
export FABLO_HOME
1010

11-
CONFIG="$FABLO_HOME/samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json"
11+
CONFIG="$FABLO_HOME/samples/fablo-config-hlf3-1org-1chaincode-raft-ccaas.json"
1212

1313
networkUp() {
1414
"$FABLO_HOME/fablo-build.sh"
@@ -55,7 +55,6 @@ waitForContainer "db.ca.org1.example.com" "database system is ready to accept co
5555
waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
5656
waitForContainer "couchdb.peer0.org1.example.com" "Apache CouchDB has started. Time to relax."
5757
waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
58-
waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
5958
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
6059

6160
fablo_rest_org1="localhost:8801"
@@ -114,7 +113,6 @@ hook_command="perl -i -pe 's/FABRIC_VERSION=2\.3\.3/FABRIC_VERSION=2\.4\.2/g' ./
114113
"$FABLO_HOME/fablo.sh" chaincodes install
115114
)
116115

117-
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
118116
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
119117

120118
sleep 5

0 commit comments

Comments
 (0)