guest_os_booting: add new case for backed nvram source #5164
Conversation
This file contains 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
|
|
Depend on avocado-framework/avocado-vt#3764. |
cliping
approved these changes
Sep 18, 2023
|
|
||
| def run(test, params, env): | ||
| """ | ||
| This case is to verify the ovmf backed nvram. |
There was a problem hiding this comment.
Has extra spaces between 'ovmf' and 'backed'.
Yingshun
reviewed
Sep 18, 2023
| 2) Start and boot the guest. | ||
| 3) Check the dumpxml and the label if necessary. | ||
| """ | ||
| def compare_guest_xml(): |
There was a problem hiding this comment.
I think it's better to pass 'vmxml' and 'os_attrs' as arguments of this function to make them as local variables, I think it's easy for others to understand it.
There was a problem hiding this comment.
Added the arguments to the function compare_guest_xml(vmxml, os_attrs).
meinaLi
force-pushed
the
backed_nvram
branch
from
09a249b
to
5a75618
Compare
Yingshun
reviewed
Oct 31, 2023
| test.fail("Configured os xml value {} doesn't match the" | ||
| " entry {} in guest xml".format(os_attrs[key], current_os_attrs[key])) | ||
| else: | ||
| test.fail("Configured os attributes {} aren't existed in guest.".format(key)) |
| if seclabel_label in label_result: | ||
| test.log.info("Get expected nvram file label: {}".format(label_result)) | ||
| else: | ||
| test.fail("The nvram file label %{} is not expected".format(label_result)) |
| - with_selinux_seclabel: | ||
| seclabel_model = "selinux" | ||
| seclabel_label = "system_u:object_r:nvram_image_t:s0" | ||
| nvram_dict = {'nvram_source': {'seclabels': [{'label': '${seclabel_label}', 'model': '${seclabel_model}', 'relabel': 'yes'}], 'attrs': {'file': '%s'}}} |
There was a problem hiding this comment.
These ones(nvram_attrs and nvram_dict) are a bit similar, how about replacing 'nvram_dict' with 'nvram_source'?
There was a problem hiding this comment.
Yes, a little similar. So changed to nvram_source.
|
Split the manual case to two cases: test the ovmf file backed nvram and test the ovmf nvram seclable. So update the script here. |
This case is to verify the ovmf different backed nvram source. Now it only cover the file type. Signed-off-by: Meina Li <[email protected]>
Yingshun
approved these changes
Nov 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This case is to verify the ovmf different backed nvram source. Now it only cover the file type.