Merge pull request vmware-tanzu#393 from zhengxiexie/timeout

Support setting http timeout for nsx-t
zhengxiexie · Nov 17, 2023 · c87fcdd · c87fcdd
2 parents 706a0dc + 1130bae
commit c87fcdd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -99,6 +99,7 @@ type NsxConfig struct {
 	DefaultProject       string   `ini:"default_project"`
 	ExternalIPv4Blocks   []string `ini:"external_ipv4_blocks"`
 	DefaultSubnetSize    int      `ini:"default_subnet_size"`
+	DefaultTimeout       int      `ini:"default_timeout"`
 }
 
 type K8sConfig struct {

diff --git a/pkg/nsx/client.go b/pkg/nsx/client.go
@@ -121,7 +121,12 @@ func GetClient(cf *config.NSXOperatorConfig) *Client {
 	// Set log level for vsphere-automation-sdk-go
 	logger := logrus.New()
 	vspherelog.SetLogger(logger)
-	c := NewConfig(strings.Join(cf.NsxApiManagers, ","), cf.NsxApiUser, cf.NsxApiPassword, cf.CaFile, 10, 3, 20, 20, true, true, true, ratelimiter.AIMD, cf.GetTokenProvider(), nil, cf.Thumbprint)
+	defaultHttpTimeout := 20
+	if cf.DefaultTimeout > 0 {
+		defaultHttpTimeout = cf.DefaultTimeout
+	}
+	c := NewConfig(strings.Join(cf.NsxApiManagers, ","), cf.NsxApiUser, cf.NsxApiPassword, cf.CaFile, 10, 3, defaultHttpTimeout, 20, true, true, true,
+		ratelimiter.AIMD, cf.GetTokenProvider(), nil, cf.Thumbprint)
 	cluster, _ := NewCluster(c)
 
 	queryClient := search.NewQueryClient(restConnector(cluster))