Skip to content

Fix generate_l2_config: don't override hostname or device role (ToRRouter)#5510

Merged
qiluo-msft merged 4 commits intosonic-net:masterfrom
qiluo-msft:qiluo/fixl2
Oct 2, 2020
Merged

Fix generate_l2_config: don't override hostname or device role (ToRRouter)#5510
qiluo-msft merged 4 commits intosonic-net:masterfrom
qiluo-msft:qiluo/fixl2

Conversation

@qiluo-msft
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft commented Sep 30, 2020

sonic-cfggen may not read from Redis, so override hostname will impact existing ConfigDB. Fix test_l2switch_template test case to test preset l2 feature.

- Why I did it

- How I did it

- How to verify it
Test in L2 Switch mode (https://github.com/Azure/SONiC/wiki/L2-Switch-mode)

- Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911 - will submit another PR since cherry-pick is not clean
  • 202006

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@qiluo-msft qiluo-msft changed the title Fix generate_l2_config: don't override hostname because sonic-cfggen … Fix generate_l2_config: don't override hostname or device role (ToRRouter) Sep 30, 2020
@lguohan
Copy link
Copy Markdown
Collaborator

lguohan commented Oct 1, 2020

retest mellanox please

@qiluo-msft qiluo-msft merged commit 30f5557 into sonic-net:master Oct 2, 2020
@qiluo-msft qiluo-msft deleted the qiluo/fixl2 branch October 2, 2020 06:24
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
…uter) (sonic-net#5510)

* Fix generate_l2_config: don't override hostname because sonic-cfggen may not read from Redis. Fix test_l2switch_template test case to test preset l2 feature.
* Improve test script: compare json files with sort_keys
* Revert changes on sample_output
* Remove members field in VLAN section. Fix test assertTrue statement.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants