[FAB-7498] Rename fixtures ca to be part of example.com

troyronda · troyronda · commit 78503fe4e7dc · 2017-12-18T15:11:05.000-05:00
Change-Id: I4497dc65660d0b791e30f7ee0923f2b7cf17a0f8
Signed-off-by: Troy Ronda &lt;troy@troyronda.com&gt;
diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ You need:
 #### Enable local hostnames
 
 You will need to set the following hosts to 127.0.0.1 (typically in /etc/hosts):
-ca_peerOrg1 ca_peerOrg2 peer0.org1.example.com peer1.org1.example.com peer0.org2.example.com peer1.org2.example.com orderer.example.com
+ca.org1.example.com ca.org2.example.com peer0.org1.example.com peer1.org1.example.com peer0.org2.example.com peer1.org2.example.com orderer.example.com
 
 #### Testing with Fabric Images at Docker Hub
 
diff --git a/def/fabapi/testdata/test.yaml b/def/fabapi/testdata/test.yaml
@@ -80,7 +80,7 @@ organizations:
       - peer0.org2.example.com
 
     certificateAuthorities:
-      - ca-org2
+      - ca.org2.example.com
 
   ordererorg:
       mspID: "OrdererOrg"
@@ -110,8 +110,8 @@ peers:
       path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem
 
 certificateAuthorities:
-  ca-org2:
-    url: https://ca_peerOrg2:7054
+  ca.org2.example.com:
+    url: https://ca.org2.example.com:7054
 
     httpOptions:
       verify: true
@@ -126,4 +126,4 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
 
-    caName: ca-org2
+    caName: ca.org2.example.com
diff --git a/pkg/config/config.yaml b/pkg/config/config.yaml
@@ -162,7 +162,7 @@ organizations:
     # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for
     # Fabric-CA servers.
 #    certificateAuthorities:
-#      - ca-org1
+#      - ca.org1.example.com
 
     # [Optional]. If the application is going to make requests that are reserved to organization
     # administrators, including creating/updating channels, installing/instantiating chaincodes, it
@@ -222,8 +222,8 @@ peers:
 # Certificate Authority instead of Fabric-CA, in which case this section would not be specified.
 #
 certificateAuthorities:
-#  ca-org1:
-#    url: https://ca_peerOrg1:7054
+#  ca.org1.example.com:
+#    url: https://ca.org1.example.com:7054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
 #    httpOptions:
@@ -242,4 +242,4 @@ certificateAuthorities:
 #      enrollId: usually-it-is_admin
 #      enrollSecret: adminpasswd
     # [Optional] The optional name of the CA.
-#    caName: ca-org1
+#    caName: ca.org1.example.com
diff --git a/pkg/config/testdata/config_test_pem.yaml b/pkg/config/testdata/config_test_pem.yaml
@@ -183,7 +183,7 @@ organizations:
     # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for
     # Fabric-CA servers.
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
     # [Optional]. If the application is going to make requests that are reserved to organization
     # administrators, including creating/updating channels, installing/instantiating chaincodes, it
@@ -212,7 +212,7 @@ organizations:
       - peer0.org2.example.com
 
     certificateAuthorities:
-      - ca-org2
+      - ca.org2.example.com
 
   # Orderer Org name
   ordererorg:
@@ -312,7 +312,7 @@ peers:
 # Certificate Authority instead of Fabric-CA, in which case this section would not be specified.
 #
 certificateAuthorities:
-  ca-org1:
+  ca.org1.example.com:
     url: https://ca_peerOrg1:7054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
@@ -381,8 +381,8 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
-    caName: ca-org1
-  ca-org2:
+    caName: ca.org1.example.com
+  ca.org2.example.com:
     url: https://ca_peerOrg2:7054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
@@ -402,4 +402,4 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
-    caName: ca-org2
+    caName: ca.org2.example.com
diff --git a/pkg/fabric-client/events/eventmocks.go b/pkg/fabric-client/events/eventmocks.go
@@ -215,7 +215,7 @@ func (b *MockCCBlockEventBuilder) Build() *pb.Event_Block {
 	return b.BuildWithTxValidationFlag(true)
 }
 
-// Build builds a mock chaincode event block with valid/invalid TxValidation Flag (set in the argument)
+// BuildWithTxValidationFlag builds a mock chaincode event block with valid/invalid TxValidation Flag (set in the argument)
 func (b *MockCCBlockEventBuilder) BuildWithTxValidationFlag(isValid bool) *pb.Event_Block {
 	return &pb.Event_Block{
 		Block: &common.Block{
diff --git a/pkg/fabric-txn/resmgmtclient/testdata/ccproposal_test.yaml b/pkg/fabric-txn/resmgmtclient/testdata/ccproposal_test.yaml
@@ -83,7 +83,7 @@ organizations:
       - peer0.org1.example.com
       - peer1.org1.example.com
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
   # Orderer Org name
   ordererorg:
diff --git a/pkg/fabric-txn/resmgmtclient/testdata/event_source_missing_test.yaml b/pkg/fabric-txn/resmgmtclient/testdata/event_source_missing_test.yaml
@@ -76,7 +76,7 @@ organizations:
     peers:
       - peer0.org1.example.com
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
   # Orderer Org name
   ordererorg:
diff --git a/pkg/fabric-txn/resmgmtclient/testdata/invalidchorderer_test.yaml b/pkg/fabric-txn/resmgmtclient/testdata/invalidchorderer_test.yaml
@@ -54,7 +54,7 @@ organizations:
       - peer0.org1.example.com
 
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
 orderers:
   orderer.example.com:
diff --git a/pkg/fabric-txn/resmgmtclient/testdata/invalidorderer_test.yaml b/pkg/fabric-txn/resmgmtclient/testdata/invalidorderer_test.yaml
@@ -53,7 +53,7 @@ organizations:
       - peer0.org1.example.com
 
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
 orderers:
   orderer.example.com:
diff --git a/pkg/fabric-txn/resmgmtclient/testdata/noorderer_test.yaml b/pkg/fabric-txn/resmgmtclient/testdata/noorderer_test.yaml
@@ -48,7 +48,7 @@ organizations:
       - peer0.org1.example.com
 
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
 #
 # Empty orderer list (for testing purposes)
diff --git a/test/fixtures/config/config_pkcs11_test.yaml b/test/fixtures/config/config_pkcs11_test.yaml
@@ -178,7 +178,7 @@ organizations:
     # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for
     # Fabric-CA servers.
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
     # [Optional]. If the application is going to make requests that are reserved to organization
     # administrators, including creating/updating channels, installing/instantiating chaincodes, it
@@ -207,7 +207,7 @@ organizations:
       - peer0.org2.example.com
 
     certificateAuthorities:
-      - ca-org2
+      - ca.org1.example.com
 
   # Orderer Org name
   ordererorg:
@@ -270,8 +270,8 @@ peers:
 # Certificate Authority instead of Fabric-CA, in which case this section would not be specified.
 #
 certificateAuthorities:
-  ca-org1:
-    url: https://ca_peerOrg1:7054
+  ca.org1.example.com:
+    url: https://ca.org1.example.com:7054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
     httpOptions:
@@ -290,9 +290,9 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
-    caName: ca-org1
-  ca-org2:
-    url: https://ca_peerOrg2:8054
+    caName: ca.org1.example.com
+  ca.org2.example.com:
+    url: https://ca.org2.example.com:8054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
     httpOptions:
@@ -311,4 +311,4 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
-    caName: ca-org2
+    caName: ca.org2.example.com
diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml
@@ -182,7 +182,7 @@ organizations:
     # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for
     # Fabric-CA servers.
     certificateAuthorities:
-      - ca-org1
+      - ca.org1.example.com
 
     # [Optional]. If the application is going to make requests that are reserved to organization
     # administrators, including creating/updating channels, installing/instantiating chaincodes, it
@@ -211,7 +211,7 @@ organizations:
       - peer0.org2.example.com
 
     certificateAuthorities:
-      - ca-org2
+      - ca.org2.example.com
 
   # Orderer Org name
   ordererorg:
@@ -275,8 +275,8 @@ peers:
 # Certificate Authority instead of Fabric-CA, in which case this section would not be specified.
 #
 certificateAuthorities:
-  ca-org1:
-    url: https://ca_peerOrg1:7054
+  ca.org1.example.com:
+    url: https://ca.org1.example.com:7054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
     httpOptions:
@@ -295,9 +295,9 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
-    caName: ca-org1
-  ca-org2:
-    url: https://ca_peerOrg2:8054
+    caName: ca.org1.example.com
+  ca.org2.example.com:
+    url: https://ca.org2.example.com:8054
     # the properties specified under this object are passed to the 'http' client verbatim when
     # making the request to the Fabric-CA server
     httpOptions:
@@ -316,4 +316,4 @@ certificateAuthorities:
       enrollId: admin
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
-    caName: ca-org2
+    caName: ca.org2.example.com
diff --git a/test/fixtures/dockerenv/docker-compose.yaml b/test/fixtures/dockerenv/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_CA_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_CA_FIXTURE_TAG}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
-      - FABRIC_CA_SERVER_CA_NAME=ca-org1
+      - FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com
       - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem
       - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/8791d1363e89515f9afa042b0693a2c704bb8dd95d28f97d3549a2b9e3c4352d_sk
       - FABRIC_CA_SERVER_TLS_ENABLED=true
@@ -28,13 +28,13 @@ services:
     networks:
       default:
         aliases:
-          - ca_peerOrg1
+          - ca.org1.example.com
 
   org2ca1:
     image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_CA_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_CA_FIXTURE_TAG}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
-      - FABRIC_CA_SERVER_CA_NAME=ca-org2
+      - FABRIC_CA_SERVER_CA_NAME=ca.org2.example.com
       - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem
       - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/a259204dbd6adb14c05a6e02de94567b2a9f7dbe9e6a063ba767d42bf0b544c1_sk
       - FABRIC_CA_SERVER_TLS_ENABLED=true
@@ -52,7 +52,7 @@ services:
     networks:
       default:
         aliases:
-          - ca_peerOrg2
+          - ca.org2.example.com
 
   orderer1:
     image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_ORDERER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_ORDERER_FIXTURE_TAG}
diff --git a/test/integration/fabric_ca_test.go b/test/integration/fabric_ca_test.go
@@ -143,7 +143,7 @@ func TestRegisterEnrollRevoke(t *testing.T) {
 		t.Fatalf("Error Reenroling user. Enrollmet and Reenrollment certificates are the same.")
 	}
 
-	revokeRequest := ca.RevocationRequest{Name: userName, CAName: "ca-org1"}
+	revokeRequest := ca.RevocationRequest{Name: userName, CAName: "ca.org1.example.com"}
 	err = caClient.Revoke(adminUser, &revokeRequest)
 	if err != nil {
 		t.Fatalf("Error from Revoke: %s", err)

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func (b MockCCBlockEventBuilder) Build() pb.Event_Block {`
`215`	`215`	`return b.BuildWithTxValidationFlag(true)`
`216`	`216`	`}`
`217`	`217`
`218`		`-// Build builds a mock chaincode event block with valid/invalid TxValidation Flag (set in the argument)`
	`218`	`+// BuildWithTxValidationFlag builds a mock chaincode event block with valid/invalid TxValidation Flag (set in the argument)`
`219`	`219`	`func (b MockCCBlockEventBuilder) BuildWithTxValidationFlag(isValid bool) pb.Event_Block {`
`220`	`220`	`return &pb.Event_Block{`
`221`	`221`	`Block: &common.Block{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ organizations:`
`48`	`48`	`- peer0.org1.example.com`
`49`	`49`
`50`	`50`	`certificateAuthorities:`
`51`		`- - ca-org1`
	`51`	`+ - ca.org1.example.com`
`52`	`52`
`53`	`53`	`#`
`54`	`54`	`# Empty orderer list (for testing purposes)`