Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Store switch mac to configDB switch table if the mac is not configure… #1108

Merged
merged 1 commit into from
Nov 5, 2017
Merged

Store switch mac to configDB switch table if the mac is not configure… #1108

merged 1 commit into from
Nov 5, 2017

Conversation

jipanyang
Copy link
Collaborator

…d yet

Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com

- What I did
Store switch mac to configDB for the use of other modules.

- How I did it

- How to verify it
Run the script, switch_mac is stored in configDB

127.0.0.1:6379[4]> hgetall "SWITCH|SWITCH_ATTR"

  1. "switch_mac"
  2. "00:05:64:30:73:c0"

@jipanyang jipanyang mentioned this pull request Nov 3, 2017
Merged
lguohan
lguohan reviewed Nov 3, 2017
View reviewed changes
files/image_config/interfaces/interfaces-config.sh Outdated
NULL_STRING=$(redis-cli -n 4 hget SWITCH\|SWITCH_ATTR switch_mac_null_string)
CFGDB_SWITCH_MAC=$(redis-cli -n 4 hget SWITCH\|SWITCH_ATTR switch_mac)
if [ "$CFGDB_SWITCH_MAC" == "$NULL_STRING" ]; then
redis-cli -n 4 hset SWITCH\|SWITCH_ATTR switch_mac $SYSTEM_MAC_ADDRESS
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest just to write to SWITCH_MAC using the SYSTEM_MAC. The reason is that if we need to use another mac, we need to also change orchagent to use that mac. I suggest to change that via a separate CR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@jipanyang
Store switch mac to configDB switch table
7a449bb 
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
@lguohan lguohan merged commit 84cbfd5 into sonic-net:master Nov 5, 2017
@stepanblyschak stepanblyschak mentioned this pull request Jan 28, 2020
Merged
lguohan pushed a commit that referenced this pull request Jan 29, 2020
@stepanblyschak
[swss] update swss pointer (#4077)
9cf5730 
4628a5a [vs tests] Refactor fdb_update tests to be consistent with vs test suite (#1185)
9594de0 Enable MIRRORv6 for BFN platform (#1177)
a35afac [portsorch] use ingress/egress disable for LAG member enable/disable (#1166)
faab3e1 remove the obsoleted platforms build links (#1169)
97abec5 [restore_neighbors.py] build arp packet with correct hwsrc and psrc (#1158)
97a22ca [vs tests] Mark VLAN and warm reboot tests as xfail (#1183)
b453797 [Teamdmgrd]Fix "teamd cannot start when port channel was down before warm reboot" issue (#1171)
3732e74 [cfgmgr] clear loopback and vrf in kernel if not warmstart (#1141)
51315c1 [debugcounterorch] Add checks for supported counter types and drop reasons (#1173)
10f091d [vs tests] Disable NAT tests to unblock Jenkins (#1179)
698ca2a [portsorch] Refactor portsorch to use FlexCounterManager to setup port and queue stats (#1170)
ea8b1da Merge pull request #1125 from AkhileshSamineni/natorch_changes_in_sonic
bbd77fc Merge pull request #1126 from AkhileshSamineni/natsyncd_changes_in_sonic
419d9d2 Fix bug: shellquote the inner string (#1168)
d507a93 [aclorch] Validate that provided IN/OUT_PORTS are physical interfaces (#1156)
f24081b [AclOrch] add validation for check CRM (#1082)
85036df Merge pull request #1059 from AkhileshSamineni/nat_changes_in_sonic
1eac91e [portsorch] process PortsOrch tables in specific order (#1108)
80e01c0 Teamd :: fix for cleaning up the teamd processes correctly on teamd docker stop (#1159)
77fa5a4 Move away sairedis logrotate from signal handler (#1153)
5ad47af Merge branch 'master' into natorch_changes_in_sonic
982abd6 Fixed compilation issue after forced push.
286ca21 Fixed compilation issue.
3350b85 Added pytest testcases for NAT.
63ebb3a Added platform changes to avoid nexthop traching in OA.
f9a8302 Addressed review comments.
946e53d Fixed compilation issue.
3d2b900 Addressed review comments and added 'nat miss' traps in copp json.
ff2c78c Added changes to verify the NAT is supported before setting nat zone.
346f59a Addressed review comments.
8246acb Removed debug framework change to avoid compilation error
f59ec87 Fixed compilation issue.
e8b9dab Added aclorch changes for "do_not_nat" action.
88fe411 Orchagent changes in sonic-swss submodule to support NAT feature.
3ca530c Addressed review comments
e4b7724 Addressed Review comments
72750ac Natsyncd changes in sonic-swss submodule to support NAT feature.
2086ad2 Fixed compilation issue after forced push.
3fcfea3 Fix in cleanup.
4028803 Added missed check
ed405bf Addressed review comments
ae6eb80 Compilation fix to pick proper ACL Table name - CFG_ACL_TABLE_TABLE_NAME
d750132 Fix for string compilation issue
904e80b Corrected Makefile.am change.
5b09c41 Removed pytest related files and added those to PR #1125
fd733b8 Removed the Orchagent and Natsyncd related files as those are covered as part of PRs #1125 and #1126
b53c888 Loopback related changes for NAT.
29bb539 Added neighsync changes to support warm reboot for NAT.
4e0d0a1 Changes in sonic-swss submodule to support NAT feature.

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@stepanblyschak @qiluo-msft
[portsorch] process PortsOrch tables in specific order (sonic-net#1108)
1eac91e 
* [portsorch] process PortsOrch tables in specific order
* [portsorch] fix other tables not drained and make tableOrder constexpr
* [portsorch_ut] fix test according to fix in portsorch
Don't care if PORT_TABLE was not processed fully,
we care about LAG, LAG_TABLE, VLAN and VLAN_TABLE.
* [tests] fix ut after unsuccessful conflict resolution
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request Jan 14, 2021
@stepanblyschak @abdosi
[portsorch] process PortsOrch tables in specific order (sonic-net#1108)
770e617 
* [portsorch] process PortsOrch tables in specific order
* [portsorch] fix other tables not drained and make tableOrder constexpr
* [portsorch_ut] fix test according to fix in portsorch
Don't care if PORT_TABLE was not processed fully,
we care about LAG, LAG_TABLE, VLAN and VLAN_TABLE.
* [tests] fix ut after unsuccessful conflict resolution
@yxieca yxieca mentioned this pull request Aug 21, 2022
Merged
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Aug 22, 2022
@yxieca
[202205][swss][sairedis] advance submodule head
2097640 
swss:
* 7db9ddb 2022-08-20 | Handle dual ToR neighbor miss scenario (sonic-net#2151) (HEAD -> 202205, github/202205) [Lawrence Lee]

sairedis:
* 87d5a3e 2022-08-20 | [202205][SAI] advance SAI version to 1.10 to pick up saithrift and build changes (sonic-net#1108) (HEAD -> 202205, github/202205) [Ying Xie]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca added a commit that referenced this pull request Aug 22, 2022
@yxieca
[202205][swss][sairedis] advance submodule head (#11800)
9d00c56 
swss:
* 7db9ddb 2022-08-20 | Handle dual ToR neighbor miss scenario (#2151) (HEAD -> 202205, github/202205) [Lawrence Lee]

sairedis:
* 87d5a3e 2022-08-20 | [202205][SAI] advance SAI version to 1.10 to pick up saithrift and build changes (#1108) (HEAD -> 202205, github/202205) [Ying Xie]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jipanyang @lguohan