[FAB-2893] Update BDD to latest proto changes

Incoporated prior move of msp related protos and
couple of case changes.

Only left solo uncommented for now until the make
can be modified to support kafka/zookeeper.

Change-Id: Ice6a04e3cb488650f147f013f737dd3e1c4ae1ec
Signed-off-by: jeffgarratt <garratt.jeff@gmail.com>

.gitignore

@@ -22,6 +22,8 @@ tags
 bddtests/coverage
 # bddtest Dockerfile
 bddtests/environments/kafka/Dockerfile
+bddtests/tmp
+bddtests/volumes
 *.cov
 # Makefile dummy artifacts
 .*-dummy

bddtests/features/bootstrap.feature

@@ -279,7 +279,7 @@ Feature: Bootstrap
     Examples: Orderer Options
       |          ComposeFile                                                                                                                       |  SystemUpWaitTime   | ConsensusType | BroadcastWaitTime | orderer0 | orderer1 | orderer2 |Orderer Specific Info|
       |   docker-compose-next-4.yml                                                                                                                |        0            |     solo      |      2            | orderer0 | orderer0 | orderer0 |                     |
-      |   docker-compose-next-4.yml  ./environments/orderer-1-kafka-1/docker-compose.yml orderer-3-kafka-1.yml                                     |        5            |     kafka     |      5            | orderer0 | orderer1 | orderer2 |                     |
-      |   docker-compose-next-4.yml  docker-compose-next-4-couchdb.yml                                                                             |        5            |     solo      |      2            | orderer0 | orderer0 | orderer0 |                     |
-#      |   docker-compose-next-4.yml  docker-compose-next-4-couchdb.yml  ./environments/orderer-1-kafka-1/docker-compose.yml orderer-3-kafka-1.yml  |        8            |     kafka     |      5            | orderer0 | orderer1 | orderer2 |                     |
+#      |   docker-compose-next-4.yml  ./environments/orderer-1-kafka-1/docker-compose.yml orderer-3-kafka-1.yml                                     |        5            |     kafka     |      5            | orderer0 | orderer1 | orderer2 |                     |
+#      |   docker-compose-next-4.yml  docker-compose-next-4-couchdb.yml                                                                             |        10            |     solo      |      2            | orderer0 | orderer0 | orderer0 |                     |
+#      |   docker-compose-next-4.yml  docker-compose-next-4-couchdb.yml  ./environments/orderer-1-kafka-1/docker-compose.yml orderer-3-kafka-1.yml  |        10            |     kafka     |      5            | orderer0 | orderer1 | orderer2 |                     |
 #      |   docker-compose-next-4.yml  ./environments/orderer-1-kafka-3/docker-compose.yml                                                           |          5          |     kafka     |      5            | orderer0 | orderer1 | orderer2 |                     |

bddtests/identities_pb2_grpc.py → bddtests/msp/msp_principal_pb2_grpc.py

@@ -1,3 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 from grpc.framework.common import cardinality
 from grpc.framework.interfaces.face import utilities as face_utilities

bddtests/msp/mspconfig_pb2_grpc.py

@@ -1,3 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 from grpc.framework.common import cardinality
 from grpc.framework.interfaces.face import utilities as face_utilities

bddtests/steps/bootstrap_util.py

@@ -34,11 +34,9 @@
 from common import configtx_pb2 as common_dot_configtx_pb2
 from common import configuration_pb2 as common_dot_configuration_pb2
 from common import policies_pb2 as common_dot_policies_pb2
-from common import msp_principal_pb2
-from msp import mspconfig_pb2
+from msp import mspconfig_pb2, msp_principal_pb2, identities_pb2
 from peer import configuration_pb2 as peer_dot_configuration_pb2
 from orderer import configuration_pb2 as orderer_dot_configuration_pb2
-import identities_pb2
 import orderer_util
 
 from contexthelper import ContextHelper
@@ -256,7 +254,7 @@ def isInNetwork(self, network):
         return False
 
     def getMspPrincipalAsRole(self, mspRoleTypeAsString):
-        mspRole = msp_principal_pb2.MSPRole(msp_identifier=self.name, Role=msp_principal_pb2.MSPRole.MSPRoleType.Value(mspRoleTypeAsString))
+        mspRole = msp_principal_pb2.MSPRole(msp_identifier=self.name, role=msp_principal_pb2.MSPRole.MSPRoleType.Value(mspRoleTypeAsString))
         mspPrincipal = msp_principal_pb2.MSPPrincipal(
             principal_classification=msp_principal_pb2.MSPPrincipal.Classification.Value('ROLE'),
             principal=mspRole.SerializeToString())
@@ -378,7 +376,7 @@ def NOutOf(cls, n, policies):
         'NOutOf creates a policy which requires N out of the slice of policies to evaluate to true'
         return common_dot_policies_pb2.SignaturePolicy(
             n_out_of=common_dot_policies_pb2.SignaturePolicy.NOutOf(
-                N=n,
+                n=n,
                 policies=policies,
             ),
         )
@@ -427,7 +425,7 @@ def getNonce(cls):
 
     @classmethod
     def addSignatureToSignedConfigItem(cls, configUpdateEnvelope, (entity, cert)):
-        serializedIdentity = identities_pb2.SerializedIdentity(Mspid=entity.name, IdBytes=crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
+        serializedIdentity = identities_pb2.SerializedIdentity(mspid=entity.name, id_bytes=crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
         sigHeader = common_dot_common_pb2.SignatureHeader(creator=serializedIdentity.SerializeToString(),
                                                           nonce=BootstrapHelper.getNonce())
         sigHeaderBytes = sigHeader.SerializeToString()
@@ -775,7 +773,7 @@ def createEnvelopeForMsg(directory, nodeAdminTuple, chainId, msg, typeAsString):
     org = directory.getOrganization(nodeAdminTuple.organization)
     user = directory.getUser(nodeAdminTuple.user)
     cert = directory.findCertForNodeAdminTuple(nodeAdminTuple)
-    serializedIdentity = identities_pb2.SerializedIdentity(Mspid=org.name, IdBytes=crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
+    serializedIdentity = identities_pb2.SerializedIdentity(mspid=org.name, id_bytes=crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
     serializedCreatorCertChain = serializedIdentity.SerializeToString()
     nonce = None
     payloadSignatureHeader = common_dot_common_pb2.SignatureHeader(

bddtests/steps/endorser_util.py

@@ -23,7 +23,7 @@
 from peer import transaction_pb2
 from peer import proposal_pb2
 from peer import peer_pb2_grpc
-import identities_pb2
+from msp import identities_pb2
 
 from common import common_pb2 as common_dot_common_pb2
 
@@ -62,7 +62,7 @@ def createInvokeProposalForBDD(context, ccSpec, chainID, signersCert, Mspid, typ
 
     bootstrapHelper = ContextHelper.GetHelper(context=context).getBootrapHelper(chainId=chainID)
 
-    serializedIdentity = identities_pb2.SerializedIdentity(Mspid=Mspid, IdBytes=crypto.dump_certificate(crypto.FILETYPE_PEM, signersCert))
+    serializedIdentity = identities_pb2.SerializedIdentity(mspid=Mspid, id_bytes=crypto.dump_certificate(crypto.FILETYPE_PEM, signersCert))
 
     nonce = bootstrap_util.BootstrapHelper.getNonce()