This repository has been archived by the owner on Apr 7, 2022. It is now read-only.
[1LP][RFR] V2V : Update set_conversion_host_api function #9954
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
nachandr
changed the title
nachandr
changed the title
|
@nachandr Please check PRT results, I think you have to trigger run again. |
sshveta
suggested changes
Mar 3, 2020
cfme/fixtures/v2v_fixtures.py
Outdated
| resource_type = ( | ||
| "ManageIQ::Providers::Redhat::InfraManager::Host" | ||
| if appliance.version < '5.11' | ||
| else "ManageIQ::Providers::Openstack::CloudManager::Vm" |
There was a problem hiding this comment.
This looks wrong @nachandr
"ManageIQ::Providers::Openstack::CloudManager::Vm"
Shouldn't it be
"ManageIQ::Providers::Redhat::InfraManager::Vm"
Please test this with UCI and then update the proper command
cfme/fixtures/v2v_fixtures.py
Outdated
| if appliance.version < '5.11' | ||
| else "ManageIQ::Providers::Openstack::CloudManager::Vm" | ||
| ) | ||
| resource_type = "ManageIQ::Providers::Openstack::CloudManager::Vm" |
There was a problem hiding this comment.
resource_type statement twice ??
cfme/fixtures/v2v_fixtures.py
Outdated
| @@ -224,7 +229,10 @@ def get_conversion_data(target_provider): | |||
| ) | |||
| private_key = ssh_client.run_command("cat /etc/pki/ovirt-engine/keys/engine_id_rsa").output | |||
There was a problem hiding this comment.
The key needs to be updated too . It is not the same key anymore .. so you will have to pick key according to appliance version 5.10 and 5.11
sshveta
changed the title
nachandr
force-pushed
the
update_set_conversion_host_api_fixture
branch
2 times, most recently
from
f751b86 to
4789c9e
Compare
nachandr
changed the title
|
Reviewers, |
|
I've addressed all the comments . |
sshveta
reviewed
Mar 5, 2020
cfme/fixtures/v2v_fixtures.py
Outdated
| def get_conversion_data(target_provider): | ||
| if target_provider.one_of(RHEVMProvider): | ||
| def get_conversion_data(appliance, target_provider): | ||
| if target_provider.one_of(RHEVMProvider) and appliance.version < '5.11': |
There was a problem hiding this comment.
@nachandr : One more change , let's do this instead of checking fro RHEVM twice
if target_provider.one_of(RHEVMProvider):
if appliance.version == '5.11':
code ...for 5.11
else:
code for 5.10
There was a problem hiding this comment.
I agree here, this will be a bit more readable.
jawatts
approved these changes
Mar 5, 2020
cfme/fixtures/v2v_fixtures.py
Outdated
| def get_conversion_data(target_provider): | ||
| if target_provider.one_of(RHEVMProvider): | ||
| def get_conversion_data(appliance, target_provider): | ||
| if target_provider.one_of(RHEVMProvider) and appliance.version < '5.11': |
jawatts
changed the title
nachandr
force-pushed
the
update_set_conversion_host_api_fixture
branch
from
3a55930 to
89065dc
Compare
nachandr
changed the title
nachandr
changed the title
nachandr
changed the title
sshveta
approved these changes
Mar 5, 2020
| except KeyError: | ||
| pytest.skip("No conversion host on provider") | ||
|
|
||
| elif appliance.version > '5.10': |
There was a problem hiding this comment.
Optional : since we are testing for only two versions now , you can just do else.
|
I'm investigating the 511 PRT failure , but the failure is not related to the changes addressed through this PR. |
jawatts
approved these changes
Mar 6, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Purpose or Intent
The set_conversion_host_api function needs to be updated since support for UCI hosts for RHV was added in 5.11.4.
PRT Run
{{ pytest: cfme/tests/v2v/test_v2v_smoke.py --use-template-cache --provider-limit 2 --use-provider rhv43 --use-provider vsphere67-ims }}
PRT results:
510 - PASS
511 - Currently failing, but would pass once #9953 is merged