[FAB-4926] Modify e2e tests to work with new MSP

FAB-4626 modifies fabric MSP strcuture to separate
signing and TLS root certificates.  It is therefore
necessary to update the crypto structure and
artifacts used by the SDK integration tests:

- regenerate crypto-config
- regenerate channel artifacts
- modify compose file to point at new keys

NOTE: While their are separate CAs in the structure,
they are actually the same in order for the e2e tests
in fabric CI to work until FAB-4904 is merged (which
has to be afer this is merged)

Change-Id: Iae3ef96491db2938a922d90f5ed47fb1a38b1795
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Author: mastersingh24

src/test/fixture/sdkintegration/docker-compose.yaml

@@ -12,7 +12,7 @@ services:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
     ports:
       - "7054:7054"
-    command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/bbb1df5d64a2477f94c718a384db675cf23ac22364b157a492bf2a952bf26be2_sk -b admin:adminpw ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} --tls.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --tls.keyfile /etc/hyperledger/fabric-ca-server-config/bbb1df5d64a2477f94c718a384db675cf23ac22364b157a492bf2a952bf26be2_sk -d'
+    command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/fcf776b02a05600408d0be9d9752afc59f64950b721cacb363b5b95a0fea6216_sk -b admin:adminpw ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} --tls.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --tls.keyfile /etc/hyperledger/fabric-ca-server-config/fcf776b02a05600408d0be9d9752afc59f64950b721cacb363b5b95a0fea6216_sk -d'
     volumes:
       - ./e2e-2Orgs/channel/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config:ro
     container_name: ca_peerOrg1
@@ -23,7 +23,7 @@ services:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
     ports:
       - "8054:7054"
-    command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/f32d52f74d7607ab296e612c7dd7fa09cba597b1cb8b7c3ad81742205d5f0666_sk -b admin:adminpw ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} --tls.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --tls.keyfile /etc/hyperledger/fabric-ca-server-config/f32d52f74d7607ab296e612c7dd7fa09cba597b1cb8b7c3ad81742205d5f0666_sk -d'
+    command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/b59bba37975dafcc4a93984aa01d3d29b64894617db9e0c9a2d486b5273cbd27_sk -b admin:adminpw ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} --tls.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --tls.keyfile /etc/hyperledger/fabric-ca-server-config/b59bba37975dafcc4a93984aa01d3d29b64894617db9e0c9a2d486b5273cbd27_sk -d'
     volumes:
       - ./e2e-2Orgs/channel/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config:ro
     container_name: ca_peerOrg2

src/test/fixture/sdkintegration/e2e-2Orgs/channel/bar.tx

@@ -1,8 +1,8 @@
-#
 # Copyright IBM Corp. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+
 ---
 ################################################################################
 #
@@ -22,15 +22,15 @@ Profiles:
         Consortiums:
             SampleConsortium:
                 Organizations:
-                    - *Org0
                     - *Org1
+                    - *Org2
     TwoOrgsChannel:
         Consortium: SampleConsortium
         Application:
             <<: *ApplicationDefaults
             Organizations:
-                - *Org0
                 - *Org1
+                - *Org2
 
 ################################################################################
 #
@@ -55,50 +55,15 @@ Organizations:
         # MSPDir is the filesystem path which contains the MSP configuration
         MSPDir: crypto-config/ordererOrganizations/example.com/msp
 
-        # AdminPrincipal dictates the type of principal used for an organization's Admins policy
-        # Today, only the values of Role.ADMIN ad Role.MEMBER are accepted, which indicates a principal
-        # of role type ADMIN and role type MEMBER respectively
-        AdminPrincipal: Role.MEMBER
-
-        # BCCSP (Blockchain crypto provider): Select which crypto implementation or
-        # library to use
-        BCCSP:
-            Default: SW
-            SW:
-                Hash: SHA2
-                Security: 256
-                # Location of Key Store. If this is unset, a location will
-                # be chosen using 'MSPDir'/keystore
-                FileKeyStore:
-                    KeyStore:
-
-    - &Org0
+    - &Org1
         # DefaultOrg defines the organization which is used in the sampleconfig
         # of the fabric.git development environment
         Name: Org1MSP
 
         # ID to load the MSP definition as
         ID: Org1MSP
 
-        MSPDir:  crypto-config/peerOrganizations/org1.example.com/msp
-
-        # AdminPrincipal dictates the type of principal used for an organization's Admins policy
-        # Today, only the values of Role.ADMIN ad Role.MEMBER are accepted, which indicates a principal
-        # of role type ADMIN and role type MEMBER respectively
-        AdminPrincipal: Role.MEMBER
-
-
-        # BCCSP (Blockchain crypto provider): Select which crypto implementation or
-        # library to use
-        BCCSP:
-            Default: SW
-            SW:
-                Hash: SHA2
-                Security: 256
-                # Location of Key Store. If this is unset, a location will
-                # be chosen using 'MSPDir'/keystore
-                FileKeyStore:
-                    KeyStore:
+        MSPDir: crypto-config/peerOrganizations/org1.example.com/msp
 
         AnchorPeers:
             # AnchorPeers defines the location of peers which can be used
@@ -107,7 +72,7 @@ Organizations:
             - Host: peer0.org1.example.com
               Port: 7051
 
-    - &Org1
+    - &Org2
         # DefaultOrg defines the organization which is used in the sampleconfig
         # of the fabric.git development environment
         Name: Org2MSP
@@ -117,23 +82,6 @@ Organizations:
 
         MSPDir: crypto-config/peerOrganizations/org2.example.com/msp
 
-        # AdminPrincipal dictates the type of principal used for an organization's Admins policy
-        # Today, only the values of Role.ADMIN ad Role.MEMBER are accepted, which indicates a principal
-        # of role type ADMIN and role type MEMBER respectively
-        AdminPrincipal: Role.MEMBER
-
-        # BCCSP (Blockchain crypto provider): Select which crypto implementation or
-        # library to use
-        BCCSP:
-            Default: SW
-            SW:
-                Hash: SHA2
-                Security: 256
-                # Location of Key Store. If this is unset, a location will
-                # be chosen using 'MSPDir'/keystore
-                FileKeyStore:
-                    KeyStore:
-
         AnchorPeers:
             # AnchorPeers defines the location of peers which can be used
             # for cross org gossip communication.  Note, this value is only
@@ -169,7 +117,7 @@ Orderer: &OrdererDefaults
 
         # Absolute Max Bytes: The absolute maximum number of bytes allowed for
         # the serialized messages in a batch.
-        AbsoluteMaxBytes: 99 MB
+        AbsoluteMaxBytes: 98 MB
 
         # Preferred Max Bytes: The preferred maximum number of bytes allowed for
         # the serialized messages in a batch. A message larger than the preferred

src/test/fixture/sdkintegration/e2e-2Orgs/channel/configtx.yaml

@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICOjCCAeCgAwIBAgIRAMaM3vTg+D5HzlTNdEpNrUEwCgYIKoZIzj0EAwIwaTEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt
-cGxlLmNvbTAeFw0xNzA1MDQxNjQzMDNaFw0yNzA1MDIxNjQzMDNaMGkxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
-c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j
-b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASO50kzxr5BrFT+8A2H48bKsTLb
-Cik3aBvDkQCXQvB+jbzYYeP7hbaOqRGYsFf92Sk12YCX7txjdxOmR+wlLkneo2kw
-ZzAOBgNVHQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYD
-VR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgKkGlks08iEKOrhLW73UuXkPlNiCDqXgq
-dF2DhnCKoJgwCgYIKoZIzj0EAwIDSAAwRQIhANGWvspBeHJ2xBplTEUaqeG8xr8f
-SR1UQLC5agIjJmoPAiAtMnpQqUbGoQ+3lXNQcOR9BuKx/fIFy0lot/M72+M+pA==
+MIICLjCCAdWgAwIBAgIQHtTtrdec68DVAtiI1bCXBjAKBggqhkjOPQQDAjBpMQsw
+CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
+YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
+bGUuY29tMB4XDTE3MDYyMjEyMDg0MloXDTI3MDYyMDEyMDg0MlowaTELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
+Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
+bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF2GzbMlQ31W6PJMy8BSkbEhC+Hh
+5ADN2r2GDGwBcAapkmz1Ce+TIdP6kIbAEegupaopumnly/D46NnGcwx/HZGjXzBd
+MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB
+Af8wKQYDVR0OBCIEIOV1OY6vLw1HW6ifVoxJ9XATr5OMFXdWwGVLlOWSQLj+MAoG
+CCqGSM49BAMCA0cAMEQCIFyIjytxsdWrGZglkpASinlgKZMnePHJZhUqXT2qg8Yr
+AiAWqnl8uBssGfhj27V1fjKs7ckwby34E92RDBda7/FwHA==
 -----END CERTIFICATE-----

src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config/ordererOrganizations/example.com/ca/2a41a592cd3c88428eae12d6ef752e5e43e5362083a9782a745d8386708aa098_sk

@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0MZPyD/frvjj3263
+NWTTulvVYXoc1ar3vrvTHeJpBlOhRANCAARdhs2zJUN9VujyTMvAUpGxIQvh4eQA
+zdq9hgxsAXAGqZJs9QnvkyHT+pCGwBHoLqWqKbpp5cvw+OjZxnMMfx2R
+-----END PRIVATE KEY-----

src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem

@@ -1,14 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICHzCCAcWgAwIBAgIQZ9oAIT/MBqhpAdd+Orz6nDAKBggqhkjOPQQDAjBpMQsw
+MIICCTCCAbCgAwIBAgIQY3gmcII386QCK7pUCcYc/DAKBggqhkjOPQQDAjBpMQsw
 CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
 YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE3MDUwNDE2NDMwM1oXDTI3MDUwMjE2NDMwM1owVjELMAkGA1UE
+bGUuY29tMB4XDTE3MDYyMjEyMDg0MloXDTI3MDYyMDEyMDg0MlowVjELMAkGA1UE
 BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
 Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEad7yuDuKLYgb4U1OAE6J2arpKoAGQmnbo7vLw5f9nngWq2tdFK9C
-dKRSpB/0aL73mfwX77H1m2uA9fgKJT9TOqNiMGAwDgYDVR0PAQH/BAQDAgWgMBMG
-A1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgKkGl
-ks08iEKOrhLW73UuXkPlNiCDqXgqdF2DhnCKoJgwCgYIKoZIzj0EAwIDSAAwRQIh
-AOLs5bpJbTQRXu+c8r8mwhq03HKIzGbfOU7E8FZMjmmOAiBBpBmNBsVeBbdOgl58
-glxa7zles8qB1tPW5fTCrOLkWw==
+zj0DAQcDQgAE+DMXipPmoQV9vMisD26YjciJuIVkklwttku2lPmDlHpM/SNyBwqt
+o8bojtQlzzK3VmvhGWA7rDpaaYue7bUj/aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG
+A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg5XU5jq8vDUdbqJ9WjEn1cBOvk4wVd1bA
+ZUuU5ZJAuP4wCgYIKoZIzj0EAwIDRwAwRAIgWhUq9jdFWEOZSrWKXtJUPUAxJKSx
+p+jrzHg8fU89u6UCIGTOGPOk2c3YM8H8KAPE26OzHqjSobPYyICtaMY34I5m
 -----END CERTIFICATE-----

src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config/ordererOrganizations/example.com/ca/e575398eaf2f0d475ba89f568c49f57013af938c157756c0654b94e59240b8fe_sk

@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICOjCCAeCgAwIBAgIRAMaM3vTg+D5HzlTNdEpNrUEwCgYIKoZIzj0EAwIwaTEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt
-cGxlLmNvbTAeFw0xNzA1MDQxNjQzMDNaFw0yNzA1MDIxNjQzMDNaMGkxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
-c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j
-b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASO50kzxr5BrFT+8A2H48bKsTLb
-Cik3aBvDkQCXQvB+jbzYYeP7hbaOqRGYsFf92Sk12YCX7txjdxOmR+wlLkneo2kw
-ZzAOBgNVHQ8BAf8EBAMCAaYwGQYDVR0lBBIwEAYEVR0lAAYIKwYBBQUHAwEwDwYD
-VR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgKkGlks08iEKOrhLW73UuXkPlNiCDqXgq
-dF2DhnCKoJgwCgYIKoZIzj0EAwIDSAAwRQIhANGWvspBeHJ2xBplTEUaqeG8xr8f
-SR1UQLC5agIjJmoPAiAtMnpQqUbGoQ+3lXNQcOR9BuKx/fIFy0lot/M72+M+pA==
+MIICLjCCAdWgAwIBAgIQHtTtrdec68DVAtiI1bCXBjAKBggqhkjOPQQDAjBpMQsw
+CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
+YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
+bGUuY29tMB4XDTE3MDYyMjEyMDg0MloXDTI3MDYyMDEyMDg0MlowaTELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
+Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
+bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF2GzbMlQ31W6PJMy8BSkbEhC+Hh
+5ADN2r2GDGwBcAapkmz1Ce+TIdP6kIbAEegupaopumnly/D46NnGcwx/HZGjXzBd
+MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB
+Af8wKQYDVR0OBCIEIOV1OY6vLw1HW6ifVoxJ9XATr5OMFXdWwGVLlOWSQLj+MAoG
+CCqGSM49BAMCA0cAMEQCIFyIjytxsdWrGZglkpASinlgKZMnePHJZhUqXT2qg8Yr
+AiAWqnl8uBssGfhj27V1fjKs7ckwby34E92RDBda7/FwHA==
 -----END CERTIFICATE-----

src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICLjCCAdWgAwIBAgIQHtTtrdec68DVAtiI1bCXBjAKBggqhkjOPQQDAjBpMQsw
+CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
+YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
+bGUuY29tMB4XDTE3MDYyMjEyMDg0MloXDTI3MDYyMDEyMDg0MlowaTELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
+Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
+bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABF2GzbMlQ31W6PJMy8BSkbEhC+Hh
+5ADN2r2GDGwBcAapkmz1Ce+TIdP6kIbAEegupaopumnly/D46NnGcwx/HZGjXzBd
+MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB
+Af8wKQYDVR0OBCIEIOV1OY6vLw1HW6ifVoxJ9XATr5OMFXdWwGVLlOWSQLj+MAoG
+CCqGSM49BAMCA0cAMEQCIFyIjytxsdWrGZglkpASinlgKZMnePHJZhUqXT2qg8Yr
+AiAWqnl8uBssGfhj27V1fjKs7ckwby34E92RDBda7/FwHA==
+-----END CERTIFICATE-----