Add and fix several Cisco and H3C devices #1176
Conversation
|
Hi @danner26 , can you take a look and approve/merge? |
|
Looks like there are some issues with the new addition, so that is going to delay merging. If you want to break this out into 2 separate PRs, ping me when you remove the new file and I will merge the fix.. Then you can create a new PR for that new file Or just leave it and lets get the fixes in place, then we can merge it all. Your call Thank you for the fix btw! |
danner26
added
the
status: revisions needed
|
Hello, unfortunately today we had to make a change to the schema in which weight is defined by. The upstream NetBox API requires weight to be passed to it in the following format: Due to this change, I have updated your branch against the current master. This might require you to update your PR, if you had weight currently defined, so that your PR is in-line with the new weight schema. If you have any issues, please let me know or refer to this PR for more information. |
…y/devicetype-library into alextremblay-patch-1
alextremblay
changed the title
|
I am going to convert this to a draft.. When you are done working feel free to mark it ready for review/@ me and I will re-review! Thanks for all you are doing |
|
Interesting, the build failure on CI did not occur when I ran pytest locally... ahhhh, missing yaml document markers. ok, I'll fix |
alextremblay
force-pushed
the
alextremblay-patch-1
branch
from
b2c696f to
73ab644
Compare
|
Hi @danner26 , This PR is now ready for review. Please see my comments regarding scope creep. I hope you see things as I do and agree with my sentiment. as much as I want this PR to be as good and as accurate as it can be, I've already sunk considerable time and effort into this endeavour, far beyond what the original PR / issue called for, and I have no more time or energy to give. I hope you will accept this PR as it is and open separate issues for the fan modules, stakcing modules, and dc-terminal power supplies as mentioned in the comments. If further changes are needed in order for this PR to be merged, I'm afreaid you'll have to find someone else to make them :( |
|
Hey @alextremblay thank you for all of your work thus far. I absolutely agree, and honestly I did not expect all of the changes in this PR. That being said I am happy to review any changes which you make. I also would like to say how much the community and myself appreciate your contribution! That being said, all new files you create will need to be fully up to standard. Any retroactive changes can be made in a future PR, but additions you are currently implementing need to follow todays standards. Please remember a lot of these files were created before certain features were supported or implemented.. If you can wrap up the final changes needed, then we can move forward with merging this PR. |
|
Hey @alextremblay the module-bays should really have If you would like, send me an invite to your forked repo and I can make the changes for you |
Added weight, modular PSUs and modular FANs
Removed network module since according to datasheet and pictures the 3850-48XS-E does not have a swappable module bay
|
Thanks for clarifying and giving me the historical context. I understand where you're coming from here. I've invited you to collaborate on my fork |
|
Hey @alextremblay all looks good to me now, if you'd like, please review the changes I have made and let me know if you approve @DanSheps if you would like to look through as well feel free! Once Alex gives me the go ahead I will merge this |
|
Awesome, that all looks great! Thank you so much for your help on this PR |
danner26
added
status: accepted
and removed
status: revisions needed
* Update WS-C3750G-12S-E.yaml * Update WS-C3750G-12S-S.yaml * add missing cisco switch WS-C3650-48FQM-S * add missing devices from our environment * fixup * model rename for HPE A5120 switches * replaced power-port definitions with module-bay definitions on WS-3650-48FQM models * add/fix weight values arcording to updated schema * add power supply modules for WS-C3650-48FQM devices * add "cisco-" prefix to all cisco device types * fix duplicate entry issues in cisco and huawei devices * fix invalid powerport type in cisco power module * fix type schema validation error in UBR10012 device * re-add YAML document start markers to all cisco device type files * Update ASR-920-12CZ-A.yaml Fix spacing issues * Update ASR-920-12CZ-D.yaml Fixed comment, removed extra newline. * Update ASR-920-12SZ-D.yaml Fixed comment, removed extra newline. * Update ASR-920-4SZ-A.yaml Fixed comment, removed extra newline. * Update ASR-920-24SZ-M.yaml Fixed comment, removed extra newline. * Update SPA112.yaml Fixed comments. Unnecessary newline removed. * Update N540-ACC-SYS.yaml Fixed description. Unnecessary newline removed. * Update WS-C3750X-48P-S.yaml Fixed comments. Unnecessary newline removed. * Update Meraki-MS220-24P.yaml Reverted description newlines * Update PWR-C2-1025WAC.yaml * Update PWR-C2-250WAC.yaml * Update PWR-C2-640WAC.yaml * Update PWR-C2-640WDC.yaml * Update S3100-8TP-PWR-EI.yaml Removed non-manufacturer datasheet comment * Update HP-5120-48G-POE-4SFP-EI.yaml Fixed model/slug * Update HP-5120-24G-POE-4SFP-EI.yaml * Update HP-5120-48G-POE-4SFP-EI.yaml * Update HP-5120-48G-PoEP-EI.yaml * Update HP-5120-24G-PoEP-EI.yaml * Update HP-5120-48G-PoEP-EI.yaml * Update HP-5120-24G-PoEP-EI.yaml * all C3850 models have dual independant PSU bays * add PSU modules for C3850 and C3750X model switches * all C3750X models have dual independant PSU bays * typo fix * C3650-##FQM series are the only fixed PSU models in the C3650 line * All C3650 switches (except minis) have two modular PSU slots * Update WS-C3850-48XS-E.yaml Added weight, modular PSUs and modular FANs * Update WS-C3850-48XS-E.yaml * Update WS-C3850-48XS-E.yaml Removed network module since according to datasheet and pictures the 3850-48XS-E does not have a swappable module bay * Update WS-C3850-48XS-E.yaml * Added position attribute to newly created PSU module-bays * Added redundant power supplies * Moving console, power and module bays up * added weight to new files * Added positions to PSU module bays * rearranged module bays --------- Co-authored-by: Daniel W. Anner <daniel.anner@danstechsupport.com>
As per #1171