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.

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

[build]: combine feature and container feature table #5081

Merged
merged 5 commits into from
Aug 5, 2020

Conversation

lguohan
Copy link
Collaborator

@lguohan lguohan commented Jul 31, 2020

- Why I did it

  1. have both feature and container feature table is confusing.
  2. a feature should only be available in config db if the feature is built into the image

- How I did it

  1. remove container feature table
  2. do not generate feature entry if the feature is not included
    in the image
  3. rename ENABLE_* to INCLUDE_* for better clarity

This requires sonic-net/sonic-utilities#1015

- How to verify it

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

  • 201811
  • 201911
  • 202006

- Description for the changelog

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

@lguohan lguohan requested a review from jleveque July 31, 2020 09:27
files/build_templates/init_cfg.json.j2 Outdated Show resolved Hide resolved
jleveque
jleveque previously approved these changes Jul 31, 2020
jleveque
jleveque previously approved these changes Aug 1, 2020
@lguohan
Copy link
Collaborator Author

lguohan commented Aug 3, 2020

need to merge the sonic utilities submodule to make the vsimage test happy.

@lguohan
Copy link
Collaborator Author

lguohan commented Aug 4, 2020

retest vsimage please

1. remove container feature table
2. do not generate feature entry if the feature is not included
   in the image
3. rename ENABLE_* to INCLUDE_* for better clarity
Signed-off-by: Guohan Lu <lguohan@gmail.com>
Signed-off-by: Guohan Lu <lguohan@gmail.com>
Signed-off-by: Guohan Lu <lguohan@gmail.com>
* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (sonic-net#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (sonic-net#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (sonic-net#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (sonic-net#1022) [lguohan]
* c0c3cce 2020-07-30 | [config/config_mgmt.py]: Fix typo and enable test for tablesWithOutYang() (sonic-net#1012) [Praveen Chaudhary]
* c6c5be1 2020-07-30 | [show] Fix for 'trunk' PortChannel reported as 'routed' port (sonic-net#1002) [shlomibitton]
* ef9ac2a 2020-07-29 | importing json needed for DPB CLI (sonic-net#1010) [Sangita Maity]
* aa1b072 2020-07-23 | [config] Add Initial draft of Breakout Mode subcommand (sonic-net#766) [Sangita Maity]
@lguohan
Copy link
Collaborator Author

lguohan commented Aug 5, 2020

@jleveque, can you approve? the image is also built and tested.

@lguohan lguohan merged commit 082c26a into sonic-net:master Aug 5, 2020
@lguohan lguohan deleted the feature branch August 6, 2020 10:06
abdosi pushed a commit that referenced this pull request Aug 9, 2020
1. remove container feature table
2. do not generate feature entry if the feature is not included
   in the image
3. rename ENABLE_* to INCLUDE_* for better clarity
4. rename feature status to feature state
5. [submodule]: update sonic-utilities

* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (#1022) [lguohan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
1. remove container feature table
2. do not generate feature entry if the feature is not included
   in the image
3. rename ENABLE_* to INCLUDE_* for better clarity
4. rename feature status to feature state
5. [submodule]: update sonic-utilities

* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (sonic-net#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (sonic-net#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (sonic-net#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (sonic-net#1022) [lguohan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants