Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update new sdk package #620

Closed
wants to merge 1 commit into from
Closed

Update new sdk package #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace (
github.com/vmware-tanzu/nsx-operator/pkg/apis => ./pkg/apis
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-tanzu/nsx-operator/pkg/client => ./pkg/client
)

require (
Expand All @@ -27,10 +27,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
Expand All @@ -43,6 +43,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
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/networkinfo/networkinfo_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/pod/pod_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"sync"

"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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/staticroute/staticroute_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/subnet/subnet_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"sync"

"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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/subnet/subnet_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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"

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/subnetport/subnetport_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/subnetset/subnetset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"sync"

"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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/mock/staticrouteclient/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/mock/vpcclient/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 33 additions & 32 deletions pkg/nsx/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/headerconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions pkg/nsx/headerconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/nsx/services/common/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/nsx/services/common/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/nsx/services/common/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/common/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions pkg/nsx/services/common/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions pkg/nsx/services/common/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/common/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/ippool/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"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/apis/v1alpha2"
"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/ippool/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,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"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/cache"

Expand Down
4 changes: 2 additions & 2 deletions pkg/nsx/services/ippool/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ippool

import (
"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/runtime/data"
"github.com/zhengxiexie/vsphere-automation-sdk-go/services/nsxt/model"

"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common"
)
Expand Down