[FAB-11063] default peer/orderer for url search

sudeshrshetty · sudeshrshetty · commit d9ca5ec8f2c6 · 2018-07-16T23:37:59.000-04:00
Change-Id: Iddff12d8ec8112100282dc869ec45711a8c1ad2f
Signed-off-by: Sudesh Shetty &lt;sudesh.shetty@securekey.com&gt;
diff --git a/pkg/core/config/lookup/lookup_test.go b/pkg/core/config/lookup/lookup_test.go
@@ -289,11 +289,11 @@ func TestUnmarshalWithMultipleBackend(t *testing.T) {
 
 	//EntityMatchers
 	assert.Equal(t, len(entityMatchers.matchers), 4)
-	assert.Equal(t, len(entityMatchers.matchers["peer"]), 8)
+	assert.Equal(t, len(entityMatchers.matchers["peer"]), 10)
 	assert.Equal(t, entityMatchers.matchers["peer"][0].MappedHost, "local.peer0.org1.example.com")
-	assert.Equal(t, len(entityMatchers.matchers["orderer"]), 4)
+	assert.Equal(t, len(entityMatchers.matchers["orderer"]), 6)
 	assert.Equal(t, entityMatchers.matchers["orderer"][0].MappedHost, "local.orderer.example.com")
-	assert.Equal(t, len(entityMatchers.matchers["certificateauthority"]), 2)
+	assert.Equal(t, len(entityMatchers.matchers["certificateauthority"]), 3)
 	assert.Equal(t, entityMatchers.matchers["certificateauthority"][0].MappedHost, "local.ca.org1.example.com")
 	assert.Equal(t, len(entityMatchers.matchers["channel"]), 1)
 	assert.Equal(t, entityMatchers.matchers["channel"][0].MappedName, "ch1")
diff --git a/pkg/fab/endpointconfig.go b/pkg/fab/endpointconfig.go
@@ -1112,14 +1112,13 @@ func (c *EndpointConfig) tryMatchingPeerConfig(peerSearchKey string, searchByURL
 		}
 	}
 
-	//TODO : for search by URL, return default if no result found
-	//if strings.Contains(peerSearchKey, ":") {
-	//	return &fab.PeerConfig{
-	//		URL:         peerSearchKey,
-	//		GRPCOptions: c.defaultPeerConfig.GRPCOptions,
-	//		TLSCACert:   c.defaultPeerConfig.TLSCACert,
-	//	}
-	//}
+	if searchByURL && strings.Contains(peerSearchKey, ":") {
+		return &fab.PeerConfig{
+			URL:         peerSearchKey,
+			GRPCOptions: c.defaultPeerConfig.GRPCOptions,
+			TLSCACert:   c.defaultPeerConfig.TLSCACert,
+		}, true
+	}
 
 	return nil, false
 }
@@ -1216,14 +1215,14 @@ func (c *EndpointConfig) tryMatchingOrdererConfig(ordererSearchKey string, searc
 		}
 	}
 
-	//TODO : for search by URL, return default if no result found
-	//if strings.Contains(ordererSearchKey, ":") {
-	//	return &fab.OrdererConfig{
-	//		URL:         ordererSearchKey,
-	//		GRPCOptions: c.defaultOrdererConfig.GRPCOptions,
-	//		TLSCACert:   c.defaultOrdererConfig.TLSCACert,
-	//	}
-	//}
+	//In case of URL search, return default orderer config where URL=SearchKey
+	if searchByURL && strings.Contains(ordererSearchKey, ":") {
+		return &fab.OrdererConfig{
+			URL:         ordererSearchKey,
+			GRPCOptions: c.defaultOrdererConfig.GRPCOptions,
+			TLSCACert:   c.defaultOrdererConfig.TLSCACert,
+		}, true
+	}
 
 	return nil, false
 }
diff --git a/pkg/fab/matchers_test.go b/pkg/fab/matchers_test.go
@@ -353,46 +353,86 @@ func getBackendsFromFiles(files ...string) ([]core.ConfigBackend, error) {
 	return backends, nil
 }
 
-//TODO to be enabled once default search result for peerConfig search by URL is available
-//func TestDefaultPeerForNonExistingURL(t *testing.T) {
-//	backends, err := getBackendsFromFiles(sampleMatchersDefaultConfigs, configTestFilePath)
-//	assert.Nil(t, err, "not supposed to get error")
-//	assert.Equal(t, 2, len(backends))
-//
-//	config, err := ConfigFromBackend(backends...)
-//	assert.Nil(t, err, "not supposed to get error")
-//	assert.NotNil(t, config)
-//
-//	//PeerConfig Search Based on unmatched URL, default peerconfig with searchkey as URL should be returned
-//	peerConfig, ok := config.PeerConfig("ABC.XYZ:2222")
-//	assert.True(t, ok, "supposed to find peer config")
-//	assert.Equal(t, "ABC.XYZ:2222", peerConfig.URL)
-//	assert.Equal(t, "", peerConfig.EventURL)
-//	assert.Equal(t, nil, peerConfig.GRPCOptions["ssl-target-name-override"])
-//	assert.NotNil(t, peerConfig.TLSCACert)
-//
-//	assert.Equal(t, "1s", peerConfig.GRPCOptions["keep-alive-time"])
-//	assert.Equal(t, nil, peerConfig.GRPCOptions["ssl-target-name-override"])
-//	assert.Equal(t, "21s", peerConfig.GRPCOptions["keep-alive-timeout"])
-//	assert.Equal(t, true, peerConfig.GRPCOptions["keep-alive-permit"])
-//	assert.Equal(t, true, peerConfig.GRPCOptions["fail-fast"])
-//	assert.Equal(t, true, peerConfig.GRPCOptions["allow-insecure"])
-//
-//	//make sure map has all the expected grpc opts keys
-//	_, ok = peerConfig.GRPCOptions["keep-alive-time"]
-//	assert.True(t, ok)
-//	_, ok = peerConfig.GRPCOptions["ssl-target-name-override"]
-//	assert.False(t, ok)
-//	_, ok = peerConfig.GRPCOptions["keep-alive-timeout"]
-//	assert.True(t, ok)
-//	_, ok = peerConfig.GRPCOptions["keep-alive-permit"]
-//	assert.True(t, ok)
-//	_, ok = peerConfig.GRPCOptions["fail-fast"]
-//	assert.True(t, ok)
-//	_, ok = peerConfig.GRPCOptions["allow-insecure"]
-//	assert.True(t, ok)
-//
-//}
+//TestDefaultPeerForNonExistingURL tests default peerConfig result for search by URL scenario
+func TestDefaultPeerForNonExistingURL(t *testing.T) {
+	backends, err := getBackendsFromFiles(sampleMatchersDefaultConfigs, configTestFilePath)
+	assert.Nil(t, err, "not supposed to get error")
+	assert.Equal(t, 2, len(backends))
+
+	config, err := ConfigFromBackend(backends...)
+	assert.Nil(t, err, "not supposed to get error")
+	assert.NotNil(t, config)
+
+	//PeerConfig Search Based on unmatched URL, default peerconfig with searchkey as URL should be returned
+	peerConfig, ok := config.PeerConfig("ABC.XYZ:2222")
+	assert.True(t, ok, "supposed to find peer config")
+	assert.Equal(t, "ABC.XYZ:2222", peerConfig.URL)
+	assert.Equal(t, "", peerConfig.EventURL)
+	assert.Equal(t, nil, peerConfig.GRPCOptions["ssl-target-name-override"])
+	assert.NotNil(t, peerConfig.TLSCACert)
+
+	assert.Equal(t, "1s", peerConfig.GRPCOptions["keep-alive-time"])
+	assert.Equal(t, nil, peerConfig.GRPCOptions["ssl-target-name-override"])
+	assert.Equal(t, "21s", peerConfig.GRPCOptions["keep-alive-timeout"])
+	assert.Equal(t, true, peerConfig.GRPCOptions["keep-alive-permit"])
+	assert.Equal(t, true, peerConfig.GRPCOptions["fail-fast"])
+	assert.Equal(t, true, peerConfig.GRPCOptions["allow-insecure"])
+
+	//make sure map has all the expected grpc opts keys
+	_, ok = peerConfig.GRPCOptions["keep-alive-time"]
+	assert.True(t, ok)
+	_, ok = peerConfig.GRPCOptions["ssl-target-name-override"]
+	assert.False(t, ok)
+	_, ok = peerConfig.GRPCOptions["keep-alive-timeout"]
+	assert.True(t, ok)
+	_, ok = peerConfig.GRPCOptions["keep-alive-permit"]
+	assert.True(t, ok)
+	_, ok = peerConfig.GRPCOptions["fail-fast"]
+	assert.True(t, ok)
+	_, ok = peerConfig.GRPCOptions["allow-insecure"]
+	assert.True(t, ok)
+
+}
+
+//TestDefaultOrdererForNonExistingURL tests default ordererConfig result for search by URL scenario
+func TestDefaultOrdererForNonExistingURL(t *testing.T) {
+	backends, err := getBackendsFromFiles(sampleMatchersDefaultConfigs, configTestFilePath)
+	assert.Nil(t, err, "not supposed to get error")
+	assert.Equal(t, 2, len(backends))
+
+	config, err := ConfigFromBackend(backends...)
+	assert.Nil(t, err, "not supposed to get error")
+	assert.NotNil(t, config)
+
+	//PeerConfig Search Based on unmatched URL, default peerconfig with searchkey as URL should be returned
+	ordererConfig, ok := config.OrdererConfig("ABC.XYZ:2222")
+	assert.True(t, ok, "supposed to find peer config")
+	assert.Equal(t, "ABC.XYZ:2222", ordererConfig.URL)
+	assert.Equal(t, nil, ordererConfig.GRPCOptions["ssl-target-name-override"])
+	assert.NotNil(t, ordererConfig.TLSCACert)
+
+	assert.Equal(t, "1s", ordererConfig.GRPCOptions["keep-alive-time"])
+	assert.Equal(t, nil, ordererConfig.GRPCOptions["ssl-target-name-override"])
+	assert.Equal(t, "21s", ordererConfig.GRPCOptions["keep-alive-timeout"])
+	assert.Equal(t, true, ordererConfig.GRPCOptions["keep-alive-permit"])
+	assert.Equal(t, true, ordererConfig.GRPCOptions["fail-fast"])
+	assert.Equal(t, true, ordererConfig.GRPCOptions["allow-insecure"])
+
+	//make sure map has all the expected grpc opts keys
+	_, ok = ordererConfig.GRPCOptions["keep-alive-time"]
+	assert.True(t, ok)
+	_, ok = ordererConfig.GRPCOptions["ssl-target-name-override"]
+	assert.False(t, ok)
+	_, ok = ordererConfig.GRPCOptions["keep-alive-timeout"]
+	assert.True(t, ok)
+	_, ok = ordererConfig.GRPCOptions["keep-alive-permit"]
+	assert.True(t, ok)
+	_, ok = ordererConfig.GRPCOptions["fail-fast"]
+	assert.True(t, ok)
+	_, ok = ordererConfig.GRPCOptions["allow-insecure"]
+	assert.True(t, ok)
+
+}
 
 //TestMatchersIgnoreEndpoint tests entity matcher ignore endpoint feature
 // If marked as `IgnoreEndpoint: true` then config for,
diff --git a/test/fixtures/config/config_e2e_multiorg_bootstrap.yaml b/test/fixtures/config/config_e2e_multiorg_bootstrap.yaml
@@ -195,4 +195,11 @@ entityMatchers:
     - pattern: (\w+).org1.example.com:(\d+)
       urlSubstitutionExp: $1.org1.example.com:$2
       sslTargetOverrideUrlSubstitutionExp: $1.org1.example.com
-      mappedHost: peer0.org1.example.com
+      mappedHost: peer0.org1.example.com
+
+## TODO added below peer to ignore list, to avoid these revoked peer to conflict with bootstrap test
+    - pattern: peer1.org2.example.com:(\d+)
+      ignoreEndpoint: true
+
+    - pattern: peer1.org2.example.com
+      ignoreEndpoint: true
diff --git a/test/fixtures/config/config_test_endpoints.yaml b/test/fixtures/config/config_test_endpoints.yaml
@@ -136,6 +136,26 @@ channels:
         # Default: true
         eventSource: true
 
+      peer1.org1.example.com:
+        # [Optional]. will this peer be sent transaction proposals for endorsement? The peer must
+        # have the chaincode installed. The app can also use this property to decide which peers
+        # to send the chaincode install request. Default: true
+        endorsingPeer: false
+
+        # [Optional]. will this peer be sent query proposals? The peer must have the chaincode
+        # installed. The app can also use this property to decide which peers to send the
+        # chaincode install request. Default: true
+        chaincodeQuery: false
+
+        # [Optional]. will this peer be sent query proposals that do not require chaincodes, like
+        # queryBlock(), queryTransaction(), etc. Default: true
+        ledgerQuery: false
+
+        # [Optional]. will this peer be the target of the SDK's listener registration? All peers can
+        # produce events but the app typically only needs to connect to one to listen to events.
+        # Default: true
+        eventSource: true
+
 #
 # list of participating organizations in this network
 #
@@ -148,6 +168,7 @@ organizations:
 
     peers:
       - peer0.org1.example.com
+      - peer1.org1.example.com
 
   # Orderer Org name
   ordererorg:
@@ -189,14 +210,10 @@ orderers:
 # and event listener registration.
 #
 peers:
-  peer0.org1.example.com:
-    # this URL is used to send endorsement and query requests
-    url: peer0.org1.example.com:7051
-    # eventUrl is only needed when using eventhub (default is delivery service)
-    eventUrl: peer0.org1.example.com:7053
 
+  default:
+    #common grpc options between all the peers
     grpcOptions:
-      ssl-target-name-override: peer0.org1.example.com
       # These parameters should be set in coordination with the keepalive policy on the server,
       # as incompatible settings can result in closing of connection.
       # When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
@@ -207,6 +224,28 @@ peers:
       # allow-insecure will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs
       allow-insecure: false
 
+  peer0.org1.example.com:
+    # this URL is used to send endorsement and query requests
+    url: peer0.org1.example.com:7051
+    # eventUrl is only needed when using eventhub (default is delivery service)
+    eventUrl: peer0.org1.example.com:7053
+
+    grpcOptions:
+      ssl-target-name-override: peer0.org1.example.com
+
+    tlsCACerts:
+      # Certificate location absolute path
+      path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
+
+  peer1.org1.example.com:
+    # this URL is used to send endorsement and query requests
+    url: peer1.org1.example.com:7151
+    # eventUrl is only needed when using eventhub (default is delivery service)
+    eventUrl: peer1.org1.example.com:7153
+
+    grpcOptions:
+      ssl-target-name-override: peer1.org1.example.com
+
     tlsCACerts:
       # Certificate location absolute path
       path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem
