Skip to content

Commit

Permalink
[FAB-2862] Update BDD for new config changes
Browse files Browse the repository at this point in the history
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 <garratt.jeff@gmail.com>
Signed-off-by: Kostas Christidis <kostas@christidis.io>
  • Loading branch information
kchristidis committed Apr 26, 2017
1 parent 6ac2f0e commit 911ef2a
Show file tree
Hide file tree
Showing 9 changed files with 300 additions and 395 deletions.
13 changes: 9 additions & 4 deletions bddtests/common/common_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 40 additions & 1 deletion bddtests/common/configuration_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions bddtests/docker-compose-next-4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
file: docker-compose-orderer-solo.yml
service: orderer0
environment:
- ORDERER_GENERAL_LOCALMSPDIR=${ORDERER0_ORDERER_GENERAL_LOCALMSPDIR}
- ORDERER_GENERAL_LOCALMSPID=${ORDERER0_ORDERER_GENERAL_LOCALMSPID}
- ORDERER_GENERAL_TLS_ENABLED=true
- ORDERER_GENERAL_TLS_PRIVATEKEY=${ORDERER0_ORDERER_GENERAL_TLS_PRIVATEKEY}
Expand All @@ -23,6 +24,7 @@ services:
- CORE_PEER_GOSSIP_BOOTSTRAP=peer1:7051
- CORE_PEER_PROFILE_ENABLED=true
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
- CORE_PEER_MSPCONFIGPATH=${PEER0_CORE_PEER_MSPCONFIGPATH}
- CORE_PEER_LOCALMSPID=${PEER0_CORE_PEER_LOCALMSPID}
- CORE_PEER_TLS_CERT_FILE=${PEER0_CORE_PEER_TLS_CERT_FILE}
- CORE_PEER_TLS_KEY_FILE=${PEER0_CORE_PEER_TLS_KEY_FILE}
Expand All @@ -42,6 +44,7 @@ services:
- CORE_PEER_ID=vp1
- CORE_PEER_GOSSIP_BOOTSTRAP=peer0:7051
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
- CORE_PEER_MSPCONFIGPATH=${PEER1_CORE_PEER_MSPCONFIGPATH}
- CORE_PEER_LOCALMSPID=${PEER1_CORE_PEER_LOCALMSPID}
- CORE_PEER_TLS_CERT_FILE=${PEER1_CORE_PEER_TLS_CERT_FILE}
- CORE_PEER_TLS_KEY_FILE=${PEER1_CORE_PEER_TLS_KEY_FILE}
Expand All @@ -59,6 +62,7 @@ services:
- CORE_PEER_ID=vp2
- CORE_PEER_GOSSIP_BOOTSTRAP=peer3:7051
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
- CORE_PEER_MSPCONFIGPATH=${PEER2_CORE_PEER_MSPCONFIGPATH}
- CORE_PEER_LOCALMSPID=${PEER2_CORE_PEER_LOCALMSPID}
- CORE_PEER_TLS_CERT_FILE=${PEER2_CORE_PEER_TLS_CERT_FILE}
- CORE_PEER_TLS_KEY_FILE=${PEER2_CORE_PEER_TLS_KEY_FILE}
Expand All @@ -76,6 +80,7 @@ services:
- CORE_PEER_ID=vp3
- CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051
- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
- CORE_PEER_MSPCONFIGPATH=${PEER3_CORE_PEER_MSPCONFIGPATH}
- CORE_PEER_LOCALMSPID=${PEER3_CORE_PEER_LOCALMSPID}
- CORE_PEER_TLS_CERT_FILE=${PEER3_CORE_PEER_TLS_CERT_FILE}
- CORE_PEER_TLS_KEY_FILE=${PEER3_CORE_PEER_TLS_KEY_FILE}
Expand Down
Loading

0 comments on commit 911ef2a

Please sign in to comment.