Fix bridge port group creation in test code#8223
Closed
hickeng wants to merge 2 commits intovmware:masterfrom
Closed
Fix bridge port group creation in test code#8223hickeng wants to merge 2 commits intovmware:masterfrom
hickeng wants to merge 2 commits intovmware:masterfrom
Conversation
Member
|
Alternative summary line: "Preserve rc in bridge creation robot keyword" I prefer "Preserve rc" to "Fix" as it makes it slightly easier to tell at a glance what is being fixed. I prefer "robot keyword" to "test code" as it makes it clearer what kind of tests are affected. |
hickeng
force-pushed
the
bridge-fix-robot
branch
from
e12d502 to
7301e7e
Compare
zjs
reviewed
Aug 22, 2018
tests/resources/VCH-Util.robot
Outdated
| ${rc} ${output}= Run Keyword If '%{HOST_TYPE}' == 'VC' Run And Return Rc And Output govc dvs.portgroup.add -vlan=${vlan} -dvs ${dvs} VCH-%{DRONE_BUILD_NUMBER}-${vlan} | ||
| ${rc2} ${output2}= Run Keyword If '%{HOST_TYPE}' == 'VC' Run And Return Rc And Output govc dvs.portgroup.add -vlan=${vlan} -dvs ${dvs} VCH-%{DRONE_BUILD_NUMBER}-${vlan} | ||
|
|
||
| ${rc}= Evaluate ${rc} if '%{HOST_TYPE}' != 'VC' else ${rc2} |
Member
There was a problem hiding this comment.
It looks like this needs more quotes (around ${rc} and ${rc2}).
Creation of the bridge network was switching behaviour based on whether remote system was ESX or vCenter. In the case of ESX we were overwriting the return code with the nil values from vCenter case. This tries an inline python fix to select the correct return code before continuing the test.
The capitalization of the positional parameter name was incorrect and therefore we were getting `name=value` as the string set for the variable instead of `value`.
hickeng
force-pushed
the
bridge-fix-robot
branch
from
7301e7e to
805990c
Compare
Contributor
Author
|
Closing in favour of #8228 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Creation of the bridge network was switching behaviour based on whether
remote system was ESX or vCenter. In the case of ESX we were overwriting
the return code with the nil values from vCenter case.
This tries an inline python fix to select the correct return code before
continuing the test.