Fixes #24072 - freeip with compute resource via hostgroup #5745
Conversation
|
Issues: #24072 |
|
It does take care of ips not being loaded, however the compute attributes for network are not loaded when hostgroup with compute resource and compute profile is changed, so users have to open the network modal anyway to change them. compute profile selected selected: hostgroup selected: |
iNecas
force-pushed
the
freeip-compute-resource
branch
from
a5393dd
to
8643c6d
Compare
test/integration/host_js_test.rb
Outdated
| @@ -178,6 +180,46 @@ class HostJSTest < IntegrationTestWithJavascript | |||
| assert_equal overridden_hostgroup.environment.name, environment | |||
| end | |||
|
|
|||
| test 'choosing a hostgroup with compute resource works' do | |||
| hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_subnet, :with_domain, :with_compute_resource) | |||
| hostgroup.subnet.update_attributes!(ipam: IPAM::MODES[:db]) | |||
There was a problem hiding this comment.
Rails/ActiveRecordAliases: Use update! instead of update_attributes!.
iNecas
force-pushed
the
freeip-compute-resource
branch
from
8643c6d
to
2c17451
Compare
|
Thanks for pointing that out: it turned out there was more issues with the 'deploy on': I've extended the Redmine issue to mention the others as well (seems wasteful to create separate issues for those, as they all together mean the whole feature is not very usable). I've added the fixes in separate commits, and I would prefer not squashing those, as it makes it easier to see what changes belong together, as opposed to one big commit. I've also encouraged myself to write an integration tests for this. I've learned about the poltergeist more than I wished, but it helped finding some other issues as well and hopefully, it will help with regressions in this area in the future. |
|
[test foreman] |
|
Working nicely now, APJ. |
Without this fix, the 'Virtual Machine' tab was giving: 'mybox' not found on 'libvirt (Libvirt)' 'mybox' could be deleted or 'libvirt (Libvirt)' is not responding.
When compute resource is set via compute profile, we're not sending it via the form (as it's disabled). Therefore, we need to search for in via hostgroup.
In theforeman#5790, we added an option to set the compute resource via hostgroup. There was one thing missed though: the freeip not getting assigned automagically, when the compute resource was selected this way. After this change, we make sure to check for the ip addresses (and other potential subnet related refreshes) after the hostgroup is selected, in case the interfaces were populated during the hostgroup change.
iNecas
force-pushed
the
freeip-compute-resource
branch
from
2c17451
to
bb03c89
Compare
| self.compute_attributes = compute_resource.compute_profile_attributes_for(compute_profile_id) | ||
| if compute_profile_present? | ||
| self.compute_attributes = compute_resource.compute_profile_attributes_for(compute_profile_id) | ||
| elsif compute_resource |
There was a problem hiding this comment.
Added check on compute resource presence when setting the compute attributes (with pure else, the bare-metal test was failing)
|
@ares mind having a look as someone with merge rights (if you know what I mean ;-) |
In #5790, we added an option to set the compute resource via hostgroup.
There was one thing missed though: the freeip not getting assigned
automagically, when the compute resource was selected this way.
After this change, we make sure to check for the ip addresses (and other
potential subnet related refreshes) after the hostgroup is selected, in
case the interfaces were populated during the hostgroup change.