XiaochaoMa
commented
2 years ago 476e822eab has been Abandoned by ed. And ed used his commit (https://gerrit.openbmc.org/c/openbmc/bmcweb/+/48633) instead of mine.
Open gtmills opened 2 years ago
XiaochaoMa
commented
2 years ago 476e822eab has been Abandoned by ed. And ed used his commit (https://gerrit.openbmc.org/c/openbmc/bmcweb/+/48633) instead of mine.
lxwinspur
commented
2 years ago @gtmills @mzipse We keep following up and updating these issues.
| commit | Author | Title | Status |
|---|---|---|---|
| 9ed673a146 | Albert Zhang | Add the verification of chassisID (#317) | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/55334 |
| 8b22db6d55 | Albert Zhang | Modify fan related bugs (#271) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/504 |
| f48db1fb9d | Albert Zhang | Add PowerLimitWatts in EnvironmentMetrics | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/538 |
| 19f9b214bf | Albert Zhang | Add Redfish EnvironmentMetrics schema in bmcweb | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/43170 |
| 68410d9dc1 | Albert Zhang | Add support for redfish StopBootOnFault | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/539 |
| ef767bdad4 | Albert Zhang | Implement LocationIndicatorActive for Fan | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/504 |
| 4176eb5582 | Albert Zhang | Implements Fan schema | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/504 |
| 476e822eab | Xiaochao Ma | Redfish: Repair the wrong change made by non-admin | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/48633 |
| 7a2736c75c | Xiaochao Ma | Add Redfish ThermalSubsystem schema in bmcweb | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/41012 |
| 2a05b044d0 | George Liu | Add set/getSystemAttentionIndicator (#197) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/541 |
| 7f0d05a6fe | George Liu | Consume availability interface for cores (#254) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/568 |
| d7083a1994 | George Liu | Remove excess traces in the ThermalMetrics Query (#242) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/561 |
| 25b1d8f504 | George Liu | Fix bmcweb::redfish bug (#231) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/504 |
| 6bfe181c13 | George Liu | EnvironmentMetrics: Fix Redfish Validator Error (#218) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/538 |
| d37daa2baf | George Liu | Add Redfish EnvironmentMetrics schema in bmcweb (#191) | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/43170 |
| 3c12114bae | George Liu | Update indicator LED verification | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/560 |
| 619dc0b4bb | George Liu | Update get/setLocationIndicatorActive method | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57765 |
| 299bf78957 | George Liu | led: Add GetSubTree method to get service name | Merged Upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/58580 |
| 15bf1f13bb | George Liu | Implement SubProcessors for processor core | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/568 |
| 914955b23b | George Liu | ibm: Move OCC pass through REST api under /ibm/v1 namespace | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/544 |
| 13a56722f7 | George Liu | Implement LocationIndicatorActive property for CXP connector resource | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/602 |
| f6bd9b8239 | George Liu | led: Add GetObject method to get service name | Merged Upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/60230 |
| 69b90bce91 | George Liu | Implement LocationIndicatorActive for Memory resource | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/571 |
| 30301fc078 | George Liu | Implement LocationIndicatorActive for CPU resource | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/568 |
| 74233970a2 | Chicago Duan | Redfish : Add Firmware Version to Power Supplies (#259) | Merged upstream https://gerrit.openbmc.org/q/topic:%22redfish-power-supply%22 |
| be031b4de1 | Chicago Duan | Not return InternalError when there is no UsbCodeUpdate service (#258) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/547 |
| 6126f07e8b | Chicago Duan | Redfish: Fix issue of set Assemply LocationIndicatorActive (#205) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/566 |
| 0e8bb08fbe | Chicago Duan | Redfish SNMP Trap sync with upstream (#225) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/498 |
| e8b9174fe9 | Chicago Duan | Redfish: Implement LocationIndicatorActive Property for Manager (#219) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/550 |
| 125cd61c40 | Chicago Duan | Redfish: Implements Redfish Assembly Health (#202) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/553 |
| 533918061f | Chicago Duan | Redfish : Add USB code update Enable/Disable (#164) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/547 |
| f9b29bf7e5 | Chicago Duan | Redfish: PCIeSlots support empty JSON object in do PATCH command (#201) | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/543 |
| 78676daec3 | Chicago Duan | Redfish : Look for OperationalStatus for the memory Health | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/555 |
| 55ba573f34 | Chicago Duan | Redfish : Let chassis HealthRollup override Fan, Port, and Assembly | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/556 |
| b56c8006d0 | Chicago Duan | Redfish: Implement HealthRollup in chassis schema | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/556 |
| e47452f70b | Chicago Duan | Redfish: Implement SNMP Trap | Merged upstream https://gerrit.openbmc.org/c/openbmc/bmcweb/+/38599 |
| 244db8f9b6 | Chicago Duan | Redfish: Implement OEM lamp test | Merged in IBM1050 https://github.com/ibm-openbmc/bmcweb/pull/541 |
| 4c8a6db769 | Chicago Duan | Redfish : Implement LocationIndicatorActive for Assembly | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/548 |
| 9f2aa9c1eb | Chicago Duan | Redfish : Implement LocationIndicatorActive for PowerSupplies | Merged upstream https://gerrit.openbmc.org/q/topic:%22redfish-power-supply%22 |
| fdeb885d49 | Chicago Duan | Implements PowerSubsystem and PowerSupply schema | Merged upstream https://gerrit.openbmc.org/q/topic:%22redfish-power-supply%22 |
| 9fff1194c0 | Chicago Duan | Redfish : Implement LocationIndicatorActive for PCIeSlots | Merged in IBM 1050 https://github.com/ibm-openbmc/bmcweb/pull/543 |
gtmills
commented
2 years ago Could you concentrate on the Power/Thermal commits? E.g.
| commit | Author | Title | Status |
|---|---|---|---|
| ef767bdad4 | Albert Zhang | Implement LocationIndicatorActive for Fan | |
| 4176eb5582 | Albert Zhang | Implements Fan schema | |
| 19f9b214bf | Albert Zhang | Add Redfish EnvironmentMetrics schema in bmcweb | |
| 9f2aa9c1eb | Chicago Duan | Redfish : Implement LocationIndicatorActive for PowerSupplies |
mzipse
commented
2 years ago Checking up on the focus we want to put on these 4 commits.... https://gerrit.openbmc.org/c/openbmc/bmcweb/+/42210 - Haven't seen any updates. Still has merge conflicts. https://gerrit.openbmc.org/c/openbmc/bmcweb/+/41086 - Haven't seen any updates. Still has merge conflicts. https://gerrit.openbmc.org/c/openbmc/bmcweb/+/43170 - Haven't seen any updates. Still has merge conflicts. https://gerrit.openbmc.org/c/openbmc/bmcweb/+/42221 - Haven't seen any updates. Still has merge conflicts. @lxwinspur, can you work with your team to make some progress on these?
lxwinspur
commented
2 years ago @mzipse Yes, We are working on these issues and will push these commits next week
mzipse
commented
2 years ago Thank you.
lxwinspur
commented
1 year ago @gtmills @mzipse
https://gerrit.openbmc.org/c/openbmc/bmcweb/+/42210 - review by: https://gerrit.openbmc.org/q/topic:LocationIndicatorActive https://gerrit.openbmc.org/c/openbmc/bmcweb/+/41086 - review by: https://gerrit.openbmc.org/q/topic:redfish-fan https://gerrit.openbmc.org/c/openbmc/bmcweb/+/43170 - review by: https://gerrit.openbmc.org/q/topic:redfish-EnvironmentMetrics https://gerrit.openbmc.org/c/openbmc/bmcweb/+/42221 - review by: https://gerrit.openbmc.org/q/topic:LocationIndicatorActive
gtmills
commented
1 year ago @lxwinspur https://github.com/ibm-openbmc/openbmc/tree/1050.00 is our 1050 branch. It has been rebased with upstream. https://github.com/ibm-openbmc/bmcweb/tree/1050 is the bmcweb 1050 branch. @lxwinspur can you start to create PRs for the ones not merged upstream? Thanks!
lxwinspur
commented
1 year ago @lxwinspur https://github.com/ibm-openbmc/openbmc/tree/1050.00 is our 1050 branch. It has been rebased with upstream. https://github.com/ibm-openbmc/bmcweb/tree/1050 is the bmcweb 1050 branch. @lxwinspur can you start to create PRs for the ones not merged upstream? Thanks!
Sure, I will rebase bmcweb and create PRs, Merry Chrismas :)
gtmills
commented
1 year ago Sure, I will rebase bmcweb and create PRs, Merry Chrismas :)
Thank you!
gtmills
commented
1 year ago @mzipse FYI
lxwinspur
commented
1 year ago @gtmills @mzipse Please review by: https://github.com/ibm-openbmc/bmcweb/pull/498 https://github.com/ibm-openbmc/bmcweb/pull/499
baemyung
commented
1 year ago @ChicagoDuan
While I'm working to incorporate https://github.com/ibm-openbmc/bmcweb/commit/168bbd6dcc4314ee4d3a2cf56d54ce2b23a33438 into 1050, I found this is needed.
9fff1194c0 | Chicago Duan | Redfish : Implement LocationIndicatorActive for PCIeSlots | Merged upstream
https://gerrit.openbmc.org/c/openbmc/bmcweb/+/42216 However, it is not merged yet.
Could you take a look at it?
lxwinspur
commented
1 year ago @baemyung
Yes, you are correct.
Sorry, I mistakenly changed this status to Merged Upstream, I will update it.
Actually, this commit is reviewing now.
baemyung
commented
1 year ago @lxwinspur @ChicagoDuan Besides merging it into upstream, would you pull into https://github.com/ibm-openbmc/bmcweb/tree/1050? I have a commit on top of { 9fff1194c0 Chicago Duan Redfish : Implement LocationIndicatorActive for PCIeSlots} trying to pull in.
gtmills
commented
1 year ago @lxwinspur Can you continue to pull more commits into 1050 this week? I added a In 1050? if you want to copy and fill out, might help track the 1050 work :)
lxwinspur
commented
1 year ago @lxwinspur Can you continue to pull more commits into 1050 this week? I added
a In 1050?if you want to copy and fill out, might help track the 1050 work :)
Yes, I will send more PRs into the 1050 branch this week. eg: EnvironmentMetrics, lamp test and etc.
baemyung
commented
1 year ago @lxwinspur @ChicagoDuan
{ 9fff1194c0 Chicago Duan Redfish : Implement LocationIndicatorActive for PCIeSlots} also blocks to merge another one https://github.com/ibm-openbmc/bmcweb/pull/363 to 1050. If you can make to push 9fff1194c0 into 1050 sooner, it would be great.
Thanks
gtmills
commented
1 year ago @lxwinspur @ChicagoDuan subscriptionType as well. I don't think it was part of https://github.com/ibm-openbmc/bmcweb/pull/498/files
gtmills
commented
1 year ago | 6126f07e8b | Chicago Duan | Redfish: Fix issue of set Assemply LocationIndicatorActive (#205) | done. https://github.com/ibm-openbmc/bmcweb/blob/1030/redfish-core/lib/assembly.hpp#L941 |
|---|
is a 1030 link, is that really already in 1050 ?
gtmills
commented
1 year ago | f9b29bf7e5 | Chicago Duan | Redfish: PCIeSlots support empty JSON object in do PATCH command (#201) | yes, ibm-openbmc/bmcweb#530 |
|---|
is a link to a PR that didn't merge, did this indeed make it in ?
ChicagoDuan
commented
1 year ago 6126f07e8b Chicago Duan Redfish: Fix issue of set Assemply LocationIndicatorActive (#205) done. https://github.com/ibm-openbmc/bmcweb/blob/1030/redfish-core/lib/assembly.hpp#L941 is a 1030 link, is that really already in 1050 ?
It's my mistake. I pushed a new PR：https://github.com/ibm-openbmc/bmcweb/pull/566
ChicagoDuan
commented
1 year ago is a link to a PR that didn't merge, did this indeed make it in ?
Done. Modified link.
lxwinspur
commented
1 year ago @gtmills @mzipse All patches for this issue have been downstream to IBM's 1050 branch.
gtmills
commented
1 year ago @lxwinspur Great work on the 1050. Can https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57669 be rebased on top of https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57668/26 ? 57668 doesn't do a lot, so want 57669 close behind if 57668 goes
lxwinspur
commented
1 year ago @gtmills Sure, I will update these patches
Lakshmi-y
commented
1 year ago @lxwinspur Can you open https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57559
lxwinspur
commented
1 year ago @lxwinspur Can you open https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57559
Done
Lakshmi-y
commented
1 year ago @lxwinspur Can you please open https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57765/
gtmills
commented
1 year ago @lxwinspur Do you mind reopening https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57765/ ? Thanks!
Sure, I will address `merge conflict today
Lakshmi-y
commented
1 year ago @ChicagoDuan Can you reopen https://gerrit.openbmc.org/c/openbmc/bmcweb/+/42221, Thx
gtmills
commented
1 year ago @ChicagoDuan @lxwinspur IBM will rebase again in the future In the future, we will have to do this again with all downstream commits. Can IPS look to get the remaining commits in upstream? Some ones to target: Environment metrics: https://gerrit.openbmc.org/c/openbmc/bmcweb/+/57715/7 / https://gerrit.openbmc.org/q/topic:redfish-EnvironmentMetrics
Cores: https://gerrit.openbmc.org/c/openbmc/bmcweb/+/38570
Thermal metrics: https://gerrit.openbmc.org/c/openbmc/bmcweb/+/41121
Could IPS also help us by doing bmcweb reviews?
lxwinspur
commented
1 year ago @gtmills Sure, we will address all comments and rebase again.
gtmills
commented
9 months ago @lxwinspur Can you update the table at https://github.com/ibm-openbmc/dev/issues/3604#issuecomment-1203359425 ?
lxwinspur
commented
9 months ago @lxwinspur Can you update the table at #3604 (comment) ?
Sure
lxwinspur
commented
9 months ago @lxwinspur Can you update the table at #3604 (comment) ?
Updated
In September, we are going to rebase https://github.com/ibm-openbmc/bmcweb to upstream. Developers will be have to repull their commits if they aren't merged upstream, please try to get as many downstream commits in upstream as possible.
https://gerrit.openbmc.org/q/project:openbmc/bmcweb+status:open+owner:inspur.com+
Or this is from our spreadsheet of downstream commits: