[CLOUDSTACK-10197] Update DisplayText of XenServer tools ISO entry in the database when it already exists

[rafaelweingartner]

Changes here were suggestions made to #2365, but for some reason, the PR was merged without considering them. Both the update of the ‘displayText’ value and unit test cases were suggested as improvements in that PR.

After coding, I also when through those classes and removed unused variables.

@khos2ow can you take a look here?

[khos2ow]

LGTM. Thanks @rafaelweingartner, I just noticed I've never pushed the changes you requested on #2365 !

[khos2ow]

@rafaelweingartner It seems you have some "trailing spaces" issues on XcpServerDiscovererTest.java and couple of variable name issues. The latter one is really annoying, because it forces to have ^_?[a-zA-Z0-9]*$ for final variables.

[rafaelweingartner]

@khos2ow thanks for the review.
And yes, those check-style rules are quite annoying. We need to discuss and change them to better fit the common practice nowadays.

[DaanHoogland]

nice cleanup again @rafaelweingartner

[rafaelweingartner]

What do you think @DaanHoogland, do wee need to wait for integration tests here?

[DaanHoogland]

@rafaelweingartner doesn't hurt does it?
@blueorangutan package

[blueorangutan]

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

[DaanHoogland]

@rhtyd can you review this, please?

[blueorangutan]

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1750

[rafaelweingartner]

@DaanHoogland no it does not ;)

[DaanHoogland]

@blueorangutan test

[blueorangutan]

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-2313)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29032 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2470-t2313-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 66 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_hostha_enable_ha_when_host_in_maintenance	Error	1.03	test_hostha_kvm.py

[rafaelweingartner]

@DaanHoogland is this "test_hostha_enable_ha_when_host_in_maintenance" an intermittent error? I have seen this on #2425, which is a very different PR.

[DaanHoogland]

Yes @rafaelweingartner , I've seen this one a lot and seen it pass as well. Your code here is not related to that test afaik.
@rhtyd @PaulAngus can you give second and third opinions?

[rafaelweingartner]

@DaanHoogland this one seems to be ready. Would you like to wait for a third and fourth eyes here?

[DaanHoogland]

@rafaelweingartner no it is fine