Skip to content

Commit 3962f71

Browse files
lhaskinslhaskins
committed
FAB-575: New tests (& remote execution capability)
First pass. Adding new tests This patchset is the code and tests executed for the v0.6 release of fabric. This code includes changes made for the remote execution of specified behave tests in different environments. This includes adding more users to membersrvc for testing a larger network. Note changes include updating the directory structure to accomodate additional test files. The Makefile also needs to be updated to execute behave tests in the new location. This structure will change in future versions of fabric. Change-Id: I3a0fe01d989afadd11366748ecf285335c99c8cc Signed-off-by: Latitia M Haskins <[email protected]>
1 parent 1a1ccf3 commit 3962f71

13 files changed

+1631
-118
lines changed

‎bddtests/bdd-docker/docker-compose-16-consensus-base.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
vpBase:
2+
extends:
3+
file: compose-defaults.yml
4+
service: vp
5+
environment:
6+
- CORE_SECURITY_ENABLED=true
7+
- CORE_PEER_PKI_ECA_PADDR=membersrvc0:7054
8+
- CORE_PEER_PKI_TCA_PADDR=membersrvc0:7054
9+
- CORE_PEER_PKI_TLSCA_PADDR=membersrvc0:7054
10+
- CORE_PEER_PKI_TLS_ROOTCERT_FILE=./bddtests/tlsca.cert
11+
# TODO: Currently required due to issue reading obcca configuration location
12+
- CORE_PBFT_GENERAL_N=16
13+
# You must set this or consensus will not halt as expected when N is greater than 4
14+
- CORE_PBFT_GENERAL_F=5
15+
# The checkpoint interval in sequence numbers
16+
- CORE_PBFT_GENERAL_K=2
17+
18+
vpBatch:
19+
extends:
20+
service: vpBase
21+
environment:
22+
- CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft
23+
- CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s
24+
- CORE_PBFT_GENERAL_MODE=batch
25+
# TODO: This is used for testing as to assure deployment goes through to block
26+
- CORE_PBFT_GENERAL_BATCHSIZE=1

‎bddtests/bdd-docker/docker-compose-16-consensus.yml

+212
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
membersrvc0:
2+
extends:
3+
file: compose-defaults.yml
4+
service: membersrvc
5+
6+
vp0:
7+
extends:
8+
file: docker-compose-16-consensus-base.yml
9+
service: vpBatch
10+
environment:
11+
- CORE_PEER_ID=vp0
12+
- CORE_SECURITY_ENROLLID=test_vp0
13+
- CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
14+
links:
15+
- membersrvc0
16+
ports:
17+
- 7050:6060
18+
19+
vp1:
20+
extends:
21+
file: docker-compose-16-consensus-base.yml
22+
service: vpBatch
23+
environment:
24+
- CORE_PEER_ID=vp1
25+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
26+
- CORE_SECURITY_ENROLLID=test_vp1
27+
- CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
28+
links:
29+
- membersrvc0
30+
- vp0
31+
32+
vp2:
33+
extends:
34+
file: docker-compose-16-consensus-base.yml
35+
service: vpBatch
36+
environment:
37+
- CORE_PEER_ID=vp2
38+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
39+
- CORE_SECURITY_ENROLLID=test_vp2
40+
- CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
41+
links:
42+
- membersrvc0
43+
- vp0
44+
45+
vp3:
46+
extends:
47+
file: docker-compose-16-consensus-base.yml
48+
service: vpBatch
49+
environment:
50+
- CORE_PEER_ID=vp3
51+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
52+
- CORE_SECURITY_ENROLLID=test_vp3
53+
- CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
54+
links:
55+
- membersrvc0
56+
- vp0
57+
58+
vp4:
59+
extends:
60+
file: docker-compose-16-consensus-base.yml
61+
service: vpBatch
62+
environment:
63+
- CORE_PEER_ID=vp4
64+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
65+
- CORE_SECURITY_ENROLLID=test_vp4
66+
- CORE_SECURITY_ENROLLSECRET=Pqh90CEW5juZ
67+
links:
68+
- membersrvc0
69+
- vp0
70+
71+
vp5:
72+
extends:
73+
file: docker-compose-16-consensus-base.yml
74+
service: vpBatch
75+
environment:
76+
- CORE_PEER_ID=vp5
77+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
78+
- CORE_SECURITY_ENROLLID=test_vp5
79+
- CORE_SECURITY_ENROLLSECRET=FfdvDkAdY81P
80+
links:
81+
- membersrvc0
82+
- vp0
83+
84+
vp6:
85+
extends:
86+
file: docker-compose-16-consensus-base.yml
87+
service: vpBatch
88+
environment:
89+
- CORE_PEER_ID=vp6
90+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
91+
- CORE_SECURITY_ENROLLID=test_vp6
92+
- CORE_SECURITY_ENROLLSECRET=QiXJgHyV4t7A
93+
links:
94+
- membersrvc0
95+
- vp0
96+
97+
vp7:
98+
extends:
99+
file: docker-compose-16-consensus-base.yml
100+
service: vpBatch
101+
environment:
102+
- CORE_PEER_ID=vp7
103+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
104+
- CORE_SECURITY_ENROLLID=test_vp7
105+
- CORE_SECURITY_ENROLLSECRET=twoKZouEyLyB
106+
links:
107+
- membersrvc0
108+
- vp0
109+
110+
vp8:
111+
extends:
112+
file: docker-compose-16-consensus-base.yml
113+
service: vpBatch
114+
environment:
115+
- CORE_PEER_ID=vp8
116+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
117+
- CORE_SECURITY_ENROLLID=test_vp8
118+
- CORE_SECURITY_ENROLLSECRET=BxP7QNh778gI
119+
links:
120+
- membersrvc0
121+
- vp0
122+
123+
vp9:
124+
extends:
125+
file: docker-compose-16-consensus-base.yml
126+
service: vpBatch
127+
environment:
128+
- CORE_PEER_ID=vp9
129+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
130+
- CORE_SECURITY_ENROLLID=test_vp9
131+
- CORE_SECURITY_ENROLLSECRET=wu3F1EwJWHvQ
132+
links:
133+
- membersrvc0
134+
- vp0
135+
136+
vp10:
137+
extends:
138+
file: docker-compose-16-consensus-base.yml
139+
service: vpBatch
140+
environment:
141+
- CORE_PEER_ID=vp10
142+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
143+
- CORE_SECURITY_ENROLLID=test_vp10
144+
- CORE_SECURITY_ENROLLSECRET=hNeS24SKJtMD
145+
links:
146+
- membersrvc0
147+
- vp0
148+
149+
vp11:
150+
extends:
151+
file: docker-compose-16-consensus-base.yml
152+
service: vpBatch
153+
environment:
154+
- CORE_PEER_ID=vp11
155+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
156+
- CORE_SECURITY_ENROLLID=test_vp11
157+
- CORE_SECURITY_ENROLLSECRET=ezTbMAUccdLy
158+
links:
159+
- membersrvc0
160+
- vp0
161+
162+
vp12:
163+
extends:
164+
file: docker-compose-16-consensus-base.yml
165+
service: vpBatch
166+
environment:
167+
- CORE_PEER_ID=vp12
168+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
169+
- CORE_SECURITY_ENROLLID=test_vp12
170+
- CORE_SECURITY_ENROLLSECRET=MSDr2juOIooZ
171+
links:
172+
- membersrvc0
173+
- vp0
174+
175+
vp13:
176+
extends:
177+
file: docker-compose-16-consensus-base.yml
178+
service: vpBatch
179+
environment:
180+
- CORE_PEER_ID=vp13
181+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
182+
- CORE_SECURITY_ENROLLID=test_vp13
183+
- CORE_SECURITY_ENROLLSECRET=DfPHFoFKj2jl
184+
links:
185+
- membersrvc0
186+
- vp0
187+
188+
vp14:
189+
extends:
190+
file: docker-compose-16-consensus-base.yml
191+
service: vpBatch
192+
environment:
193+
- CORE_PEER_ID=vp14
194+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
195+
- CORE_SECURITY_ENROLLID=test_vp14
196+
- CORE_SECURITY_ENROLLSECRET=NyxEfwjy7vPL
197+
links:
198+
- membersrvc0
199+
- vp0
200+
201+
vp15:
202+
extends:
203+
file: docker-compose-16-consensus-base.yml
204+
service: vpBatch
205+
environment:
206+
- CORE_PEER_ID=vp15
207+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
208+
- CORE_SECURITY_ENROLLID=test_vp15
209+
- CORE_SECURITY_ENROLLSECRET=sTHJYI3ndQH+
210+
links:
211+
- membersrvc0
212+
- vp0

‎bddtests/bdd-docker/docker-compose-4-consensus-newpeers_w_upgrade.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
membersrvc0:
2+
extends:
3+
file: compose-defaults.yml
4+
service: membersrvc
5+
volumes_from:
6+
- bdddocker_dbstore_membersrvc0_1
7+
8+
vp0:
9+
extends:
10+
file: docker-compose-4-consensus-base.yml
11+
service: vpBase
12+
volumes_from:
13+
- bdddocker_dbstore_vp0_1
14+
environment:
15+
- CORE_PEER_ID=vp0
16+
- CORE_SECURITY_ENROLLID=test_vp0
17+
- CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
18+
links:
19+
- membersrvc0
20+
ports:
21+
- 7050:6060
22+
23+
vp1:
24+
extends:
25+
file: docker-compose-4-consensus-base.yml
26+
service: vpBase
27+
volumes_from:
28+
- bdddocker_dbstore_vp1_1
29+
environment:
30+
- CORE_PEER_ID=vp1
31+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
32+
- CORE_SECURITY_ENROLLID=test_vp1
33+
- CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
34+
links:
35+
- membersrvc0
36+
- vp0
37+
38+
vp2:
39+
extends:
40+
file: docker-compose-4-consensus-base.yml
41+
service: vpBase
42+
volumes_from:
43+
- bdddocker_dbstore_vp2_1
44+
environment:
45+
- CORE_PEER_ID=vp2
46+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
47+
- CORE_SECURITY_ENROLLID=test_vp2
48+
- CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
49+
links:
50+
- membersrvc0
51+
- vp0
52+
53+
vp3:
54+
extends:
55+
file: docker-compose-4-consensus-base.yml
56+
service: vpBase
57+
volumes_from:
58+
- bdddocker_dbstore_vp3_1
59+
environment:
60+
- CORE_PEER_ID=vp3
61+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
62+
- CORE_SECURITY_ENROLLID=test_vp3
63+
- CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
64+
links:
65+
- membersrvc0
66+
- vp0

‎bddtests/bdd-docker/docker-compose-4-consensus-upgrade.yml

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
dbstore_membersrvc0:
2+
image: hyperledger/fabric-membersrvc
3+
volumes:
4+
- /var/hyperledger/production/db
5+
6+
membersrvc0:
7+
extends:
8+
file: compose-defaults.yml
9+
service: membersrvc
10+
volumes_from:
11+
- dbstore_membersrvc0
12+
13+
dbstore_vp0:
14+
image: hyperledger/fabric-peer
15+
volumes:
16+
- /var/hyperledger/production/db
17+
18+
vp0:
19+
extends:
20+
file: docker-compose-4-consensus-base.yml
21+
service: vpBase
22+
volumes_from:
23+
- dbstore_vp0
24+
environment:
25+
- CORE_PEER_ID=vp0
26+
- CORE_SECURITY_ENROLLID=test_vp0
27+
- CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
28+
links:
29+
- membersrvc0
30+
ports:
31+
- 7050:6060
32+
33+
dbstore_vp1:
34+
image: hyperledger/fabric-peer
35+
volumes:
36+
- /var/hyperledger/production/db
37+
38+
vp1:
39+
extends:
40+
file: docker-compose-4-consensus-base.yml
41+
service: vpBase
42+
volumes_from:
43+
- dbstore_vp1
44+
environment:
45+
- CORE_PEER_ID=vp1
46+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
47+
- CORE_SECURITY_ENROLLID=test_vp1
48+
- CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
49+
links:
50+
- membersrvc0
51+
- vp0
52+
53+
dbstore_vp2:
54+
image: hyperledger/fabric-peer
55+
volumes:
56+
- /var/hyperledger/production/db
57+
58+
vp2:
59+
extends:
60+
file: docker-compose-4-consensus-base.yml
61+
service: vpBase
62+
volumes_from:
63+
- dbstore_vp2
64+
environment:
65+
- CORE_PEER_ID=vp2
66+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
67+
- CORE_SECURITY_ENROLLID=test_vp2
68+
- CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
69+
links:
70+
- membersrvc0
71+
- vp0
72+
73+
dbstore_vp3:
74+
image: hyperledger/fabric-peer
75+
volumes:
76+
- /var/hyperledger/production/db
77+
78+
vp3:
79+
extends:
80+
file: docker-compose-4-consensus-base.yml
81+
service: vpBase
82+
volumes_from:
83+
- dbstore_vp3
84+
environment:
85+
- CORE_PEER_ID=vp3
86+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
87+
- CORE_SECURITY_ENROLLID=test_vp3
88+
- CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
89+
links:
90+
- membersrvc0
91+
- vp0

0 commit comments

Comments
 (0)