Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ced40b2

Browse filesBrowse files
mandremandre
committed
networking: add constants for port status
This avoids the need to define these constants in consumer code.
1 parent 1031a87 commit ced40b2
Copy full SHA for ced40b2

File tree

4 files changed

+27
-17
lines changed
Filter options

4 files changed

+27
-17
lines changed

‎internal/acceptance/openstack/networking/v2/networking.go

Copy file name to clipboardExpand all lines: internal/acceptance/openstack/networking/v2/networking.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ func WaitForPortToCreate(client *gophercloud.ServiceClient, portID string) error
567567
return false, err
568568
}
569569

570-
if p.Status == "ACTIVE" || p.Status == "DOWN" {
570+
if p.Status == ports.PortStatusActive || p.Status == ports.PortStatusDown {
571571
return true, nil
572572
}
573573

‎openstack/networking/v2/ports/results.go

Copy file name to clipboardExpand all lines: openstack/networking/v2/ports/results.go
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ type Port struct {
8181
// Indicates whether network is currently operational. Possible values include
8282
// `ACTIVE', `DOWN', `BUILD', or `ERROR'. Plug-ins might define additional
8383
// values.
84-
Status string `json:"status"`
84+
Status PortStatus `json:"status"`
8585

8686
// Mac address to use on this port.
8787
MACAddress string `json:"mac_address"`

‎openstack/networking/v2/ports/testing/requests_test.go

Copy file name to clipboardExpand all lines: openstack/networking/v2/ports/testing/requests_test.go
+15-15Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestList(t *testing.T) {
4242

4343
expected := []ports.Port{
4444
{
45-
Status: "ACTIVE",
45+
Status: ports.PortStatusActive,
4646
Name: "",
4747
AdminStateUp: true,
4848
NetworkID: "70c1db1f-b701-45bd-96e0-a313ee3430b3",
@@ -102,7 +102,7 @@ func TestListWithExtensions(t *testing.T) {
102102
err = ports.ExtractPortsInto(allPages, &allPorts)
103103
th.AssertNoErr(t, err)
104104

105-
th.AssertEquals(t, allPorts[0].Status, "ACTIVE")
105+
th.AssertEquals(t, allPorts[0].Status, ports.PortStatusActive)
106106
th.AssertEquals(t, allPorts[0].PortSecurityEnabled, false)
107107
}
108108

@@ -123,7 +123,7 @@ func TestGet(t *testing.T) {
123123
n, err := ports.Get(context.TODO(), fake.ServiceClient(), "46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2").Extract()
124124
th.AssertNoErr(t, err)
125125

126-
th.AssertEquals(t, n.Status, "ACTIVE")
126+
th.AssertEquals(t, n.Status, ports.PortStatusActive)
127127
th.AssertEquals(t, n.Name, "")
128128
th.AssertEquals(t, n.AdminStateUp, true)
129129
th.AssertEquals(t, n.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
@@ -135,7 +135,7 @@ func TestGet(t *testing.T) {
135135
})
136136
th.AssertEquals(t, n.ID, "46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2")
137137
th.AssertDeepEquals(t, n.SecurityGroups, []string{})
138-
th.AssertEquals(t, n.Status, "ACTIVE")
138+
th.AssertEquals(t, n.Status, ports.PortStatusActive)
139139
th.AssertEquals(t, n.DeviceID, "5e3898d7-11be-483e-9732-b2f5eccd2b2e")
140140
th.AssertEquals(t, n.CreatedAt, time.Date(2019, time.June, 30, 4, 15, 37, 0, time.UTC))
141141
th.AssertEquals(t, n.UpdatedAt, time.Date(2019, time.June, 30, 5, 18, 49, 0, time.UTC))
@@ -163,7 +163,7 @@ func TestGetWithExtensions(t *testing.T) {
163163
err := ports.Get(context.TODO(), fake.ServiceClient(), "46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2").ExtractInto(&portWithExtensions)
164164
th.AssertNoErr(t, err)
165165

166-
th.AssertEquals(t, portWithExtensions.Status, "ACTIVE")
166+
th.AssertEquals(t, portWithExtensions.Status, ports.PortStatusActive)
167167
th.AssertEquals(t, portWithExtensions.PortSecurityEnabled, false)
168168
}
169169

@@ -200,7 +200,7 @@ func TestCreate(t *testing.T) {
200200
n, err := ports.Create(context.TODO(), fake.ServiceClient(), options).Extract()
201201
th.AssertNoErr(t, err)
202202

203-
th.AssertEquals(t, n.Status, "DOWN")
203+
th.AssertEquals(t, n.Status, ports.PortStatusDown)
204204
th.AssertEquals(t, n.Name, "private-port")
205205
th.AssertEquals(t, n.AdminStateUp, true)
206206
th.AssertEquals(t, n.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
@@ -249,7 +249,7 @@ func TestCreateOmitSecurityGroups(t *testing.T) {
249249
n, err := ports.Create(context.TODO(), fake.ServiceClient(), options).Extract()
250250
th.AssertNoErr(t, err)
251251

252-
th.AssertEquals(t, n.Status, "DOWN")
252+
th.AssertEquals(t, n.Status, ports.PortStatusDown)
253253
th.AssertEquals(t, n.Name, "private-port")
254254
th.AssertEquals(t, n.AdminStateUp, true)
255255
th.AssertEquals(t, n.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
@@ -299,7 +299,7 @@ func TestCreateWithNoSecurityGroup(t *testing.T) {
299299
n, err := ports.Create(context.TODO(), fake.ServiceClient(), options).Extract()
300300
th.AssertNoErr(t, err)
301301

302-
th.AssertEquals(t, n.Status, "DOWN")
302+
th.AssertEquals(t, n.Status, ports.PortStatusDown)
303303
th.AssertEquals(t, n.Name, "private-port")
304304
th.AssertEquals(t, n.AdminStateUp, true)
305305
th.AssertEquals(t, n.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
@@ -346,7 +346,7 @@ func TestCreateWithPropagateUplinkStatus(t *testing.T) {
346346
n, err := ports.Create(context.TODO(), fake.ServiceClient(), options).Extract()
347347
th.AssertNoErr(t, err)
348348

349-
th.AssertEquals(t, n.Status, "DOWN")
349+
th.AssertEquals(t, n.Status, ports.PortStatusDown)
350350
th.AssertEquals(t, n.Name, "private-port")
351351
th.AssertEquals(t, n.AdminStateUp, true)
352352
th.AssertEquals(t, n.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
@@ -396,7 +396,7 @@ func TestCreateWithValueSpecs(t *testing.T) {
396396
n, err := ports.Create(context.TODO(), fake.ServiceClient(), options).Extract()
397397
th.AssertNoErr(t, err)
398398

399-
th.AssertEquals(t, n.Status, "DOWN")
399+
th.AssertEquals(t, n.Status, ports.PortStatusDown)
400400
th.AssertEquals(t, n.Name, "private-port")
401401
th.AssertEquals(t, n.AdminStateUp, true)
402402
th.AssertEquals(t, n.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
@@ -513,7 +513,7 @@ func TestCreatePortSecurity(t *testing.T) {
513513
err := ports.Create(context.TODO(), fake.ServiceClient(), createOpts).ExtractInto(&portWithExt)
514514
th.AssertNoErr(t, err)
515515

516-
th.AssertEquals(t, portWithExt.Status, "DOWN")
516+
th.AssertEquals(t, portWithExt.Status, ports.PortStatusDown)
517517
th.AssertEquals(t, portWithExt.PortSecurityEnabled, false)
518518
}
519519

@@ -687,7 +687,7 @@ func TestUpdatePortSecurity(t *testing.T) {
687687
err := ports.Update(context.TODO(), fake.ServiceClient(), "65c0ee9f-d634-4522-8954-51021b570b0d", updateOpts).ExtractInto(&portWithExt)
688688
th.AssertNoErr(t, err)
689689

690-
th.AssertEquals(t, portWithExt.Status, "DOWN")
690+
th.AssertEquals(t, portWithExt.Status, ports.PortStatusDown)
691691
th.AssertEquals(t, portWithExt.Name, "private-port")
692692
th.AssertEquals(t, portWithExt.PortSecurityEnabled, false)
693693
}
@@ -898,7 +898,7 @@ func TestGetWithExtraDHCPOpts(t *testing.T) {
898898
err := ports.Get(context.TODO(), fake.ServiceClient(), "46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2").ExtractInto(&s)
899899
th.AssertNoErr(t, err)
900900

901-
th.AssertEquals(t, s.Status, "ACTIVE")
901+
th.AssertEquals(t, s.Status, ports.PortStatusActive)
902902
th.AssertEquals(t, s.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
903903
th.AssertEquals(t, s.TenantID, "d6700c0c9ffa4f1cb322cd4a1f3906fa")
904904
th.AssertEquals(t, s.AdminStateUp, true)
@@ -964,7 +964,7 @@ func TestCreateWithExtraDHCPOpts(t *testing.T) {
964964
err := ports.Create(context.TODO(), fake.ServiceClient(), createOpts).ExtractInto(&s)
965965
th.AssertNoErr(t, err)
966966

967-
th.AssertEquals(t, s.Status, "DOWN")
967+
th.AssertEquals(t, s.Status, ports.PortStatusDown)
968968
th.AssertEquals(t, s.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
969969
th.AssertEquals(t, s.TenantID, "d6700c0c9ffa4f1cb322cd4a1f3906fa")
970970
th.AssertEquals(t, s.AdminStateUp, true)
@@ -1029,7 +1029,7 @@ func TestUpdateWithExtraDHCPOpts(t *testing.T) {
10291029
err := ports.Update(context.TODO(), fake.ServiceClient(), "65c0ee9f-d634-4522-8954-51021b570b0d", updateOpts).ExtractInto(&s)
10301030
th.AssertNoErr(t, err)
10311031

1032-
th.AssertEquals(t, s.Status, "DOWN")
1032+
th.AssertEquals(t, s.Status, ports.PortStatusDown)
10331033
th.AssertEquals(t, s.NetworkID, "a87cc70a-3e15-4acf-8205-9b711a3531b7")
10341034
th.AssertEquals(t, s.TenantID, "d6700c0c9ffa4f1cb322cd4a1f3906fa")
10351035
th.AssertEquals(t, s.AdminStateUp, true)

‎openstack/networking/v2/ports/types.go

Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package ports
2+
3+
type PortStatus string
4+
5+
const (
6+
PortStatusActive PortStatus = "ACTIVE"
7+
PortStatusBuild PortStatus = "BUILD"
8+
PortStatusDown PortStatus = "DOWN"
9+
PortStatusError PortStatus = "ERROR"
10+
)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.