Skip to content

Commit

Permalink
Stop using uuid package
Browse files Browse the repository at this point in the history
Signed-off-by: abarreiro <abarreiro@vmware.com>
  • Loading branch information
adambarreiro committed Jun 13, 2024
1 parent 9423b82 commit 6f65a2f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.22
require (
github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195
github.com/davecgh/go-spew v1.1.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-version v1.2.0
github.com/kr/pretty v0.2.1
github.com/peterhellberg/link v1.1.0
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ github.com/go-yaml/yaml/v2 v2.4.0 h1:FNqNkD8zxfgoQ6pSknwk+CnijAT6ijXMqcUg7FXN3LU
github.com/go-yaml/yaml/v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
Expand Down
11 changes: 6 additions & 5 deletions govcd/vdc_template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package govcd

import (
"fmt"
"github.com/google/uuid"
"github.com/vmware/go-vcloud-director/v2/types/v56"
. "gopkg.in/check.v1"
)
Expand Down Expand Up @@ -56,9 +55,10 @@ func (vcd *TestVCD) Test_VdcTemplateCRUD(check *C) {
}
check.Assert(networkPoolRef, NotNil)

externalNetworkBindingId := fmt.Sprintf("urn:vcloud:binding:%s", uuid.NewString())
gatewayEdgeClusterBindingId := fmt.Sprintf("urn:vcloud:binding:%s", uuid.NewString())
servicesEdgeClusterBindingId := fmt.Sprintf("urn:vcloud:binding:%s", uuid.NewString())
// Bindings must be random UUIDs generated manually
externalNetworkBindingId := "urn:vcloud:binding:b871f699-50e6-4a65-ab8b-428324735ff2"
gatewayEdgeClusterBindingId := "urn:vcloud:binding:36038940-dbbf-4346-94d9-e99e54c8e43a"
servicesEdgeClusterBindingId := "urn:vcloud:binding:8e7e2480-ba77-4dd0-a7d4-2d1155e4d087"

settings := types.VMWVdcTemplate{
NetworkBackingType: "NSX_T",
Expand Down Expand Up @@ -258,7 +258,8 @@ func (vcd *TestVCD) Test_VdcTemplateInstantiate(check *C) {
}
check.Assert(networkPoolRef, NotNil)

externalNetworkBindingId := fmt.Sprintf("urn:vcloud:binding:%s", uuid.NewString())
// Bindings must be random UUIDs generated manually
externalNetworkBindingId := "urn:vcloud:binding:10d82a8a-f0a9-4c98-a462-d6a1b65ae210"

template, err := vcd.client.CreateVdcTemplate(types.VMWVdcTemplate{
NetworkBackingType: "NSX_T",
Expand Down

0 comments on commit 6f65a2f

Please sign in to comment.