Skip to content

Commit 911ef2a

Browse files
committed
[FAB-2862] Update BDD for new config changes
Incorporated latest config changes for config update. Changed signature collection to use cert aliases for developers, vs signatures from organizations (CAs). Defined new peer admins, and place their certs into the admincerts folder under the local MSP. These users are then used for issuing the join channel commands. Fixed linter issue in common/mocks/config/orderer.go. Changed to using admin users for install proposals. Change-Id: I4778a226acc81ddf249c25e26c3dfbe0aac98e8e Signed-off-by: Jeff Garratt <[email protected]> Signed-off-by: Kostas Christidis <[email protected]>
1 parent 6ac2f0e commit 911ef2a

9 files changed

+300
-395
lines changed

bddtests/common/common_pb2.py

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bddtests/common/configuration_pb2.py

+40-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bddtests/docker-compose-next-4.yml

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ services:
77
file: docker-compose-orderer-solo.yml
88
service: orderer0
99
environment:
10+
- ORDERER_GENERAL_LOCALMSPDIR=${ORDERER0_ORDERER_GENERAL_LOCALMSPDIR}
1011
- ORDERER_GENERAL_LOCALMSPID=${ORDERER0_ORDERER_GENERAL_LOCALMSPID}
1112
- ORDERER_GENERAL_TLS_ENABLED=true
1213
- ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER0_ORDERER_GENERAL_TLS_PRIVATEKEY}
@@ -23,6 +24,7 @@ services:
2324
- CORE_PEER_GOSSIP_BOOTSTRAP=peer1:7051
2425
- CORE_PEER_PROFILE_ENABLED=true
2526
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
27+
- CORE_PEER_MSPCONFIGPATH=${PEER0_CORE_PEER_MSPCONFIGPATH}
2628
- CORE_PEER_LOCALMSPID=${PEER0_CORE_PEER_LOCALMSPID}
2729
- CORE_PEER_TLS_CERT_FILE=${PEER0_CORE_PEER_TLS_CERT_FILE}
2830
- CORE_PEER_TLS_KEY_FILE=${PEER0_CORE_PEER_TLS_KEY_FILE}
@@ -42,6 +44,7 @@ services:
4244
- CORE_PEER_ID=vp1
4345
- CORE_PEER_GOSSIP_BOOTSTRAP=peer0:7051
4446
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
47+
- CORE_PEER_MSPCONFIGPATH=${PEER1_CORE_PEER_MSPCONFIGPATH}
4548
- CORE_PEER_LOCALMSPID=${PEER1_CORE_PEER_LOCALMSPID}
4649
- CORE_PEER_TLS_CERT_FILE=${PEER1_CORE_PEER_TLS_CERT_FILE}
4750
- CORE_PEER_TLS_KEY_FILE=${PEER1_CORE_PEER_TLS_KEY_FILE}
@@ -59,6 +62,7 @@ services:
5962
- CORE_PEER_ID=vp2
6063
- CORE_PEER_GOSSIP_BOOTSTRAP=peer3:7051
6164
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
65+
- CORE_PEER_MSPCONFIGPATH=${PEER2_CORE_PEER_MSPCONFIGPATH}
6266
- CORE_PEER_LOCALMSPID=${PEER2_CORE_PEER_LOCALMSPID}
6367
- CORE_PEER_TLS_CERT_FILE=${PEER2_CORE_PEER_TLS_CERT_FILE}
6468
- CORE_PEER_TLS_KEY_FILE=${PEER2_CORE_PEER_TLS_KEY_FILE}
@@ -76,6 +80,7 @@ services:
7680
- CORE_PEER_ID=vp3
7781
- CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051
7882
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
83+
- CORE_PEER_MSPCONFIGPATH=${PEER3_CORE_PEER_MSPCONFIGPATH}
7984
- CORE_PEER_LOCALMSPID=${PEER3_CORE_PEER_LOCALMSPID}
8085
- CORE_PEER_TLS_CERT_FILE=${PEER3_CORE_PEER_TLS_CERT_FILE}
8186
- CORE_PEER_TLS_KEY_FILE=${PEER3_CORE_PEER_TLS_KEY_FILE}

0 commit comments

Comments
 (0)