Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

[1LP][WIPTEST] Fix test_cloud_init_provisioning for openstack-13 #9849

Merged
merged 1 commit into from
Jan 29, 2020
Merged

[1LP][WIPTEST] Fix test_cloud_init_provisioning for openstack-13 #9849

merged 1 commit into from
Jan 29, 2020

Conversation

jarovo
Copy link
Contributor

@jarovo jarovo commented Jan 16, 2020

The image with cloud-init needs a bigger flavor than the one which was
getting selected so this patch adds using a ci-flavor-name to specifying
which flavor to use.

This needs yamls PR 885

@dajoRH dajoRH added the lint-ok label Jan 16, 2020
@jarovo jarovo changed the title Fix test_cloud_init_provisioning for openstack-13 [RFR] Fix test_cloud_init_provisioning for openstack-13 Jan 16, 2020
Copy link
Contributor

@john-dupuy john-dupuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for this PR @JaryN

@@ -95,6 +96,8 @@ def test_provision_cloud_init(appliance, request, setup_provider, provider, prov
floating_ip = mgmt_system.get_first_floating_ip(pool=ip_pool)
provider.refresh_provider_relationships()
inst_args['environment'] = {'public_ip_address': floating_ip}
inst_arg_props = inst_args.setdefault('properties', {})
inst_arg_props['instance_type'] = partial_match(provisioning['ci-flavor-name'])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is partial_match necessary here? Just curious.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is. Other provisioning code uses this partial_match. I tried without and it didn't work. I didn't study the problem well, but I think on the prov page, the option includes the flavor details (the VM memory, cpus and stuff), not just the name of the flavor.

@john-dupuy john-dupuy changed the title [RFR] Fix test_cloud_init_provisioning for openstack-13 [1LP][RFR] Fix test_cloud_init_provisioning for openstack-13 Jan 16, 2020
Copy link
Member

@mshriver mshriver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Failing Travis, please address

  2. The yaml structure already contains the desired flavor name under provisioning.instance_type2 - why not use that key here?

@mshriver mshriver changed the title [1LP][RFR] Fix test_cloud_init_provisioning for openstack-13 [1LP][WIPTEST] Fix test_cloud_init_provisioning for openstack-13 Jan 16, 2020
The image with cloud-init needs a bigger flavor than the one which was
getting selected so this patch adds using a ci-flavor-name to specifying
which flavor to use.
@jarovo
Copy link
Contributor Author

jarovo commented Jan 17, 2020

1. Failing Travis, please address

Done. I don'T know how did I miss the pre-commit doing the imports reordering stuff.

2. The yaml structure already contains the desired flavor name under `provisioning.instance_type2` - why not use that key here?

That one is used with this image:

    return provisioning["image"]["name"]

while the ci-flavor-name will be bound with the ci-image. These may be and I think are different images and may need different flavours.

@jarovo jarovo changed the title [1LP][WIPTEST] Fix test_cloud_init_provisioning for openstack-13 [1LP][RFR] Fix test_cloud_init_provisioning for openstack-13 Jan 22, 2020
@mshriver mshriver self-assigned this Jan 28, 2020
@mshriver
Copy link
Member

Merged yaml change and restarted PRT.

@jarovo jarovo changed the title [1LP][RFR] Fix test_cloud_init_provisioning for openstack-13 [1LP][WIPTEST] Fix test_cloud_init_provisioning for openstack-13 Jan 29, 2020
@mshriver
Copy link
Member

PRT failure unrelated to the changes here for provisioning flavor.

@mshriver mshriver merged commit b03a65f into ManageIQ:master Jan 29, 2020
@jarovo
Copy link
Contributor Author

jarovo commented Jan 29, 2020

PRT failure unrelated to the changes here for provisioning flavor.

cfme/tests/cloud_infra_common/test_cloud_init_provisioning.py/test_provision_cloud_init_payload[rhevm-4.3] fails because of lack of IPv6 in our PRT openshift

I don't know why are the other tests failing.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants