[FAB-11063] default config 'default' to '_default'

Change-Id: Iaf32fdcc5670ac7841e9114339f449723ee4e5e1
Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>

pkg/core/config/testdata/config_test_entity_matchers.yaml

@@ -217,7 +217,7 @@ organizations:
 # SDK is implementation specific. Consult each SDK's documentation for its handling of orderers.
 #
 orderers:
-  default:
+  _default:
     # these are standard properties defined by the gRPC library
     # they will be passed in as-is to gRPC client constructor
     grpcOptions:
@@ -248,7 +248,7 @@ orderers:
 # and event listener registration.
 #
 peers:
-  default:
+  _default:
 
     grpcOptions:
 #     These parameters should be set in coordination with the keepalive policy on the server,

pkg/core/config/testdata/matcher-samples/matchers_sample5.yaml

@@ -11,7 +11,7 @@
 
 
 orderers:
-  default:
+  _default:
     # these are standard properties defined by the gRPC library
     # they will be passed in as-is to gRPC client constructor
     grpcOptions:
@@ -38,7 +38,7 @@ orderers:
       ssl-target-name-override: orderer.example.com
 
 peers:
-  default:
+  _default:
     grpcOptions:
 #     These parameters should be set in coordination with the keepalive policy on the server,
 #     as incompatible settings can result in closing of connection.

pkg/core/config/testdata/matcher-samples/matchers_sample6.yaml

@@ -94,7 +94,7 @@ organizations:
       cryptoPath: ordererOrganizations/example.com/users/{username}@example.com/msp
 
 orderers:
-  default:
+  _default:
     # these are standard properties defined by the gRPC library
     # they will be passed in as-is to gRPC client constructor
     grpcOptions:
@@ -129,7 +129,7 @@ orderers:
       ssl-target-name-override: orderer.example.com
 
 peers:
-  default:
+  _default:
     grpcOptions:
 #     These parameters should be set in coordination with the keepalive policy on the server,
 #     as incompatible settings can result in closing of connection.

pkg/core/config/testdata/template/config.yaml

@@ -209,8 +209,8 @@ organizations:
 #
 orderers:
 
-#  default:
-# 'default' orderer can contain common configuration between all config orderers to avoid repetitive config entries inside each orderer config element.
+#  _default:
+# '_default' orderer can contain common configuration between all config orderers to avoid repetitive config entries inside each orderer config element.
 # url: grpcs://orderer.example.com:7050
 
     # these are standard properties defined by the gRPC library
@@ -276,8 +276,8 @@ orderers:
 # and event listener registration.
 #
 peers:
-#  default:
-# 'default' peer can contain common configuration between all config peers to avoid repetitive config entries inside each peer config element.
+#  _default:
+# '_default' peer can contain common configuration between all config peers to avoid repetitive config entries inside each peer config element.
 #  peer0.org1.example.com:
     # this URL is used to send endorsement and query requests
 #    url: grpcs://peer0.org1.example.com:7051

pkg/fab/endpointconfig.go

@@ -574,7 +574,7 @@ func (c *EndpointConfig) loadNetworkConfig(configEntity *endpointConfigEntity) e
 func (c *EndpointConfig) loadAllPeerConfigs(networkConfig *fab.NetworkConfig, entityPeers map[string]PeerConfig) error {
 	networkConfig.Peers = make(map[string]fab.PeerConfig)
 	for name, peerConfig := range entityPeers {
-		if name == "default" || c.isPeerToBeIgnored(name) {
+		if name == "_default" || c.isPeerToBeIgnored(name) {
 			//filter default and ignored peers
 			continue
 		}
@@ -595,7 +595,7 @@ func (c *EndpointConfig) loadAllPeerConfigs(networkConfig *fab.NetworkConfig, en
 func (c *EndpointConfig) loadAllOrdererConfigs(networkConfig *fab.NetworkConfig, entityOrderers map[string]OrdererConfig) error {
 	networkConfig.Orderers = make(map[string]fab.OrdererConfig)
 	for name, ordererConfig := range entityOrderers {
-		if name == "default" || c.isOrdererToBeIgnored(name) {
+		if name == "_default" || c.isOrdererToBeIgnored(name) {
 			//filter default and ignored orderers
 			continue
 		}
@@ -676,7 +676,7 @@ func (c *EndpointConfig) addMissingOrdererConfigItems(config fab.OrdererConfig)
 
 func (c *EndpointConfig) loadDefaultOrderer(configEntity *endpointConfigEntity) error {
 
-	defaultEntityOrderer, ok := configEntity.Orderers["default"]
+	defaultEntityOrderer, ok := configEntity.Orderers["_default"]
 	if !ok {
 		defaultEntityOrderer = OrdererConfig{
 			GRPCOptions: make(map[string]interface{}),
@@ -730,7 +730,7 @@ func (c *EndpointConfig) loadDefaultOrderer(configEntity *endpointConfigEntity)
 
 func (c *EndpointConfig) loadDefaultPeer(configEntity *endpointConfigEntity) error {
 
-	defaultEntityPeer, ok := configEntity.Peers["default"]
+	defaultEntityPeer, ok := configEntity.Peers["_default"]
 	if !ok {
 		defaultEntityPeer = PeerConfig{
 			GRPCOptions: make(map[string]interface{}),

test/fixtures/config/config_test.yaml

@@ -262,7 +262,7 @@ organizations:
 # SDK is implementation specific. Consult each SDK's documentation for its handling of orderers.
 #
 orderers:
-  default:
+  _default:
     # common orderer config items between all the orderers in  config
     # these are standard properties defined by the gRPC library
     # they will be passed in as-is to gRPC client constructor
@@ -303,7 +303,7 @@ orderers:
 # and event listener registration.
 #
 peers:
-  default:
+  _default:
     #common grpc options between all the peers
     grpcOptions:
       # These parameters should be set in coordination with the keepalive policy on the server,

test/fixtures/config/config_test_endpoints.yaml

@@ -211,7 +211,7 @@ orderers:
 #
 peers:
 
-  default:
+  _default:
     #common grpc options between all the peers
     grpcOptions:
       # These parameters should be set in coordination with the keepalive policy on the server,