Skip to content

Commit bc24ab3

Browse files
kernel-sandersyusing
authored andcommitted
Update VNet Tag type to uint32 and add max VNet Tag test case (luthermonson#244)
1 parent 8e49277 commit bc24ab3

File tree

5 files changed

+29
-2
lines changed

5 files changed

+29
-2
lines changed

cluster_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,11 @@ func TestCluster_SDNVNets(t *testing.T) {
117117
assert.Equal(t, "vnet", vnet.Type)
118118
assert.Equal(t, "test1", vnet.Zone)
119119
assert.Equal(t, 1, vnet.VlanAware)
120-
assert.Equal(t, uint16(10), vnet.Tag)
120+
assert.Equal(t, uint32(10), vnet.Tag)
121+
122+
// VNet Tag max value (VXLAN VNI range is 0-16777215)
123+
vnetMaxTag, err := cluster.SDNVNet(ctx, "maxTagVnet")
124+
assert.Nil(t, err)
125+
assert.Equal(t, "maxTagVnet", vnetMaxTag.Name)
126+
assert.Equal(t, uint32(16777215), vnetMaxTag.Tag)
121127
}

tests/mocks/pve7x/cluster.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,13 @@ func cluster() {
429429
"data": {"vnet":"user1","type":"vnet","zone":"test1","vlanaware":1,"tag":10}
430430
}`)
431431

432+
gock.New(config.C.URI).
433+
Get("^/cluster/sdn/vnets/maxTagVnet$").
434+
Reply(200).
435+
JSON(`{
436+
"data": {"vnet":"maxTagVnet","type":"vnet","zone":"test1","vlanaware":1,"tag":16777215}
437+
}`)
438+
432439
// GET /cluster/firewall/groups - List firewall security groups
433440
gock.New(config.C.URI).
434441
Persist().

tests/mocks/pve8x/cluster.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,13 @@ func cluster() {
429429
"data": {"vnet":"user1","type":"vnet","zone":"test1","vlanaware":1,"tag":10}
430430
}`)
431431

432+
gock.New(config.C.URI).
433+
Get("^/cluster/sdn/vnets/maxTagVnet$").
434+
Reply(200).
435+
JSON(`{
436+
"data": {"vnet":"maxTagVnet","type":"vnet","zone":"test1","vlanaware":1,"tag":16777215}
437+
}`)
438+
432439
// GET /cluster/firewall/groups - List firewall security groups
433440
gock.New(config.C.URI).
434441
Persist().

tests/mocks/pve9x/cluster.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,13 @@ func cluster() {
429429
"data": {"vnet":"user1","type":"vnet","zone":"test1","vlanaware":1,"tag":10}
430430
}`)
431431

432+
gock.New(config.C.URI).
433+
Get("^/cluster/sdn/vnets/maxTagVnet$").
434+
Reply(200).
435+
JSON(`{
436+
"data": {"vnet":"maxTagVnet","type":"vnet","zone":"test1","vlanaware":1,"tag":16777215}
437+
}`)
438+
432439
// GET /cluster/firewall/groups - List firewall security groups
433440
gock.New(config.C.URI).
434441
Persist().

types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ type VNet struct {
19891989
Type string `json:"type,omitempty"`
19901990
Zone string `json:"zone,omitempty"`
19911991
VlanAware int `json:"vlanaware,omitempty"`
1992-
Tag uint16 `json:"tag,omitempty"`
1992+
Tag uint32 `json:"tag,omitempty"`
19931993
}
19941994

19951995
type VNetOptions struct {

0 commit comments

Comments
 (0)