Update package

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>
vmware-tanzu · Jun 20, 2024 · e785932 · e785932
1 parent 8cbfdc4
commit e785932
Show file tree

Hide file tree

Showing 83 changed files with 191 additions and 185 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ replace (
 	github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1 => ./pkg/apis/v1alpha1
 	github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha2 => ./pkg/apis/v1alpha2
 	github.com/vmware-tanzu/nsx-operator/pkg/client => ./pkg/client
-	github.com/vmware/vsphere-automation-sdk-go => github.com/zhengxiexie/vsphere-automation-sdk-go v0.0.0-20240612095614-cb7e6c9280c7
 )
 
 require (
@@ -29,10 +28,10 @@ require (
 	github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240102061654-537b080e159f
 	github.com/vmware-tanzu/vm-operator/api v1.8.2
 	github.com/vmware/govmomi v0.27.4
-	github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0
-	github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0
-	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.0
-	github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.0
+	//github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0
+	//github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0
+	//github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.0
+	//github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.0
 	go.uber.org/automaxprocs v1.5.3
 	go.uber.org/zap v1.25.0
 	golang.org/x/crypto v0.17.0
@@ -45,6 +44,13 @@ require (
 	sigs.k8s.io/controller-runtime v0.16.0
 )
 
+require (
+	github.com/zhengxiexie/vsphere-automation-sdk-go/lib v0.7.2
+	github.com/zhengxiexie/vsphere-automation-sdk-go/runtime v0.7.2
+	github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt v0.12.2
+	github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp v0.6.2
+)
+
 require (
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -182,17 +182,17 @@ github.com/vmware-tanzu/vm-operator/api v1.8.2/go.mod h1:vauVboD3sQxP+pb28TnI9wf
 github.com/vmware/govmomi v0.27.4 h1:5kY8TAkhB20lsjzrjE073eRb8+HixBI29PVMG5lxq6I=
 github.com/vmware/govmomi v0.27.4/go.mod h1:daTuJEcQosNMXYJOeku0qdBJP9SOLLWB3Mqz8THtv6o=
 github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
-github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0 h1:pT+oqJ8FD5eUBQkl+e7LZwwtbwPvW5kDyyGXvt66gOM=
-github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0/go.mod h1:f3+6YVZpNcK2pYyiQ94BoHWmjMj9BnYav0vNFuTiDVM=
-github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0 h1:pSBxa9Agh6bgW8Hr0A1eQxuwnxGTnuAVox8iQb023hg=
-github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0/go.mod h1:qdzEFm2iK3dvlmm99EYYNxs70HbzuiHyENFD24Ps8fQ=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.0 h1:+kcDO69bfIB87KZUAYQ4AqrXlnZhpZz+QwzIB+TseqU=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.0/go.mod h1:upLH9b9zpG86P0wwO4+gREf0lBXr8gYcs7P1FRZ9n30=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.0 h1:+jS0YH9dEp8rC00SsaY5feFpVgp4Lu0YBnBe3T7zfqo=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.0/go.mod h1:ugk9I4YM62SSAox57l5NAVBCRIkPQ1RNLb3URxyTADc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/zhengxiexie/vsphere-automation-sdk-go/lib v0.7.2 h1:uslFBNmozFIyMxxAaSYWpQ4Dc//y5DOrvvuODf96jmE=
+github.com/zhengxiexie/vsphere-automation-sdk-go/lib v0.7.2/go.mod h1:dS8Uv/HwR7DRivMlqF1qdp8k/w65HAiaEQWkIm1L2bw=
+github.com/zhengxiexie/vsphere-automation-sdk-go/runtime v0.7.2 h1:kNZ2Vgp28+OEsGpDUZ0wAstAHH/L8mGiq1XqeYw1NYI=
+github.com/zhengxiexie/vsphere-automation-sdk-go/runtime v0.7.2/go.mod h1:8sgZX59Twp6HRGaybY/vnBNIn1eRyuO3c2oX1+YYI/8=
+github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt v0.12.2 h1:DqwN7Zk7qPTd5srvNiWB5DcU1l7teFuUQQgGAXKWe6Q=
+github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt v0.12.2/go.mod h1:hZaSASWSwMhJjd9jnDYlF/mFfOZHruZMXrgAQp5/9u4=
+github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp v0.6.2 h1:Hg9xgLD2G+UE5/tREuNSr8sYhfOg5/Vte6GvKvO55WI=
+github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp v0.6.2/go.mod h1:YTGOq+6ab6CVIeadkuGr22S7aG8D6btWsRLUgUrl0yw=
 go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
 go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
 go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=

diff --git a/pkg/controllers/networkinfo/networkinfo_utils.go b/pkg/controllers/networkinfo/networkinfo_utils.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	v1 "k8s.io/api/core/v1"
 	apitypes "k8s.io/apimachinery/pkg/types"
 	client "sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/pkg/controllers/networkinfo/vpcnetworkconfig_handler.go b/pkg/controllers/networkinfo/vpcnetworkconfig_handler.go
@@ -121,13 +121,12 @@ func buildNetworkConfigInfo(vpcConfigCR v1alpha1.VPCNetworkConfiguration) (*comm
 	}
 
 	ninfo := &commontypes.VPCNetworkConfigInfo{
-		IsDefault:          isDefaultNetworkConfigCR(vpcConfigCR),
-		Org:                org,
-		Name:               vpcConfigCR.Name,
-		DefaultGatewayPath: vpcConfigCR.Spec.DefaultGatewayPath,
-		EdgeClusterPath:    vpcConfigCR.Spec.EdgeClusterPath,
-		// VPCConnectivityProfile:  vpcConfigCR.Spec.VPCConnectivityProfile,
-		// VPCServiceProfile:       vpcConfigCR.Spec.VPCServiceProfile,
+		IsDefault:                  isDefaultNetworkConfigCR(vpcConfigCR),
+		Org:                        org,
+		Name:                       vpcConfigCR.Name,
+		DefaultGatewayPath:         vpcConfigCR.Spec.DefaultGatewayPath,
+		EdgeClusterPath:            vpcConfigCR.Spec.EdgeClusterPath,
+		VPCConnectivityProfile:     vpcConfigCR.Spec.VPCConnectivityProfile,
 		NsxtProject:                project,
 		ExternalIPv4Blocks:         vpcConfigCR.Spec.ExternalIPv4Blocks,
 		PrivateIPv4CIDRs:           vpcConfigCR.Spec.PrivateIPv4CIDRs,

diff --git a/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go b/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	mpmodel "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	mpmodel "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/controllers/pod/pod_controller.go b/pkg/controllers/pod/pod_controller.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	v1 "k8s.io/api/core/v1"
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/pkg/controllers/staticroute/staticroute_controller_test.go b/pkg/controllers/staticroute/staticroute_controller_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/openlyinc/pointy"
 	"github.com/stretchr/testify/assert"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/controllers/subnet/subnet_controller.go b/pkg/controllers/subnet/subnet_controller.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/controllers/subnet/subnet_controller_test.go b/pkg/controllers/subnet/subnet_controller_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 

diff --git a/pkg/controllers/subnetport/subnetport_controller_test.go b/pkg/controllers/subnetport/subnetport_controller_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1"

diff --git a/pkg/controllers/subnetset/subnetset_controller.go b/pkg/controllers/subnetset/subnetset_controller.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/mock/staticrouteclient/client.go b/pkg/mock/staticrouteclient/client.go
diff --git a/pkg/mock/vpcclient/client.go b/pkg/mock/vpcclient/client.go
diff --git a/pkg/nsx/client.go b/pkg/nsx/client.go
@@ -9,25 +9,25 @@ import (
 	"strings"
 
 	"github.com/sirupsen/logrus"
-	vspherelog "github.com/vmware/vsphere-automation-sdk-go/runtime/log"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
-	nsx_policy "github.com/vmware/vsphere-automation-sdk-go/services/nsxt"
-	mpsearch "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/search"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/trust_management"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/trust_management/principal_identities"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/domains"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/domains/security_policies"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/sites/enforcement_points"
-	projects "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects"
-	infra "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/infra"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/infra/realized_state"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs"
-	nat "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/nat"
-	vpc_sp "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/security_policies"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/subnets"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/subnets/ip_pools"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/subnets/ports"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/search"
+	vspherelog "github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/log"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/protocol/client"
+	nsx_policy "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt"
+	mpsearch "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp/nsx/search"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp/nsx/trust_management"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp/nsx/trust_management/principal_identities"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/infra/domains"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/infra/domains/security_policies"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/infra/sites/enforcement_points"
+	projects "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects"
+	infra "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/infra"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/infra/realized_state"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs"
+	nat "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/nat"
+	vpc_sp "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/security_policies"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/subnets"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/subnets/ip_pools"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/orgs/projects/vpcs/subnets/ports"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/search"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/config"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/ratelimiter"
@@ -71,19 +71,20 @@ type Client struct {
 	VPCSecurityClient vpcs.SecurityPoliciesClient
 	VPCRuleClient     vpc_sp.RulesClient
 
-	OrgRootClient       nsx_policy.OrgRootClient
-	ProjectInfraClient  projects.InfraClient
-	VPCClient           projects.VpcsClient
-	IPBlockClient       infra.IpBlocksClient
-	StaticRouteClient   vpcs.StaticRoutesClient
-	NATRuleClient       nat.NatRulesClient
-	VpcGroupClient      vpcs.GroupsClient
-	PortClient          subnets.PortsClient
-	PortStateClient     ports.StateClient
-	IPPoolClient        subnets.IpPoolsClient
-	IPAllocationClient  ip_pools.IpAllocationsClient
-	SubnetsClient       vpcs.SubnetsClient
-	RealizedStateClient realized_state.RealizedEntitiesClient
+	OrgRootClient                 nsx_policy.OrgRootClient
+	ProjectInfraClient            projects.InfraClient
+	VPCClient                     projects.VpcsClient
+	IPBlockClient                 infra.IpBlocksClient
+	StaticRouteClient             vpcs.StaticRoutesClient
+	NATRuleClient                 nat.NatRulesClient
+	VpcGroupClient                vpcs.GroupsClient
+	PortClient                    subnets.PortsClient
+	PortStateClient               ports.StateClient
+	IPPoolClient                  subnets.IpPoolsClient
+	IPAllocationClient            ip_pools.IpAllocationsClient
+	VpcConnectivityProfilesClient projects.VpcConnectivityProfilesClient
+	SubnetsClient                 vpcs.SubnetsClient
+	RealizedStateClient           realized_state.RealizedEntitiesClient
 
 	NSXChecker    NSXHealthChecker
 	NSXVerChecker NSXVersionChecker

diff --git a/pkg/nsx/client_test.go b/pkg/nsx/client_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/stretchr/testify/assert"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/config"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/ratelimiter"

diff --git a/pkg/nsx/cluster.go b/pkg/nsx/cluster.go
@@ -17,7 +17,7 @@ import (
 	"sync"
 	"time"
 
-	policyclient "github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
+	policyclient "github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/protocol/client"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/logger"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/auth"

diff --git a/pkg/nsx/headerconfig.go b/pkg/nsx/headerconfig.go
@@ -6,7 +6,7 @@ package nsx
 import (
 	"net/http"
 
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/protocol/client"
 )
 
 // HeaderConfig updates http request header.

diff --git a/pkg/nsx/headerconfig_test.go b/pkg/nsx/headerconfig_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	policyclient "github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	policyclient "github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/protocol/client"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/infra"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 )
 
 func TestHeaderConfig(t *testing.T) {

diff --git a/pkg/nsx/services/common/builder.go b/pkg/nsx/services/common/builder.go
@@ -8,8 +8,8 @@ import (
 	"regexp"
 	"strings"
 
-	mpmodel "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	mpmodel "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 )
 
 func QueryTagCondition(resourceType, cluster string) string {

diff --git a/pkg/nsx/services/common/builder_test.go b/pkg/nsx/services/common/builder_test.go
@@ -7,8 +7,8 @@ import (
 	"reflect"
 	"testing"
 
-	mpmodel "github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	mpmodel "github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt-mp/nsx/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 )
 
 func TestConvertMPTagsToTags(t *testing.T) {

diff --git a/pkg/nsx/services/common/compare.go b/pkg/nsx/services/common/compare.go
@@ -1,8 +1,8 @@
 package common
 
 import (
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/data"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/data/serializers/cleanjson"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/data"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/data/serializers/cleanjson"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/logger"
 )

diff --git a/pkg/nsx/services/common/services.go b/pkg/nsx/services/common/services.go
@@ -3,7 +3,7 @@ package common
 import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 )
 
 // VPCServiceProvider provides to methods other controllers and services.

diff --git a/pkg/nsx/services/common/store.go b/pkg/nsx/services/common/store.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"sync"
 
-	apierrors "github.com/vmware/vsphere-automation-sdk-go/lib/vapi/std/errors"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/bindings"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/data"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	apierrors "github.com/zhengxiexie/vsphere-automation-sdk-go/lib/vapi/std/errors"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/bindings"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/data"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/cache"
 

diff --git a/pkg/nsx/services/common/store_test.go b/pkg/nsx/services/common/store_test.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/stretchr/testify/assert"
-	"github.com/vmware/vsphere-automation-sdk-go/lib/vapi/std/errors"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/bindings"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/data"
-	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/lib/vapi/std/errors"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/bindings"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/data"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"
 	"k8s.io/client-go/tools/cache"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/config"

diff --git a/pkg/nsx/services/common/types.go b/pkg/nsx/services/common/types.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/openlyinc/pointy"
-	"github.com/vmware/vsphere-automation-sdk-go/runtime/bindings"
+	"github.com/zhengxiexie/vsphere-automation-sdk-go/runtime/bindings"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/config"
@@ -200,7 +200,7 @@ type VPCNetworkConfigInfo struct {
 	Name               string
 	DefaultGatewayPath string // deprecated, existing field
 	// VPCServiceProfile       string
-	// VPCConnectivityProfile  string
+	VPCConnectivityProfile     string
 	EdgeClusterPath            string // deprecated, existing field
 	NsxtProject                string
 	ExternalIPv4Blocks         []string // deprecated, existing field