Skip to content

Commit

Permalink
Merge pull request #71 from nitram509/issue-70-Support-POE-reset-for-…
Browse files Browse the repository at this point in the history
…GS316xx

support poe reset for gs316xx, fix issue #70
  • Loading branch information
nitram509 authored Dec 23, 2024
2 parents b1fa8b8 + d0d667c commit e3a6f92
Show file tree
Hide file tree
Showing 14 changed files with 792 additions and 1,105 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: "setup go"
uses: actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.23'
- name: Get the version
id: get_version
run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: "setup go"
uses: actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.23'
- name: "go mod download"
run: "go mod download"
- name: "go test ./..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: "setup go"
uses: actions/setup-go@v3
with:
go-version: '1.20'
go-version: '1.23'
- name: "build binary and print --help"
run: |
go build -o ntgrrc .
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@

# ntgrrc (Netgear Remote Control) CHANGELOG

## v0.11.0

* Add support poe reset (cycle power) for gs316xx (#70); many thanks to @electron1963 for testing and supporting this feature
* Switch to Go v1.23

----

## v0.10.1

* added outputs to standard output by @oalfreda in #64
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ A green tick means it was successfully tested.
| V1.0.1.1 | (likely) || (likely) | - |
| V1.0.3.4 | - | - | - | experimental |
| V1.0.3.7 | - | - | - | experimental |
| V1.0.4.4 | - | - | - | experimental |

Legend: \
✅ = successfully tested \
? = unknown \
experimental = The support for GS316xxx models is limited to showing the port status.
experimental = The support for GS316xxx models is limited to: show port status, power cycle a port, show port settings

## download & installation

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

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

```markdown
| Port ID | Port Power | Mode | Priority | Limit Type | Limit (W) | Type |
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module ntgrrc

go 1.20
go 1.23

require (
github.com/PuerkitoBio/goquery v1.9.2
github.com/PuerkitoBio/goquery v1.10.0
github.com/alecthomas/kong v1.6.0
github.com/corbym/gocrest v1.1.2
golang.org/x/term v0.27.0
)

require (
github.com/andybalholm/cascadia v1.3.2 // indirect
golang.org/x/net v0.24.0 // indirect
github.com/andybalholm/cascadia v1.3.3 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
)
49 changes: 40 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,51 +1,82 @@
github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4yPeE=
github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
github.com/PuerkitoBio/goquery v1.10.0 h1:6fiXdLuUvYs2OJSvNRqlNPoBm6YABE226xrbavY5Wv4=
github.com/PuerkitoBio/goquery v1.10.0/go.mod h1:TjZZl68Q3eGHNBA8CWaxAN7rOU1EbDz3CWuolcO5Yu4=
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
github.com/alecthomas/kong v1.6.0 h1:mwOzbdMR7uv2vul9J0FU3GYxE7ls/iX1ieMg5WIM6gE=
github.com/alecthomas/kong v1.6.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
github.com/corbym/gocrest v1.1.2 h1:HwMyOILE0E/BqC1vs/JjanEj+HXeYPGZzbppIgd1/Os=
github.com/corbym/gocrest v1.1.2/go.mod h1:vhNebfdBGx5l0Nh0OM/CvIVqGAnR9AAbI5qA9OxRUOU=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6 changes: 5 additions & 1 deletion http.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func doHttpRequestAndReadResponse(args *GlobalOptions, httpMethod string, host s
}

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

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

if isModel30x(model) {
req.Header.Set("Cookie", "SID="+token)
} else if isModel316(model) {
req.Header.Set("Cookie", "gambitCookie="+token)
} else {
panic("model not supported")
}

client := &http.Client{}
Expand Down
88 changes: 81 additions & 7 deletions poe_cycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ package main
import (
"errors"
"fmt"
"net/http"
"net/url"
"slices"
"strings"
)

type PoeCyclePowerCommand struct {
Expand All @@ -12,11 +15,24 @@ type PoeCyclePowerCommand struct {
}

func (poe *PoeCyclePowerCommand) Run(args *GlobalOptions) error {
err := ensureModelIs30x(args, poe.Address)
if err != nil {
return err
model := args.model
if len(model) == 0 {
var err error
model, err = detectNetgearModel(args, poe.Address)
if err != nil {
return err
}
}
if isModel30x(model) {
return poe.cyclePowerGs30xEPx(args)
}
if isModel316(model) {
return poe.cyclePowerGs316EPx(args)
}
panic("model not supported")
}

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

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

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

result, err := requestPoeSettingsUpdate(args, poe.Address, poeSettings.Encode())
if result != "SUCCESS" {
return errors.New(result)
}
if err != nil {
return err
}
if result != "SUCCESS" {
return errors.New(result)
}

settings, err = requestPoeConfiguration(args, poe.Address, poeExt)
if err != nil {
Expand All @@ -53,3 +69,61 @@ func (poe *PoeCyclePowerCommand) Run(args *GlobalOptions) error {
prettyPrintSettings(args.OutputFormat, changedPorts)
return nil
}

func (poe *PoeCyclePowerCommand) cyclePowerGs316EPx(args *GlobalOptions) error {
for _, switchPort := range poe.Ports {
if switchPort < 1 || switchPort > 15 {
return errors.New(fmt.Sprintf("given port id %d, doesn't fit in range 1..15", switchPort))
}
}

_, token, err := readTokenAndModel2GlobalOptions(args, poe.Address)
if err != nil {
return err
}
urlStr := fmt.Sprintf("http://%s/iss/specific/poePortConf.html", poe.Address)
reqForm := url.Values{}
reqForm.Add("Gambit", token)
reqForm.Add("TYPE", "resetPoe")
reqForm.Add("PoePort", createPortResetPayloadGs316EPx(poe.Ports))
result, err := doHttpRequestAndReadResponse(args, http.MethodPost, poe.Address, urlStr, reqForm.Encode())
if err != nil {
return err
}
if args.Verbose {
println(result)
}
if result != "SUCCESS" {
return errors.New(result)
}

// hint in contrast to GS30x, we print PO status here, as this seems more useful
statuses, err := getPoeStatus(args, poe.Address)
if err != nil {
return err
}
statuses = filter(statuses, func(status PoePortStatus) bool {
return slices.Contains(poe.Ports, int(status.PortIndex))
})
prettyPrintStatus(args.OutputFormat, statuses)
return nil
}

func createPortResetPayloadGs316EPx(poePorts []int) string {
result := strings.Builder{}
const maxPorts = 15 // the port 16 can't be reset
for i := 0; i < maxPorts; i++ {
written := false
for _, p := range poePorts {
if p-1 == i {
result.WriteString("1")
written = true
break
}
}
if !written {
result.WriteString("0")
}
}
return result.String()
}
15 changes: 15 additions & 0 deletions poe_cycle_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package main

import (
"github.com/corbym/gocrest/is"
"github.com/corbym/gocrest/then"
"testing"
)

func TestPoePortReset(t *testing.T) {
s := createPortResetPayloadGs316EPx([]int{3, 5})
then.AssertThat(t, s, is.EqualTo("001010000000000"))

s = createPortResetPayloadGs316EPx([]int{1})
then.AssertThat(t, s, is.EqualTo("100000000000000"))
}
23 changes: 16 additions & 7 deletions poe_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,29 @@ type PoeStatusCommand struct {
}

func (poe *PoeStatusCommand) Run(args *GlobalOptions) error {
statusPage, err := requestPoePortStatusPage(args, poe.Address)
statuses, err := getPoeStatus(args, poe.Address)
if err != nil {
return err
}
prettyPrintStatus(args.OutputFormat, statuses)
return nil

}

func getPoeStatus(args *GlobalOptions, address string) ([]PoePortStatus, error) {
var result []PoePortStatus
statusPage, err := requestPoePortStatusPage(args, address)
if err != nil {
return result, err
}
if checkIsLoginRequired(statusPage) {
return errors.New("no content. please, (re-)login first")
return result, errors.New("no content. please, (re-)login first")
}
var statuses []PoePortStatus
statuses, err = findPortStatusInHtml(args.model, strings.NewReader(statusPage))
result, err = findPortStatusInHtml(args.model, strings.NewReader(statusPage))
if err != nil {
return err
return result, err
}
prettyPrintStatus(args.OutputFormat, statuses)
return nil
return result, nil
}

func prettyPrintStatus(format OutputFormat, statuses []PoePortStatus) {
Expand Down
10 changes: 5 additions & 5 deletions poe_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ func TestFindPortStatusInHtml(t *testing.T) {
model: "GS316EP",
fileName: "poePortStatus_GetData_true.html",
expectedNumberOfStatuses: 15,
expectedPoePowerClass: "3",
expectedPoePowerClass: "2",
expectedPoePortStatus: "Delivering Power",
expectedVoltageInVolt: 53,
expectedCurrentInMilliAmps: 61,
expectedPowerInWatt: 3.2,
expectedTemperatureInCelsius: 22,
expectedVoltageInVolt: 54,
expectedCurrentInMilliAmps: 22,
expectedPowerInWatt: 1.1,
expectedTemperatureInCelsius: 23,
expectedErrorStatus: "No Error",
expectedPortName: "AGER 31 SUR Tech",
},
Expand Down
Loading

0 comments on commit e3a6f92

Please sign in to comment.