Switch poe updates

[jhughesoti]

No description provided.

[grafnu]

Can you please squash and force-push your commit history? Having so many commits in the PR makes it hard to review (because the web-pages lists them all out).

[jhughesoti]

What's the proper way to avoid this and fix the history currently? Those are all coming from just branching and updating from upstream as per previous discussions of the git work flow.

The history is less important in my opinion however than the file differences that can be reviewed, which is only 3 files and it's very minimal.

[grafnu]

The root problem is that "git merge" (or pull, which does a merge) preserves a lot of history and context which over time causes cruft buildup. So, you either need to periodically create a new branch from master, rebase (alternate to merge), or reset. The easiest is reset -- I just did it for one of my branches -- see below. None of these commands change any files on disk (except maybe for the initial git merge from master), they just play with the git history. peringknife@peringknife-glaptop3:~/daq$ *git merge master* Already up to date. peringknife@peringknife-glaptop3:~/daq$ *git reset master* Unstaged changes after reset: M bin/setup_dev ... M testing/test_aux.sh peringknife@peringknife-glaptop3:~/daq$ *git add .* peringknife@peringknife-glaptop3:~/daq$ *git commit -m "Provisioning tweaks"* [provisioner a05906f] Provisioning tweaks 14 files changed, 96 insertions(+), 15 deletions(-) peringknife@peringknife-glaptop3:~/daq$ *git push* To github.com:grafnu/daq.git ! [rejected] provisioner -> provisioner (non-fast-forward) error: failed to push some refs to 'github.com:grafnu/daq.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. peringknife@peringknife-glaptop3:~/daq$ *git push --force* Enumerating objects: 59, done. Counting objects: 100% (59/59), done. Delta compression using up to 8 threads Compressing objects: 100% (29/29), done. Writing objects: 100% (30/30), 3.93 KiB | 447.00 KiB/s, done. Total 30 (delta 26), reused 0 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (26/26), completed with 26 local objects. To github.com:grafnu/daq.git + 1167935...a05906f provisioner -> provisioner (forced update)

…

On Fri, Aug 28, 2020 at 7:59 AM jhughesbiot ***@***.***> wrote: What's the proper way to avoid this and fix the history currently? Those are all coming from just branching and updating from upstream as per previous discussions of the git work flow. The history is less important in my opinion however than the file differences that can be reviewed, which is only 3 files and it's very minimal. — You are receiving this because your review was requested. Reply to this email directly, view it on GitHub <#605 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAIEPD3ZVWB6EMTUBJUFUADSC7A3ZANCNFSM4QGNURYQ> .

[jhughesoti]

Attempted with no effect to commit history.

[codecov]

Codecov Report

Merging #605 into master will decrease coverage by 0.59%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #605      +/-   ##
==========================================
- Coverage   80.96%   80.37%   -0.60%     
==========================================
  Files          22       22              
  Lines        3720     3720              
==========================================
- Hits         3012     2990      -22     
- Misses        708      730      +22     

Flag	Coverage Δ
#aux	74.22% <ø> (-0.14%)	⬇️
#base	75.77% <ø> (-0.14%)	⬇️
#dhcp	72.31% <ø> (-0.06%)	⬇️
#many	72.52% <ø> (-0.49%)	⬇️
#topo	72.50% <ø> (-0.14%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
daq/gateway.py	90.57% <0.00%> (-3.67%)	⬇️
daq/runner.py	87.93% <0.00%> (-1.89%)	⬇️
daq/stream_monitor.py	90.00% <0.00%> (-0.84%)	⬇️
daq/topology.py	96.53% <0.00%> (-0.21%)	⬇️
daq/host.py	90.79% <0.00%> (-0.16%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b452810...0509e12. Read the comment docs.

[grafnu]

Please capture the exact sequence of commands and output that you're doing. Also might throw in a "git log -n 1" occasionally to see what the HEAD is at each point.

…

On Fri, Aug 28, 2020 at 8:59 AM jhughesbiot ***@***.***> wrote: Attempted with no effect to commit history. — You are receiving this because your review was requested. Reply to this email directly, view it on GitHub <#605 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAIEPD7XJOYILC2XVOZ65LDSC7H7DANCNFSM4QGNURYQ> .

[jhughesoti]

git merge master
Already up to date.

 git log -n 1
commit 78512bd5a32f9c4df9714ad258f48ee825e95fb0 (HEAD -> switch-poe-updates, origin/switch-poe-updates)
Merge: ddb0ad4 b4ad528
Author: jhughesbiot <jonathan.hughes@buildingsiot.com>
Date:   Fri Aug 28 08:57:30 2020 -0700

    Merge branch 'switch-poe-updates' of https://github.com/jhughesbiot/daq into switch-poe-updates

git reset master
Unstaged changes after reset:
M       docs/device_report.md
M       subset/switches/src/main/java/switchtest/SwitchTest.java
M       subset/switches/test_switch

git log -n 1
commit b196439b26892edfe85e21746c8f3b82a77125e4 (HEAD -> switch-poe-updates, origin/master, origin/HEAD, master)
Merge: 53acd58 861eccd
Author: jhughesbiot <jonathan.hughes@buildingsiot.com>
Date:   Fri Aug 28 08:54:01 2020 -0700

    Merge branch 'master' of https://github.com/jhughesbiot/daq

git add .
git log -n 1
commit b196439b26892edfe85e21746c8f3b82a77125e4 (HEAD -> switch-poe-updates, origin/master, origin/HEAD, master)
Merge: 53acd58 861eccd
Author: jhughesbiot <jonathan.hughes@buildingsiot.com>
Date:   Fri Aug 28 08:54:01 2020 -0700

    Merge branch 'master' of https://github.com/jhughesbiot/daq

git commit -m 'history cleanup attempt'
[switch-poe-updates 3b7f2d4] history cleanup attempt
 3 files changed, 1 insertion(+), 50 deletions(-)

git log -n 1
commit 3b7f2d47958cf820dffd7070aad996c73b18cd4c (HEAD -> switch-poe-updates)
Author: jhughesbiot <jonathan.hughes@buildingsiot.com>
Date:   Fri Aug 28 09:30:39 2020 -0700

    history cleanup attempt

git push
To https://github.com/jhughesbiot/daq
 ! [rejected]        switch-poe-updates -> switch-poe-updates (non-fast-forward)
error: failed to push some refs to 'https://github.com/jhughesbiot/daq'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

git push --force
Username for 'https://github.com': jhughesbiot
Password for 'https://jhughesbiot@github.com':
Enumerating objects: 23, done.
Counting objects: 100% (23/23), done.
Delta compression using up to 8 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (12/12), 876 bytes | 125.00 KiB/s, done.
Total 12 (delta 7), reused 0 (delta 0)
remote: Resolving deltas: 100% (7/7), completed with 7 local objects.
To https://github.com/jhughesbiot/daq
 + 78512bd...3b7f2d4 switch-poe-updates -> switch-poe-updates (forced update)

[grafnu]

Your origin/master and master are out of sync with upstream master. I'm not sure what your origin is pointing at but that will cause confusion. I generally keep my master branch completely in sync with upstream master, so no local changes. Note your master commit is a "merge commit" and is the same as your feature branch. The sequence to reset your master to follow upstream faucet is something like: peringknife@peringknife-glaptop3:~/daq$ *git remote -v | fgrep faucet* faucet git@github.com:faucetsdn/daq.git (fetch) faucet git@github.com:faucetsdn/daq.git (push) peringknife@peringknife-glaptop3:~/daq$ *git checkout master* Already on 'master' Your branch is up to date with 'origin/master'. peringknife@peringknife-glaptop3:~/daq$ *git fetch faucet* peringknife@peringknife-glaptop3:~/daq$ *git reset --hard faucet/master * HEAD is now at 55c879f Update dependency gradle to v6.6.1 (#617) and then you should end up with something like: ~/daq$ *git log -n 1* commit 55c879f (HEAD -> master, origin/release_testing, origin/master, origin/HEAD, faucet/release_testing, faucet/master, release_testing) Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Aug 25 16:24:44 2020 -0700 Update dependency gradle to v6.6.1 (#617)

…

On Fri, Aug 28, 2020 at 9:37 AM jhughesbiot ***@***.***> wrote: git merge master Already up to date. git log -n 1 commit 78512bd (HEAD -> switch-poe-updates, origin/switch-poe-updates) Merge: ddb0ad4 b4ad528 Author: jhughesbiot ***@***.***> Date: Fri Aug 28 08:57:30 2020 -0700 Merge branch 'switch-poe-updates' of https://github.com/jhughesbiot/daq into switch-poe-updates git reset master Unstaged changes after reset: M docs/device_report.md M subset/switches/src/main/java/switchtest/SwitchTest.java M subset/switches/test_switch git log -n 1 commit b196439 (HEAD -> switch-poe-updates, origin/master, origin/HEAD, master) Merge: 53acd58 861eccd Author: jhughesbiot ***@***.***> Date: Fri Aug 28 08:54:01 2020 -0700 Merge branch 'master' of https://github.com/jhughesbiot/daq git add . git log -n 1 commit b196439 (HEAD -> switch-poe-updates, origin/master, origin/HEAD, master) Merge: 53acd58 861eccd Author: jhughesbiot ***@***.***> Date: Fri Aug 28 08:54:01 2020 -0700 Merge branch 'master' of https://github.com/jhughesbiot/daq git commit -m 'history cleanup attempt' [switch-poe-updates 3b7f2d4] history cleanup attempt 3 files changed, 1 insertion(+), 50 deletions(-) git log -n 1 commit 3b7f2d4 (HEAD -> switch-poe-updates) Author: jhughesbiot ***@***.***> Date: Fri Aug 28 09:30:39 2020 -0700 history cleanup attempt git push To https://github.com/jhughesbiot/daq ! [rejected] switch-poe-updates -> switch-poe-updates (non-fast-forward) error: failed to push some refs to 'https://github.com/jhughesbiot/daq' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. git push --force Username for 'https://github.com': jhughesbiot Password for ***@***.***': Enumerating objects: 23, done. Counting objects: 100% (23/23), done. Delta compression using up to 8 threads Compressing objects: 100% (9/9), done. Writing objects: 100% (12/12), 876 bytes | 125.00 KiB/s, done. Total 12 (delta 7), reused 0 (delta 0) remote: Resolving deltas: 100% (7/7), completed with 7 local objects. To https://github.com/jhughesbiot/daq + 78512bd...3b7f2d4 switch-poe-updates -> switch-poe-updates (forced update) — You are receiving this because your review was requested. Reply to this email directly, view it on GitHub <#605 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAIEPD6EXLT3Q2L4II5MYATSC7MNVANCNFSM4QGNURYQ> .

[jhughesoti]

It was already in sync but looks like resetting the master before merging was the key. Cleaned up now

[grafnu]

Thanks for working through the git issue. It's one of those things that just slowly builds up over time so good to be able to clear out the slate from time to time!

[noursaidi]

The test name should be poe.switch.power

[noursaidi]

@jhughesbiot, I've reviewed and have the following comments:

1. Test name should consistently be poe.switch.power
2. The poe test result is not being copied into the test report - the cause of this is seems to be the module_manifest still having the older tests. Once removed it should work.
3. The readme should be updated to remove reference to the older tests
4. The results for all tests including the POE power test says 'see log above', but there isn't any additional information.

[jhughesoti]

@noursaidi
I have made the necessary adjustments to the files that should generate expected results. Due to the issue I reported a few days ago (#620) the switch module is in a state that can't be tested or verified at this point. Seems something in the usi module has been broken but I do not know what.

[jhughesoti]

@noursaidi @pisuke
Issue previously referenced has been resolved and merged. Looks like all tests are passing with the updates so unless there's something else we need to update, this one should be good to go.

[pisuke]

@jhughesbiot @spectre-storm @noursaidi @henry54809 @pbatta I've just checked the module with a range of configurations and devices and there are a few things to be fixed before the test code can be merged.

1. This PoE device report correctly states that the device is powered, but it misses to indicate the power in the summary. @jhughesbiot can you please add the power in the summary?
2. The same report shows that the output text in the switch section does not include any output. @jhughesbiot can you please add the full test output in the switch section?
3. This non PoE device report correctly shows a skip because the device is configured as non-PoE, but the overall test summary is reported as a fail because the skip seems to be counted negatively. @henry54809 @pbatta I think that the logic in the creation of the table should omit the skips and only fail when there are true failures.
4. @jhughesbiot there is a little typo poE that should become PoE. Can you please fix it?

After fixing 1, 2 and 4 we can merge the PR. Point 3 should be addressed in a separate PR.

[jhughesoti]

@pisuke
1 and 2
See discussion here #620 (comment) around why there are no logs in the switch test module. This was broken before any addition of the PoE updates and needs to be it's own separate PR to reintroduce this feature back to the report as this is a break when the usi was introduced, not PoE changes.

4. updated

[pisuke]

Thanks @jhughesbiot, I'll get this merged then.
@henry54809 @spectre-storm issue #620 needs to be addressed as a priority, can you raise a bug for this please? I've moved the issue on the project kanban for our tracking on github. Thanks!