Merge "FAB-575: New tests (& remote execution capability)" into v0.6

hyperledger · Dec 22, 2016 · f3f7fb4 · f3f7fb4
2 parents 43e4bb4 + 3962f71
commit f3f7fb4
Show file tree

Hide file tree

Showing 12 changed files with 1,521 additions and 118 deletions.
diff --git a/bddtests/bdd-docker/docker-compose-16-consensus-base.yml b/bddtests/bdd-docker/docker-compose-16-consensus-base.yml
@@ -0,0 +1,26 @@
+vpBase:
+  extends:
+    file: compose-defaults.yml
+    service: vp
+  environment:
+    - CORE_SECURITY_ENABLED=true
+    - CORE_PEER_PKI_ECA_PADDR=membersrvc0:7054
+    - CORE_PEER_PKI_TCA_PADDR=membersrvc0:7054
+    - CORE_PEER_PKI_TLSCA_PADDR=membersrvc0:7054
+    - CORE_PEER_PKI_TLS_ROOTCERT_FILE=./bddtests/tlsca.cert
+    # TODO: Currently required due to issue reading obcca configuration location
+    - CORE_PBFT_GENERAL_N=16
+    # You must set this or consensus will not halt as expected when N is greater than 4
+    - CORE_PBFT_GENERAL_F=5
+    # The checkpoint interval in sequence numbers
+    - CORE_PBFT_GENERAL_K=2
+
+vpBatch:
+  extends:
+    service: vpBase
+  environment:
+    - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft
+    - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s
+    - CORE_PBFT_GENERAL_MODE=batch
+    # TODO: This is used for testing as to assure deployment goes through to block
+    - CORE_PBFT_GENERAL_BATCHSIZE=1
diff --git a/bddtests/bdd-docker/docker-compose-16-consensus.yml b/bddtests/bdd-docker/docker-compose-16-consensus.yml
@@ -0,0 +1,212 @@
+membersrvc0:
+  extends:
+    file: compose-defaults.yml
+    service: membersrvc
+
+vp0:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp0
+    - CORE_SECURITY_ENROLLID=test_vp0
+    - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
+  links:
+    - membersrvc0
+  ports:
+    - 7050:6060
+
+vp1:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp1
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp1
+    - CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
+  links:
+    - membersrvc0
+    - vp0
+
+vp2:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp2
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp2
+    - CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
+  links:
+    - membersrvc0
+    - vp0
+
+vp3:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp3
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp3
+    - CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
+  links:
+    - membersrvc0
+    - vp0
+
+vp4:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp4
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp4
+    - CORE_SECURITY_ENROLLSECRET=Pqh90CEW5juZ
+  links:
+    - membersrvc0
+    - vp0
+
+vp5:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp5
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp5
+    - CORE_SECURITY_ENROLLSECRET=FfdvDkAdY81P
+  links:
+    - membersrvc0
+    - vp0
+
+vp6:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp6
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp6
+    - CORE_SECURITY_ENROLLSECRET=QiXJgHyV4t7A
+  links:
+    - membersrvc0
+    - vp0
+
+vp7:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp7
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp7
+    - CORE_SECURITY_ENROLLSECRET=twoKZouEyLyB
+  links:
+    - membersrvc0
+    - vp0
+
+vp8:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp8
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp8
+    - CORE_SECURITY_ENROLLSECRET=BxP7QNh778gI
+  links:
+    - membersrvc0
+    - vp0
+
+vp9:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp9
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp9
+    - CORE_SECURITY_ENROLLSECRET=wu3F1EwJWHvQ
+  links:
+    - membersrvc0
+    - vp0
+
+vp10:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp10
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp10
+    - CORE_SECURITY_ENROLLSECRET=hNeS24SKJtMD
+  links:
+    - membersrvc0
+    - vp0
+
+vp11:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp11
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp11
+    - CORE_SECURITY_ENROLLSECRET=ezTbMAUccdLy
+  links:
+    - membersrvc0
+    - vp0
+
+vp12:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp12
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp12
+    - CORE_SECURITY_ENROLLSECRET=MSDr2juOIooZ
+  links:
+    - membersrvc0
+    - vp0
+
+vp13:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp13
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp13
+    - CORE_SECURITY_ENROLLSECRET=DfPHFoFKj2jl
+  links:
+    - membersrvc0
+    - vp0
+
+vp14:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp14
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp14
+    - CORE_SECURITY_ENROLLSECRET=NyxEfwjy7vPL
+  links:
+    - membersrvc0
+    - vp0
+
+vp15:
+  extends:
+    file: docker-compose-16-consensus-base.yml
+    service: vpBatch
+  environment:
+    - CORE_PEER_ID=vp15
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp15
+    - CORE_SECURITY_ENROLLSECRET=sTHJYI3ndQH+
+  links:
+    - membersrvc0
+    - vp0
diff --git a/bddtests/bdd-docker/docker-compose-4-consensus-newpeers_w_upgrade.yml b/bddtests/bdd-docker/docker-compose-4-consensus-newpeers_w_upgrade.yml
@@ -0,0 +1,66 @@
+membersrvc0:
+  extends:
+    file: compose-defaults.yml
+    service: membersrvc
+  volumes_from:
+    - bdddocker_dbstore_membersrvc0_1
+
+vp0:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - bdddocker_dbstore_vp0_1
+  environment:
+    - CORE_PEER_ID=vp0
+    - CORE_SECURITY_ENROLLID=test_vp0
+    - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
+  links:
+    - membersrvc0
+  ports:
+    - 7050:6060
+
+vp1:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - bdddocker_dbstore_vp1_1
+  environment:
+    - CORE_PEER_ID=vp1
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp1
+    - CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
+  links:
+    - membersrvc0
+    - vp0
+
+vp2:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - bdddocker_dbstore_vp2_1
+  environment:
+    - CORE_PEER_ID=vp2
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp2
+    - CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
+  links:
+    - membersrvc0
+    - vp0
+
+vp3:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - bdddocker_dbstore_vp3_1
+  environment:
+    - CORE_PEER_ID=vp3
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp3
+    - CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
+  links:
+    - membersrvc0
+    - vp0
diff --git a/bddtests/bdd-docker/docker-compose-4-consensus-upgrade.yml b/bddtests/bdd-docker/docker-compose-4-consensus-upgrade.yml
@@ -0,0 +1,91 @@
+dbstore_membersrvc0:
+  image: hyperledger/fabric-membersrvc
+  volumes:
+    - /var/hyperledger/production/db
+
+membersrvc0:
+  extends:
+    file: compose-defaults.yml
+    service: membersrvc
+  volumes_from:
+    - dbstore_membersrvc0
+
+dbstore_vp0:
+  image: hyperledger/fabric-peer
+  volumes:
+    - /var/hyperledger/production/db
+
+vp0:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - dbstore_vp0
+  environment:
+    - CORE_PEER_ID=vp0
+    - CORE_SECURITY_ENROLLID=test_vp0
+    - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT
+  links:
+    - membersrvc0
+  ports:
+    - 7050:6060
+
+dbstore_vp1:
+  image: hyperledger/fabric-peer
+  volumes:
+    - /var/hyperledger/production/db
+
+vp1:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - dbstore_vp1
+  environment:
+    - CORE_PEER_ID=vp1
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp1
+    - CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
+  links:
+    - membersrvc0
+    - vp0
+
+dbstore_vp2:
+  image: hyperledger/fabric-peer
+  volumes:
+    - /var/hyperledger/production/db
+
+vp2:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - dbstore_vp2
+  environment:
+    - CORE_PEER_ID=vp2
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp2
+    - CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
+  links:
+    - membersrvc0
+    - vp0
+
+dbstore_vp3:
+  image: hyperledger/fabric-peer
+  volumes:
+    - /var/hyperledger/production/db
+
+vp3:
+  extends:
+    file: docker-compose-4-consensus-base.yml
+    service: vpBase
+  volumes_from:
+    - dbstore_vp3
+  environment:
+    - CORE_PEER_ID=vp3
+    - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
+    - CORE_SECURITY_ENROLLID=test_vp3
+    - CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
+  links:
+    - membersrvc0
+    - vp0