RPDiep opened a new pull request #3648: Security Group: limit returns in get_bridge_physdev to 1 URL: https://github.com/apache/cloudstack/pull/3648 ## Description <!--- Describe your changes in detail --> We've encountered a corner case where `bridge -o link show` returned two lines per bridge instead of one. `get_bridge_physdev` in `security_group.py` returned `bond0.701\nbond0.701`. Although this may very well be something on the hypervisor, we should limit the lines returned. I therefore added a mere `| head -1` to the function. See output: Old: ``` root@n02:~# bridge -o link show | awk '/master cloudbr0 / && !/^[0-9]+: vnet/ {print $2}' bond0.701 bond0.701 ``` New: ``` root@n02:~# bridge -o link show | awk '/master cloudbr0 / && !/^[0-9]+: vnet/ {print $2}' | head -1 bond0.701 ``` <!-- For new features, provide link to FS, dev ML discussion etc. --> <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. --> <!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged --> <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" --> <!-- Fixes: # --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [x] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## Screenshots (if appropriate): ## How Has This Been Tested? <!-- Please describe in detail how you tested your changes. --> <!-- Include details of your testing environment, and the tests you ran to --> <!-- see how your change affects other areas of the code, etc. --> Tested function from idle: ``` root@n02:/usr/share/cloudstack-common/scripts/vm/network# python Python 2.7.12 (default, Oct 8 2019, 14:14:10) [GCC 5.4.0 20160609] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> from security_group import get_bridge_physdev >>> get_bridge_physdev('cloudbr0') 'bond0.701' ``` <!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document --> Please let me know if you want me to rebase against 4.13 .
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
