Skip to content

Commit e3a6f92

Browse files
nitram509nitram509
authored
Merge pull request #71 from nitram509/issue-70-Support-POE-reset-for-GS316xx
support poe reset for gs316xx, fix issue #70
2 parents b1fa8b8 + d0d667c commit e3a6f92

File tree

14 files changed

+792
-1105
lines changed

14 files changed

+792
-1105
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: "setup go"
1414
uses: actions/setup-go@v3
1515
with:
16-
go-version: '1.20'
16+
go-version: '1.23'
1717
- name: Get the version
1818
id: get_version
1919
run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT

‎.github/workflows/go-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: "setup go"
1717
uses: actions/setup-go@v3
1818
with:
19-
go-version: '1.20'
19+
go-version: '1.23'
2020
- name: "go mod download"
2121
run: "go mod download"
2222
- name: "go test ./..."

‎.github/workflows/update-readme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: "setup go"
1313
uses: actions/setup-go@v3
1414
with:
15-
go-version: '1.20'
15+
go-version: '1.23'
1616
- name: "build binary and print --help"
1717
run: |
1818
go build -o ntgrrc .

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11

22
# ntgrrc (Netgear Remote Control) CHANGELOG
33

4+
## v0.11.0
5+
6+
* Add support poe reset (cycle power) for gs316xx (#70); many thanks to @electron1963 for testing and supporting this feature
7+
* Switch to Go v1.23
8+
9+
----
10+
411
## v0.10.1
512

613
* added outputs to standard output by @oalfreda in #64

‎README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ A green tick means it was successfully tested.
2424
| V1.0.1.1 | (likely) | ✅ | (likely) | - |
2525
| V1.0.3.4 | - | - | - | experimental |
2626
| V1.0.3.7 | - | - | - | experimental |
27+
| V1.0.4.4 | - | - | - | experimental |
2728

2829
Legend: \
2930
✅ = successfully tested \
3031
? = unknown \
31-
experimental = The support for GS316xxx models is limited to showing the port status.
32+
experimental = The support for GS316xxx models is limited to: show port status, power cycle a port, show port settings
3233

3334
## download & installation
3435

@@ -353,6 +354,8 @@ ntgrrc is able to power cycle one or more PoE ports.
353354
Use the ```--output-format=json``` flag, to get JSON output instead.
354355

355356
```ntgrrc poe cycle -p 3 -p 5 --address gs305ep```
357+
Alternativly, you can achieve the same request with this
358+
```ntgrrc poe cycle --address gs305ep --port=3,5```
356359

357360
```markdown
358361
| Port ID | Port Power | Mode | Priority | Limit Type | Limit (W) | Type |

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module ntgrrc
22

3-
go 1.20
3+
go 1.23
44

55
require (
6-
github.com/PuerkitoBio/goquery v1.9.2
6+
github.com/PuerkitoBio/goquery v1.10.0
77
github.com/alecthomas/kong v1.6.0
88
github.com/corbym/gocrest v1.1.2
99
golang.org/x/term v0.27.0
1010
)
1111

1212
require (
13-
github.com/andybalholm/cascadia v1.3.2 // indirect
14-
golang.org/x/net v0.24.0 // indirect
13+
github.com/andybalholm/cascadia v1.3.3 // indirect
14+
golang.org/x/net v0.33.0 // indirect
1515
golang.org/x/sys v0.28.0 // indirect
1616
)

‎go.sum

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,82 @@
1-
github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE=
2-
github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
1+
github.com/PuerkitoBio/goquery v1.10.0 h1:6fiXdLuUvYs2OJSvNRqlNPoBm6YABE226xrbavY5Wv4=
2+
github.com/PuerkitoBio/goquery v1.10.0/go.mod h1:TjZZl68Q3eGHNBA8CWaxAN7rOU1EbDz3CWuolcO5Yu4=
33
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
4+
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
45
github.com/alecthomas/kong v1.6.0 h1:mwOzbdMR7uv2vul9J0FU3GYxE7ls/iX1ieMg5WIM6gE=
56
github.com/alecthomas/kong v1.6.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
67
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
7-
github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
8-
github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
8+
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
9+
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
10+
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
911
github.com/corbym/gocrest v1.1.2 h1:HwMyOILE0E/BqC1vs/JjanEj+HXeYPGZzbppIgd1/Os=
1012
github.com/corbym/gocrest v1.1.2/go.mod h1:vhNebfdBGx5l0Nh0OM/CvIVqGAnR9AAbI5qA9OxRUOU=
13+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1114
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
15+
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
1216
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
1317
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
1418
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
19+
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
20+
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
21+
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
22+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
1523
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
1624
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
25+
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
26+
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
27+
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1728
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1829
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
1930
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
2031
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
21-
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
22-
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
23-
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
32+
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
33+
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
34+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
35+
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
36+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
37+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
2438
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2539
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2640
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
41+
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
42+
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
43+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
44+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2745
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2846
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2947
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3048
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3149
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3250
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33-
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
51+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
52+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
53+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
54+
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3455
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
3556
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
57+
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
3658
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
3759
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
3860
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
39-
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
61+
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
62+
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
63+
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
64+
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
4065
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
4166
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
4267
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4368
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
4469
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
4570
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
4671
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
72+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
73+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
74+
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
75+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
4776
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
4877
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
4978
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
5079
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
80+
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
81+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
5182
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎http.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func doHttpRequestAndReadResponse(args *GlobalOptions, httpMethod string, host s
2222
}
2323

2424
if args.Verbose {
25-
println("Fetching data from: " + requestUrl)
25+
println(fmt.Sprintf("send HTTP %s request to: %s", httpMethod, requestUrl))
2626
}
2727

2828
if isModel316(model) {
@@ -41,6 +41,10 @@ func doHttpRequestAndReadResponse(args *GlobalOptions, httpMethod string, host s
4141

4242
if isModel30x(model) {
4343
req.Header.Set("Cookie", "SID="+token)
44+
} else if isModel316(model) {
45+
req.Header.Set("Cookie", "gambitCookie="+token)
46+
} else {
47+
panic("model not supported")
4448
}
4549

4650
client := &http.Client{}

‎poe_cycle.go

Lines changed: 81 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package main
33
import (
44
"errors"
55
"fmt"
6+
"net/http"
67
"net/url"
8+
"slices"
9+
"strings"
710
)
811

912
type PoeCyclePowerCommand struct {
@@ -12,11 +15,24 @@ type PoeCyclePowerCommand struct {
1215
}
1316

1417
func (poe *PoeCyclePowerCommand) Run(args *GlobalOptions) error {
15-
err := ensureModelIs30x(args, poe.Address)
16-
if err != nil {
17-
return err
18+
model := args.model
19+
if len(model) == 0 {
20+
var err error
21+
model, err = detectNetgearModel(args, poe.Address)
22+
if err != nil {
23+
return err
24+
}
25+
}
26+
if isModel30x(model) {
27+
return poe.cyclePowerGs30xEPx(args)
28+
}
29+
if isModel316(model) {
30+
return poe.cyclePowerGs316EPx(args)
1831
}
32+
panic("model not supported")
33+
}
1934

35+
func (poe *PoeCyclePowerCommand) cyclePowerGs30xEPx(args *GlobalOptions) error {
2036
poeExt := &PoeExt{}
2137

2238
settings, err := requestPoeConfiguration(args, poe.Address, poeExt)
@@ -30,19 +46,19 @@ func (poe *PoeCyclePowerCommand) Run(args *GlobalOptions) error {
3046
}
3147

3248
for _, switchPort := range poe.Ports {
33-
if switchPort > len(settings) || switchPort < 1 {
49+
if switchPort < 1 || switchPort > len(settings) {
3450
return errors.New(fmt.Sprintf("given port id %d, doesn't fit in range 1..%d", switchPort, len(settings)))
3551
}
3652
poeSettings.Add(fmt.Sprintf("port%d", switchPort-1), "checked")
3753
}
3854

3955
result, err := requestPoeSettingsUpdate(args, poe.Address, poeSettings.Encode())
40-
if result != "SUCCESS" {
41-
return errors.New(result)
42-
}
4356
if err != nil {
4457
return err
4558
}
59+
if result != "SUCCESS" {
60+
return errors.New(result)
61+
}
4662

4763
settings, err = requestPoeConfiguration(args, poe.Address, poeExt)
4864
if err != nil {
@@ -53,3 +69,61 @@ func (poe *PoeCyclePowerCommand) Run(args *GlobalOptions) error {
5369
prettyPrintSettings(args.OutputFormat, changedPorts)
5470
return nil
5571
}
72+
73+
func (poe *PoeCyclePowerCommand) cyclePowerGs316EPx(args *GlobalOptions) error {
74+
for _, switchPort := range poe.Ports {
75+
if switchPort < 1 || switchPort > 15 {
76+
return errors.New(fmt.Sprintf("given port id %d, doesn't fit in range 1..15", switchPort))
77+
}
78+
}
79+
80+
_, token, err := readTokenAndModel2GlobalOptions(args, poe.Address)
81+
if err != nil {
82+
return err
83+
}
84+
urlStr := fmt.Sprintf("http://%s/iss/specific/poePortConf.html", poe.Address)
85+
reqForm := url.Values{}
86+
reqForm.Add("Gambit", token)
87+
reqForm.Add("TYPE", "resetPoe")
88+
reqForm.Add("PoePort", createPortResetPayloadGs316EPx(poe.Ports))
89+
result, err := doHttpRequestAndReadResponse(args, http.MethodPost, poe.Address, urlStr, reqForm.Encode())
90+
if err != nil {
91+
return err
92+
}
93+
if args.Verbose {
94+
println(result)
95+
}
96+
if result != "SUCCESS" {
97+
return errors.New(result)
98+
}
99+
100+
// hint in contrast to GS30x, we print PO status here, as this seems more useful
101+
statuses, err := getPoeStatus(args, poe.Address)
102+
if err != nil {
103+
return err
104+
}
105+
statuses = filter(statuses, func(status PoePortStatus) bool {
106+
return slices.Contains(poe.Ports, int(status.PortIndex))
107+
})
108+
prettyPrintStatus(args.OutputFormat, statuses)
109+
return nil
110+
}
111+
112+
func createPortResetPayloadGs316EPx(poePorts []int) string {
113+
result := strings.Builder{}
114+
const maxPorts = 15 // the port 16 can't be reset
115+
for i := 0; i < maxPorts; i++ {
116+
written := false
117+
for _, p := range poePorts {
118+
if p-1 == i {
119+
result.WriteString("1")
120+
written = true
121+
break
122+
}
123+
}
124+
if !written {
125+
result.WriteString("0")
126+
}
127+
}
128+
return result.String()
129+
}

‎poe_cycle_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package main
2+
3+
import (
4+
"github.com/corbym/gocrest/is"
5+
"github.com/corbym/gocrest/then"
6+
"testing"
7+
)
8+
9+
func TestPoePortReset(t *testing.T) {
10+
s := createPortResetPayloadGs316EPx([]int{3, 5})
11+
then.AssertThat(t, s, is.EqualTo("001010000000000"))
12+
13+
s = createPortResetPayloadGs316EPx([]int{1})
14+
then.AssertThat(t, s, is.EqualTo("100000000000000"))
15+
}

‎poe_status.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,29 @@ type PoeStatusCommand struct {
3333
}
3434

3535
func (poe *PoeStatusCommand) Run(args *GlobalOptions) error {
36-
statusPage, err := requestPoePortStatusPage(args, poe.Address)
36+
statuses, err := getPoeStatus(args, poe.Address)
3737
if err != nil {
3838
return err
3939
}
40+
prettyPrintStatus(args.OutputFormat, statuses)
41+
return nil
42+
43+
}
44+
45+
func getPoeStatus(args *GlobalOptions, address string) ([]PoePortStatus, error) {
46+
var result []PoePortStatus
47+
statusPage, err := requestPoePortStatusPage(args, address)
48+
if err != nil {
49+
return result, err
50+
}
4051
if checkIsLoginRequired(statusPage) {
41-
return errors.New("no content. please, (re-)login first")
52+
return result, errors.New("no content. please, (re-)login first")
4253
}
43-
var statuses []PoePortStatus
44-
statuses, err = findPortStatusInHtml(args.model, strings.NewReader(statusPage))
54+
result, err = findPortStatusInHtml(args.model, strings.NewReader(statusPage))
4555
if err != nil {
46-
return err
56+
return result, err
4757
}
48-
prettyPrintStatus(args.OutputFormat, statuses)
49-
return nil
58+
return result, nil
5059
}
5160

5261
func prettyPrintStatus(format OutputFormat, statuses []PoePortStatus) {

‎poe_status_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ func TestFindPortStatusInHtml(t *testing.T) {
5353
model: "GS316EP",
5454
fileName: "poePortStatus_GetData_true.html",
5555
expectedNumberOfStatuses: 15,
56-
expectedPoePowerClass: "3",
56+
expectedPoePowerClass: "2",
5757
expectedPoePortStatus: "Delivering Power",
58-
expectedVoltageInVolt: 53,
59-
expectedCurrentInMilliAmps: 61,
60-
expectedPowerInWatt: 3.2,
61-
expectedTemperatureInCelsius: 22,
58+
expectedVoltageInVolt: 54,
59+
expectedCurrentInMilliAmps: 22,
60+
expectedPowerInWatt: 1.1,
61+
expectedTemperatureInCelsius: 23,
6262
expectedErrorStatus: "No Error",
6363
expectedPortName: "AGER 31 SUR Tech",
6464
},

0 commit comments

Comments
 (0)