Skip to content

Commit 53818e7

Browse files
lhaskinslhaskins
committed
[FAB-3565]: Add behave functionality for FAB-3505
This adds functionality for executing steps in the example02 stopping/starting feature test. Change-Id: I6851e1422dc136e9db7d6e299454f702b21d36f3 Signed-off-by: Latitia M Haskins <[email protected]>
1 parent 1ee6eed commit 53818e7

11 files changed

+333
-111
lines changed

‎test/feature/configs/configtx.yaml

+14-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ Profiles:
3636
Orderer:
3737
<<: *OrdererDefaults
3838
OrdererType: kafka
39+
Addresses:
40+
- orderer0.example.com:7050
41+
- orderer1.example.com:7050
42+
- orderer2.example.com:7050
3943
Organizations:
4044
- *ExampleCom
4145
Application:
@@ -80,6 +84,7 @@ Profiles:
8084
SysTestChannel:
8185
Consortium: SampleConsortium
8286
Application:
87+
<<: *ApplicationDefaults
8388
Organizations:
8489
- *Org1ExampleCom
8590
- *Org2ExampleCom
@@ -109,7 +114,7 @@ Organizations:
109114
Name: Organization1
110115
ID: Org1
111116
MSPDir: ./peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp
112-
AdminPrincipal: Role.MEMBER
117+
AdminPrincipal: Role.ADMIN
113118
AnchorPeers:
114119
- Host: peer0.org1.example.com
115120
Port: 7051
@@ -126,12 +131,14 @@ Organizations:
126131
- &ExampleCom
127132
Name: ExampleCom
128133
ID: example.com
134+
AdminPrincipal: Role.ADMIN
129135
MSPDir: ./ordererOrganizations/example.com/msp
130136

131137
- &Org1ExampleCom
132138
Name: Org1ExampleCom
133139
ID: org1.example.com
134140
MSPDir: ./peerOrganizations/org1.example.com/msp
141+
AdminPrincipal: Role.ADMIN
135142
AnchorPeers:
136143
- Host: peer0.org1.example.com
137144
Port: 7051
@@ -140,6 +147,7 @@ Organizations:
140147
Name: Org2ExampleCom
141148
ID: org2.example.com
142149
MSPDir: ./peerOrganizations/org2.example.com/msp
150+
AdminPrincipal: Role.ADMIN
143151
AnchorPeers:
144152
- Host: peer0.org2.example.com
145153
Port: 7051
@@ -159,7 +167,7 @@ Orderer: &OrdererDefaults
159167
OrdererType: solo
160168

161169
Addresses:
162-
- orderer.example.com:7050
170+
- orderer0.example.com:7050
163171

164172
# Batch Timeout: The amount of time to wait before creating a batch.
165173
BatchTimeout: 2s
@@ -191,7 +199,10 @@ Orderer: &OrdererDefaults
191199
# Brokers: A list of Kafka brokers to which the orderer connects.
192200
# NOTE: Use IP:port notation
193201
Brokers:
194-
- 127.0.0.1:9092
202+
- kafka0:9092
203+
- kafka1:9092
204+
- kafka2:9092
205+
- kafka3:9092
195206

196207
# Organizations is the list of orgs which are defined as participants on
197208
# the orderer side of the network.

‎test/feature/configs/crypto.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ OrdererOrgs:
1717
- Name: ExampleCom
1818
Domain: example.com
1919
Specs:
20-
- Hostname: orderer
20+
- Hostname: orderer0
21+
- Hostname: orderer1
22+
- Hostname: orderer2
2123

2224
PeerOrgs:
2325
- Name: Org1ExampleCom

‎test/feature/docker-compose/docker-compose-kafka.yml

+131-13
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ services:
5959
image: hyperledger/fabric-kafka
6060
container_name: kafka0
6161
environment:
62+
- KAFKA_LOG_RETENTION_MS=-1
6263
- KAFKA_MESSAGE_MAX_BYTES=103809024
6364
- KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
6465
- KAFKA_BROKER_ID=0
@@ -85,6 +86,7 @@ services:
8586
image: hyperledger/fabric-kafka
8687
container_name: kafka1
8788
environment:
89+
- KAFKA_LOG_RETENTION_MS=-1
8890
- KAFKA_MESSAGE_MAX_BYTES=103809024
8991
- KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
9092
- KAFKA_BROKER_ID=1
@@ -111,6 +113,7 @@ services:
111113
image: hyperledger/fabric-kafka
112114
container_name: kafka2
113115
environment:
116+
- KAFKA_LOG_RETENTION_MS=-1
114117
- KAFKA_MESSAGE_MAX_BYTES=103809024
115118
- KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
116119
- KAFKA_BROKER_ID=2
@@ -137,6 +140,7 @@ services:
137140
image: hyperledger/fabric-kafka
138141
container_name: kafka3
139142
environment:
143+
- KAFKA_LOG_RETENTION_MS=-1
140144
- KAFKA_MESSAGE_MAX_BYTES=103809024
141145
- KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
142146
- KAFKA_BROKER_ID=3
@@ -159,8 +163,8 @@ services:
159163
aliases:
160164
- ${CORE_PEER_NETWORKID}
161165

162-
orderer.example.com:
163-
container_name: orderer.example.com
166+
orderer0.example.com:
167+
container_name: orderer0.example.com
164168
image: hyperledger/fabric-orderer
165169
environment:
166170
- ORDERER_GENERAL_LOGLEVEL=debug
@@ -186,8 +190,104 @@ services:
186190
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/tls/ca.crt]
187191
volumes:
188192
- ../configs/${CORE_PEER_NETWORKID}:/var/hyperledger/configs
189-
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/msp
190-
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer.example.com/tls:/var/hyperledger/tls
193+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer0.example.com/msp:/var/hyperledger/msp
194+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer0.example.com/tls:/var/hyperledger/tls
195+
working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
196+
command: orderer
197+
ports:
198+
- '7050'
199+
depends_on:
200+
- kafka0
201+
- kafka1
202+
- kafka2
203+
- kafka3
204+
links:
205+
- kafka0:kafka0
206+
- kafka1:kafka1
207+
- kafka2:kafka2
208+
- kafka3:kafka3
209+
networks:
210+
default:
211+
aliases:
212+
- ${CORE_PEER_NETWORKID}
213+
214+
orderer1.example.com:
215+
container_name: orderer1.example.com
216+
image: hyperledger/fabric-orderer
217+
environment:
218+
- ORDERER_GENERAL_LOGLEVEL=debug
219+
- CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=${CORE_PEER_NETWORKID}_default
220+
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/msp
221+
- ORDERER_GENERAL_LOCALMSPID=example.com
222+
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
223+
- ORDERER_GENERAL_LISTENPORT=7050
224+
- CONFIGTX_ORDERER_ORDERERTYPE=kafka
225+
- CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092,kafka3:9092]
226+
- ORDERER_KAFKA_RETRY_SHORTINTERVAL=1s
227+
- ORDERER_KAFKA_RETRY_SHORTTOTAL=30s
228+
- ORDERER_KAFKA_VERBOSE=true
229+
- CONFIGTX_ORDERER_ADDRESSES=[127.0.0.1:7050]
230+
- ORDERER_GENERAL_LEDGERTYPE=ram
231+
- ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
232+
- ORDERER_GENERAL_GENESISMETHOD=file
233+
- ORDERER_GENERAL_GENESISFILE=/var/hyperledger/configs/orderer.block
234+
# TLS settings
235+
- ORDERER_GENERAL_TLS_ENABLED=false
236+
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/tls/server.key
237+
- ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/tls/server.crt
238+
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/tls/ca.crt]
239+
volumes:
240+
- ../configs/${CORE_PEER_NETWORKID}:/var/hyperledger/configs
241+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer1.example.com/msp:/var/hyperledger/msp
242+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer1.example.com/tls:/var/hyperledger/tls
243+
working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
244+
command: orderer
245+
ports:
246+
- '7050'
247+
depends_on:
248+
- kafka0
249+
- kafka1
250+
- kafka2
251+
- kafka3
252+
links:
253+
- kafka0:kafka0
254+
- kafka1:kafka1
255+
- kafka2:kafka2
256+
- kafka3:kafka3
257+
networks:
258+
default:
259+
aliases:
260+
- ${CORE_PEER_NETWORKID}
261+
262+
orderer2.example.com:
263+
container_name: orderer2.example.com
264+
image: hyperledger/fabric-orderer
265+
environment:
266+
- ORDERER_GENERAL_LOGLEVEL=debug
267+
- CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=${CORE_PEER_NETWORKID}_default
268+
- ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/msp
269+
- ORDERER_GENERAL_LOCALMSPID=example.com
270+
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
271+
- ORDERER_GENERAL_LISTENPORT=7050
272+
- CONFIGTX_ORDERER_ORDERERTYPE=kafka
273+
- CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092,kafka3:9092]
274+
- ORDERER_KAFKA_RETRY_SHORTINTERVAL=1s
275+
- ORDERER_KAFKA_RETRY_SHORTTOTAL=30s
276+
- ORDERER_KAFKA_VERBOSE=true
277+
- CONFIGTX_ORDERER_ADDRESSES=[127.0.0.1:7050]
278+
- ORDERER_GENERAL_LEDGERTYPE=ram
279+
- ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
280+
- ORDERER_GENERAL_GENESISMETHOD=file
281+
- ORDERER_GENERAL_GENESISFILE=/var/hyperledger/configs/orderer.block
282+
# TLS settings
283+
- ORDERER_GENERAL_TLS_ENABLED=false
284+
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/tls/server.key
285+
- ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/tls/server.crt
286+
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/tls/ca.crt]
287+
volumes:
288+
- ../configs/${CORE_PEER_NETWORKID}:/var/hyperledger/configs
289+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer2.example.com/msp:/var/hyperledger/msp
290+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer2.example.com/tls:/var/hyperledger/tls
191291
working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
192292
command: orderer
193293
ports:
@@ -240,9 +340,13 @@ services:
240340
- '7051'
241341
- '7053'
242342
depends_on:
243-
- orderer.example.com
343+
- orderer0.example.com
344+
- orderer1.example.com
345+
- orderer2.example.com
244346
links:
245-
- orderer.example.com
347+
- orderer0.example.com
348+
- orderer1.example.com
349+
- orderer2.example.com
246350
command: peer node start
247351
networks:
248352
default:
@@ -282,9 +386,13 @@ services:
282386
- '7051'
283387
- '7053'
284388
depends_on:
285-
- orderer.example.com
389+
- orderer0.example.com
390+
- orderer1.example.com
391+
- orderer2.example.com
286392
links:
287-
- orderer.example.com
393+
- orderer0.example.com
394+
- orderer1.example.com
395+
- orderer2.example.com
288396
command: peer node start
289397
networks:
290398
default:
@@ -324,10 +432,14 @@ services:
324432
- '7051'
325433
- '7053'
326434
depends_on:
327-
- orderer.example.com
435+
- orderer0.example.com
436+
- orderer1.example.com
437+
- orderer2.example.com
328438
- peer0.org1.example.com
329439
links:
330-
- orderer.example.com
440+
- orderer0.example.com
441+
- orderer1.example.com
442+
- orderer2.example.com
331443
command: peer node start
332444
networks:
333445
default:
@@ -367,10 +479,14 @@ services:
367479
- '7051'
368480
- '7053'
369481
depends_on:
370-
- orderer.example.com
482+
- orderer0.example.com
483+
- orderer1.example.com
484+
- orderer2.example.com
371485
- peer0.org2.example.com
372486
links:
373-
- orderer.example.com
487+
- orderer0.example.com
488+
- orderer1.example.com
489+
- orderer2.example.com
374490
command: peer node start
375491
networks:
376492
default:
@@ -400,7 +516,9 @@ services:
400516
ports:
401517
- '9092'
402518
depends_on:
403-
- orderer.example.com
519+
- orderer0.example.com
520+
- orderer1.example.com
521+
- orderer2.example.com
404522
- peer0.org1.example.com
405523
- peer1.org1.example.com
406524
- peer0.org2.example.com

‎test/feature/docker-compose/docker-compose-solo.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ networks:
1010

1111
services:
1212

13-
orderer.example.com:
14-
container_name: orderer.example.com
13+
orderer0.example.com:
14+
container_name: orderer0.example.com
1515
image: hyperledger/fabric-orderer
1616
environment:
1717
- ORDERER_GENERAL_LOGLEVEL=debug
@@ -29,8 +29,8 @@ services:
2929
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/tls/ca.crt]
3030
volumes:
3131
- ../configs/${CORE_PEER_NETWORKID}:/var/hyperledger/configs
32-
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/msp
33-
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer.example.com/tls:/var/hyperledger/tls
32+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer0.example.com/msp:/var/hyperledger/msp
33+
- ../configs/${CORE_PEER_NETWORKID}/ordererOrganizations/example.com/orderers/orderer0.example.com/tls:/var/hyperledger/tls
3434
working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
3535
command: orderer
3636
ports:
@@ -73,9 +73,9 @@ services:
7373
- '7051'
7474
- '7053'
7575
depends_on:
76-
- orderer.example.com
76+
- orderer0.example.com
7777
links:
78-
- orderer.example.com
78+
- orderer0.example.com
7979
command: peer node start
8080
networks:
8181
default:
@@ -115,10 +115,10 @@ services:
115115
- '7051'
116116
- '7053'
117117
depends_on:
118-
- orderer.example.com
118+
- orderer0.example.com
119119
- peer0.org1.example.com
120120
links:
121-
- orderer.example.com
121+
- orderer0.example.com
122122
command: peer node start
123123
networks:
124124
default:
@@ -157,10 +157,10 @@ services:
157157
- '7051'
158158
- '7053'
159159
depends_on:
160-
- orderer.example.com
160+
- orderer0.example.com
161161
- peer0.org1.example.com
162162
links:
163-
- orderer.example.com
163+
- orderer0.example.com
164164
command: peer node start
165165
networks:
166166
default:
@@ -199,10 +199,10 @@ services:
199199
- '7051'
200200
- '7053'
201201
depends_on:
202-
- orderer.example.com
202+
- orderer0.example.com
203203
- peer0.org2.example.com
204204
links:
205-
- orderer.example.com
205+
- orderer0.example.com
206206
command: peer node start
207207
networks:
208208
default:
@@ -229,7 +229,7 @@ services:
229229
- ../configs:/var/hyperledger/configs
230230
- ../configs/${CORE_PEER_NETWORKID}/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/var/hyperledger/tls
231231
depends_on:
232-
- orderer.example.com
232+
- orderer0.example.com
233233
- peer0.org1.example.com
234234
- peer1.org1.example.com
235235
- peer0.org2.example.com

0 commit comments

Comments
 (0)