Emit event UUIDs on template deletion

[ProjectMoon]

When a template is deleted, it emits a usage event over the event bus. However, it does not emit the UUID or class name of the template over the event bus. This is leads to null pointers when expecting a template UUID on a delete event. The UUID and class name of the template are present on template creation, and on other usage events for different resources.

We have based this on 4.6 because we consider this a bug fix and it should be forward-merged.

Testing: No unit tests provided, but we have tested it in a fully deployed staging environment. Without this fix, delete a template and check the messages on the event bus. No template UUID or class name (VirtualMachineTemplate). With this fix, the template UUID and class name are emitted on the event bus.

[ProjectMoon]

Says a license is missing, but this only touches one existing file.

[DaanHoogland]

Yes, nothing to do with your code but it is genuine. You can add the license to ActionEventUtilsTest to make the build pass. The license is there in higher branches.

[ProjectMoon]

I added the license header.

Out of curiosity, I ran the org.apache.rat:apache-rat-plugin:0.10:check locally on my PR branch and it reported 59 failures rather than the 1 failure here. Any ideas?

[DaanHoogland]

have a look in target/rat.txt and see what those are. maybe some remanence of your prior work.

[ProjectMoon]

I added the license check to ActionEventUtilsTest and of course now the checks pass. But may it is a better idea to put the license in as a separate PR? Not exactly related to this commit.

[ProjectMoon]

It looks like it was some old Debian package build causing a bunch of extraneous files to be placed into the rat report. Cleaned up those and the report is now much more in line with what the Jenkins job is reporting.

[ProjectMoon]

After some discussion on IRC, going to remove the addition of the license header here and fix it in a separate PR.

[ProjectMoon]

Now that #1382 has been merged to 4.6, the checks should succeed.

[ProjectMoon]

The checks failed on unit tests which exist only on pull request #1360. Which is ... interesting. Will try to retrigger build.

[ProjectMoon]

@DaanHoogland The build is now passing.

[cristofolini]

@ProjectMoon Even if you've managed to test this in an actual environment, I think a small unit test just to assert that the correct values for the class name and UUID are being emitted would be great for future reference, even if just as a warning in case someone makes a change to that code.

[ProjectMoon]

I will try to add a unit test later today.

[ProjectMoon]

@cristofolini the unit test has been added.

[cristofolini]

Thanks, @ProjectMoon! Now you just need to add the license header (I believe that's what caused jenkins to fail).

[ProjectMoon]

License header is now in the file. Let's hope the tests succeed.

[ProjectMoon]

Apparently cloud-utils has a test failure. Will run tests locally and see what happens.

[ProjectMoon]

The tests all succeed locally. Looking at the error message, it appears to be some one-off thing. Will try to force them to run again.

[ProjectMoon]

Jenkins failed with a false positive again, similar to another issue I had with a different pull request.

[bvbharatk]

ACS CI BVT Run

Sumarry:
Build Number 105
Hypervisor xenserver
NetworkType Advanced
Passed=104
Failed=14
Skipped=4

The follwing tests have known issues
test_vpc_remote_access_vpn
test_vpc_site2site_vpn
test_01_test_vm_volume_snapshot
test_02_vpc_privategw_static_routes
test_03_rvpc_privategw_static_routes
test_04_change_offering_small
ContextSuite context=TestNiciraContoller>:setup
test_01_primary_storage_iscsi
test02_internallb_haproxy_stats_on_all_interfaces
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80
ContextSuite context=TestDeployVM>:setup
test_04_extract_template
test_04_extract_Iso
test_07_list_default_iso

Link to logs Folder (search by build_no):https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

Failed tests:

• integration.smoke.test_privategw_acl.TestPrivateGwACL
  • test_01_vpc_privategw_acl Failed
• integration.smoke.test_guest_vlan_range.TestDedicateGuestVlanRange
  • test_dedicateGuestVlanRange Failing since 5 runs

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_deploy_vgpu_enabled_vm
test_06_copy_template
test_06_copy_iso

Passed test suits:
integration.smoke.test_deploy_vm_with_userdata.TestDeployVmWithUserData
integration.smoke.test_affinity_groups_projects.TestDeployVmWithAffinityGroup
integration.smoke.test_portable_publicip.TestPortablePublicIPAcquire
integration.smoke.test_over_provisioning.TestUpdateOverProvision
integration.smoke.test_global_settings.TestUpdateConfigWithScope
integration.smoke.test_scale_vm.TestScaleVm
integration.smoke.test_service_offerings.TestCreateServiceOffering
integration.smoke.test_loadbalance.TestLoadBalance
integration.smoke.test_routers.TestRouterServices
integration.smoke.test_reset_vm_on_reboot.TestResetVmOnReboot
integration.smoke.test_snapshots.TestSnapshotRootDisk
integration.smoke.test_deploy_vms_with_varied_deploymentplanners.TestDeployVmWithVariedPlanners
integration.smoke.test_network.TestDeleteAccount
integration.smoke.test_non_contigiousvlan.TestUpdatePhysicalNetwork
integration.smoke.test_deploy_vm_iso.TestDeployVMFromISO
integration.smoke.test_public_ip_range.TestDedicatePublicIPRange
integration.smoke.test_multipleips_per_nic.TestDeployVM
integration.smoke.test_regions.TestRegions
integration.smoke.test_affinity_groups.TestDeployVmWithAffinityGroup
integration.smoke.test_network_acl.TestNetworkACL
integration.smoke.test_pvlan.TestPVLAN
integration.smoke.test_volumes.TestCreateVolume
integration.smoke.test_ssvm.TestSSVMs
integration.smoke.test_nic.TestNic
integration.smoke.test_deploy_vm_root_resize.TestDeployVM
integration.smoke.test_resource_detail.TestResourceDetail
integration.smoke.test_secondary_storage.TestSecStorageServices
integration.smoke.test_vm_life_cycle.TestDeployVM
integration.smoke.test_disk_offerings.TestCreateDiskOffering

[yadvr]

LGTM @ProjectMoon please send the PR for 4.7+; the merge workflow is from 4.7+

Please close this one and open another PR against 4.7+ thanks

tag:closeme

[ProjectMoon]

Making a new PR.