[c2p_id_random] c2p: add random number to xDS node ID in google-c2p r…

…esolver
grpc · Jun 4, 2021 · 39cc18a · 39cc18a
1 parent 656cad9
commit 39cc18a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
@@ -27,6 +27,7 @@ package googledirectpath
 
 import (
 	"fmt"
+	"math/rand"
 	"time"
 
 	v3corepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -152,13 +153,15 @@ var ipv6EnabledMetadata = &structpb.Struct{
 	},
 }
 
+var id = fmt.Sprintf("C2P-%d", rand.Int())
+
 // newNode makes a copy of defaultNode, and populate it's Metadata and
 // Locality fields.
 func newNode(zone string, ipv6Capable bool) *v3corepb.Node {
 	ret := &v3corepb.Node{
 		// Not all required fields are set in defaultNote. Metadata will be set
 		// if ipv6 is enabled. Locality will be set to the value from metadata.
-		Id:                   "C2P",
+		Id:                   id,
 		UserAgentName:        gRPCUserAgentName,
 		UserAgentVersionType: &v3corepb.Node_UserAgentVersion{UserAgentVersion: grpc.Version},
 		ClientFeatures:       []string{clientFeatureNoOverprovisioning},

diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
@@ -194,7 +194,7 @@ func TestBuildXDS(t *testing.T) {
 			}
 
 			wantNode := &v3corepb.Node{
-				Id:                   "C2P",
+				Id:                   id,
 				Metadata:             nil,
 				Locality:             &v3corepb.Locality{Zone: testZone},
 				UserAgentName:        gRPCUserAgentName,