From 1dbf999992b45f93a8d6dc942c98c11a63ee9f50 Mon Sep 17 00:00:00 2001 From: Naser Mirzaei Date: Mon, 17 Aug 2020 20:29:46 +0430 Subject: [PATCH] fix ccp template and generator to include orderer and channel Signed-off-by: Naser Mirzaei --- test-network/organizations/ccp-generate.sh | 33 +++++++++++++------- test-network/organizations/ccp-template.json | 26 +++++++++++++++ test-network/organizations/ccp-template.yaml | 20 ++++++++++++ 3 files changed, 67 insertions(+), 12 deletions(-) diff --git a/test-network/organizations/ccp-generate.sh b/test-network/organizations/ccp-generate.sh index 7e091d0b..ebd3797b 100755 --- a/test-network/organizations/ccp-generate.sh +++ b/test-network/organizations/ccp-generate.sh @@ -5,35 +5,44 @@ function one_line_pem { } function json_ccp { - local PP=$(one_line_pem $4) - local CP=$(one_line_pem $5) + local OP=$(one_line_pem $5) + local PP=$(one_line_pem $6) + local CP=$(one_line_pem $7) sed -e "s/\${ORG}/$1/" \ - -e "s/\${P0PORT}/$2/" \ - -e "s/\${CAPORT}/$3/" \ + -e "s/\${ORDERERPORT}/$2/" \ + -e "s/\${P0PORT}/$3/" \ + -e "s/\${CAPORT}/$4/" \ + -e "s#\${ORDERERPEM}#$OP#" \ -e "s#\${PEERPEM}#$PP#" \ -e "s#\${CAPEM}#$CP#" \ organizations/ccp-template.json } function yaml_ccp { - local PP=$(one_line_pem $4) - local CP=$(one_line_pem $5) + local OP=$(one_line_pem $5) + local PP=$(one_line_pem $6) + local CP=$(one_line_pem $7) sed -e "s/\${ORG}/$1/" \ - -e "s/\${P0PORT}/$2/" \ - -e "s/\${CAPORT}/$3/" \ + -e "s/\${ORDERERPORT}/$2/" \ + -e "s/\${P0PORT}/$3/" \ + -e "s/\${CAPORT}/$4/" \ + -e "s#\${ORDERERPEM}#$OP#" \ -e "s#\${PEERPEM}#$PP#" \ -e "s#\${CAPEM}#$CP#" \ organizations/ccp-template.yaml | sed -e $'s/\\\\n/\\\n /g' } +ORDERERPORT=7050 +ORDERERPEM=organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem + ORG=1 P0PORT=7051 CAPORT=7054 PEERPEM=organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem CAPEM=organizations/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem -echo "$(json_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.json -echo "$(yaml_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.yaml +echo "$(json_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.json +echo "$(yaml_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org1.example.com/connection-org1.yaml ORG=2 P0PORT=9051 @@ -41,5 +50,5 @@ CAPORT=8054 PEERPEM=organizations/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem CAPEM=organizations/peerOrganizations/org2.example.com/ca/ca.org2.example.com-cert.pem -echo "$(json_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.json -echo "$(yaml_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.yaml +echo "$(json_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.json +echo "$(yaml_ccp $ORG $ORDERERPORT $P0PORT $CAPORT $ORDERERPEM $PEERPEM $CAPEM)" > organizations/peerOrganizations/org2.example.com/connection-org2.yaml diff --git a/test-network/organizations/ccp-template.json b/test-network/organizations/ccp-template.json index e945bfe9..965d538a 100755 --- a/test-network/organizations/ccp-template.json +++ b/test-network/organizations/ccp-template.json @@ -22,6 +22,20 @@ ] } }, + "channels": { + "mychannel": { + "orderers": ["orderer.example.com"], + "peers": { + "peer0.org${ORG}.example.com": { + "endorsingPeer": true, + "chaincodeQuery": true, + "ledgerQuery": true, + "eventSource": true, + "discover": true + } + } + } + }, "peers": { "peer0.org${ORG}.example.com": { "url": "grpcs://localhost:${P0PORT}", @@ -34,6 +48,18 @@ } } }, + "orderers": { + "orderer.example.com": { + "url": "grpcs://localhost:${ORDERERPORT}", + "tlsCACerts": { + "pem": "${ORDERERPEM}" + }, + "grpcOptions": { + "ssl-target-name-override": "orderer.example.com", + "hostnameOverride": "orderer.example.com" + } + } + }, "certificateAuthorities": { "ca.org${ORG}.example.com": { "url": "https://localhost:${CAPORT}", diff --git a/test-network/organizations/ccp-template.yaml b/test-network/organizations/ccp-template.yaml index b675c186..6c41d45a 100755 --- a/test-network/organizations/ccp-template.yaml +++ b/test-network/organizations/ccp-template.yaml @@ -14,6 +14,17 @@ organizations: - peer0.org${ORG}.example.com certificateAuthorities: - ca.org${ORG}.example.com +channels: + mychannel: + orderers: + - orderer.example.com + peers: + peer0.org${ORG}.example.com: + endorsingPeer: true + chaincodeQuery: true + ledgerQuery: true + eventSource: true + discover: true peers: peer0.org${ORG}.example.com: url: grpcs://localhost:${P0PORT} @@ -23,6 +34,15 @@ peers: grpcOptions: ssl-target-name-override: peer0.org${ORG}.example.com hostnameOverride: peer0.org${ORG}.example.com +orderers: + orderer.example.com: + url: grpcs://localhost:${ORDERERPORT} + tlsCACerts: + pem: | + ${ORDERERPEM} + grpcOptions: + ssl-target-name-override: orderer.example.com + hostnameOverride: orderer.example.com certificateAuthorities: ca.org${ORG}.example.com: url: https://localhost:${CAPORT}