-
Notifications
You must be signed in to change notification settings - Fork 816
[DBMigrator] Update db_migrator to support EdgeZoneAggregator Buffer Config for T0s #2747
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
developfast
merged 14 commits into
sonic-net:master
from
developfast:dojha/edge_zone_aggregator_buffer_config_warm_upgrade
Apr 7, 2023
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
b3e1e7d
Added db_migrator functionality to support EdgeZoneAggregator buffer …
developfast 6304a0d
Fixed unit tests and added edge case for non-relevant version upgrades
developfast dfd7349
changed cable logic + added 1 more unit test
developfast 028fc66
changed versioning on master to 5_0_1
developfast c0c1a10
fixed version typo
developfast a4a3c38
Added proper comments for change
developfast 6142572
removed port status change
developfast 40b0bf8
Merge branch 'dojha/edge_zone_aggregator_buffer_config_warm_upgrade' …
developfast 194e591
changed version on unit tests
developfast 92d8a96
Removed extra whitelines
developfast ac8335c
Made minor changes on comments
developfast 0baf7f1
Added versions from other branches and resolved comments
developfast 3ee465d
moved db_migrator change to common migration path
developfast 6f0b2e1
Update sample-t0-edgezoneagg-config-same-cable-output.json
developfast File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
tests/db_migrator_input/config_db/sample-t0-edgezoneagg-config-input.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| { | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA01T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA02T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA03T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA04T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet0": { | ||
| "name": "ARISTA01T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet4": { | ||
| "name": "ARISTA02T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet8": { | ||
| "name": "ARISTA03T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet12": { | ||
| "name": "ARISTA04T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet16": { | ||
| "name": "Servers1", | ||
| "port": "eth0" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet20": { | ||
| "name": "Servers2", | ||
| "port": "eth0" | ||
| }, | ||
| "PORT|Ethernet0": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet1/1", | ||
| "description": "", | ||
| "index": "1", | ||
| "lanes": "77,78", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet4": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet2/1", | ||
| "description": "", | ||
| "index": "2", | ||
| "lanes": "79,80", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet8": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet3/1", | ||
| "description": "", | ||
| "index": "3", | ||
| "lanes": "81,82", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet12": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet4/1", | ||
| "description": "", | ||
| "index": "4", | ||
| "lanes": "83,84", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet16": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet5/1", | ||
| "description": "", | ||
| "index": "5", | ||
| "lanes": "85,86", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet20": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet6/1", | ||
| "description": "", | ||
| "index": "6", | ||
| "lanes": "87,88", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "CABLE_LENGTH|AZURE": { | ||
| "Ethernet0": "300m", | ||
| "Ethernet4": "300m", | ||
| "Ethernet8": "300m", | ||
| "Ethernet12": "300m", | ||
| "Ethernet16": "5m", | ||
| "Ethernet20": "5m" | ||
| }, | ||
| "VERSIONS|DATABASE": { | ||
| "VERSION": "version_4_0_1" | ||
| } | ||
| } |
123 changes: 123 additions & 0 deletions
123
tests/db_migrator_input/config_db/sample-t0-edgezoneagg-config-output.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| { | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA01T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA02T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA03T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR_METADATA|ARISTA04T1": { | ||
| "hwsku": "Arista-VM", | ||
| "mgmt_addr": "10.64.247.200", | ||
| "type": "EdgeZoneAggregator" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet0": { | ||
| "name": "ARISTA01T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet4": { | ||
| "name": "ARISTA02T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet8": { | ||
| "name": "ARISTA03T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet12": { | ||
| "name": "ARISTA04T1", | ||
| "port": "Ethernet1" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet16": { | ||
| "name": "Servers1", | ||
| "port": "eth0" | ||
| }, | ||
| "DEVICE_NEIGHBOR|Ethernet20": { | ||
| "name": "Servers2", | ||
| "port": "eth0" | ||
| }, | ||
| "PORT|Ethernet0": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet1/1", | ||
| "description": "", | ||
| "index": "1", | ||
| "lanes": "77,78", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet4": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet2/1", | ||
| "description": "", | ||
| "index": "2", | ||
| "lanes": "79,80", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet8": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet3/1", | ||
| "description": "", | ||
| "index": "3", | ||
| "lanes": "81,82", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet12": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet4/1", | ||
| "description": "", | ||
| "index": "4", | ||
| "lanes": "83,84", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet16": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet5/1", | ||
| "description": "", | ||
| "index": "5", | ||
| "lanes": "85,86", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "PORT|Ethernet20": { | ||
| "admin_status": "up", | ||
| "alias": "Ethernet6/1", | ||
| "description": "", | ||
| "index": "6", | ||
| "lanes": "87,88", | ||
| "mtu": "9100", | ||
| "pfc_asym": "off", | ||
| "speed": "100000", | ||
| "tpid": "0x8100" | ||
| }, | ||
| "CABLE_LENGTH|AZURE": { | ||
| "Ethernet0": "40m", | ||
| "Ethernet4": "40m", | ||
| "Ethernet8": "40m", | ||
| "Ethernet12": "40m", | ||
| "Ethernet16": "5m", | ||
| "Ethernet20": "5m" | ||
| }, | ||
| "VERSIONS|DATABASE": { | ||
| "VERSION": "version_4_0_1" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.