Fix VMware OVF properties copy from template by nvazquez · Pull Request #4738 · apache/cloudstack

nvazquez · 2021-03-01T12:06:48Z

Description

For backward compatibility, prior to Vmware 6.5 use EDIT operation instead of ADD when copying template vApp information

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

nvazquez · 2021-03-01T12:14:14Z

@blueorangutan package

blueorangutan · 2021-03-01T12:15:28Z

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

nvazquez · 2021-03-01T12:22:35Z

@blueorangutan help

blueorangutan · 2021-03-01T12:23:29Z

@nvazquez I understand these words: "help", "hello", "thanks", "package", "test"
Test command usage: test [mgmt os] [hypervisor] [keepEnv]
Mgmt OS options: ['centos6', 'centos7', 'centos8', 'ubuntu']
Hypervisor options: ['kvm-centos6', 'kvm-centos7', 'kvm-centos8', 'kvm-ubuntu', 'xenserver-71', 'xenserver-65sp1', 'vmware-67u3', 'vmware-65u2', 'vmware-60u2', 'vmware-55u3', 'xcpng76', 'xcpng80', 'xcpng81', 'xenserver-74', 'xcpng74']
Note: when keepEnv is passed, you need to specify mgmt server os and hypervisor or use the matrix command.

Blessed contributors for kicking Trillian test jobs: ['rhtyd', 'nvazquez', 'PaulAngus', 'borisstoyanov', 'DaanHoogland', 'shwstppr', 'andrijapanicsb', 'Spaceman1984', 'Pearl1594', 'davidjumani', 'harikrishna-patnala', 'vladimirpetrov', 'sureshanaparti']

blueorangutan · 2021-03-01T12:48:01Z

Packaging result: ✔centos7 ✔centos8 ✖debian. JID-2847

nvazquez · 2021-03-01T12:48:26Z

@blueorangutan test centos7 vmware-60u2

blueorangutan · 2021-03-01T12:49:29Z

@nvazquez a Trillian-Jenkins test job (centos7 mgmt + vmware-60u2) has been kicked to run smoke tests

yadvr · 2021-03-01T13:28:28Z

@blueorangutan package

blueorangutan · 2021-03-01T13:29:29Z

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

blueorangutan · 2021-03-01T14:05:42Z

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2848

blueorangutan · 2021-03-02T00:28:41Z

Trillian test result (tid-3627)
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40372 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t3627-vmware-60u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 83 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_3d_gpu_support	`Error`	143.49	test_deploy_vgpu_enabled_vm.py
test_01_deploy_kubernetes_cluster	`Failure`	117.78	test_kubernetes_clusters.py
test_02_invalid_upgrade_kubernetes_cluster	`Failure`	120.64	test_kubernetes_clusters.py
test_03_deploy_and_upgrade_kubernetes_cluster	`Failure`	113.40	test_kubernetes_clusters.py
test_04_deploy_and_scale_kubernetes_cluster	`Failure`	103.11	test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster	`Failure`	110.29	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	101.11	test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster	`Failure`	114.24	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	108.16	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	328.49	test_kubernetes_clusters.py
test_03_migrate_detached_volume	`Error`	84.54	test_vm_life_cycle.py
ContextSuite context=TestVAppsVM>:setup	`Error`	44.18	test_vm_life_cycle.py

borisstoyanov · 2021-03-10T09:56:17Z

@blueorangutan package

blueorangutan · 2021-03-10T09:57:07Z

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

blueorangutan · 2021-03-10T10:24:17Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 72

blueorangutan · 2021-03-10T10:31:22Z

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2894

yadvr · 2021-03-11T07:44:19Z

@blueorangutan test centos7 vmware-60u2

blueorangutan · 2021-03-11T07:45:03Z

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-60u2) has been kicked to run smoke tests [S]

blueorangutan · 2021-03-11T21:22:43Z

[S] Trillian test result (tid-78)
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47517 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t78-vmware-60u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 83 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_10_traceroute_in_vr	`Failure`	61.27	test_diagnostics.py
test_03_deploy_and_upgrade_kubernetes_cluster	`Failure`	800.70	test_kubernetes_clusters.py
test_03_migrate_detached_volume	`Error`	78.55	test_vm_life_cycle.py
ContextSuite context=TestVAppsVM>:setup	`Error`	50.50	test_vm_life_cycle.py

yadvr · 2021-03-18T07:47:03Z

@nvazquez can you see the vapp failure? cc @borisstoyanov

sureshanaparti · 2021-03-19T09:52:38Z

...ns/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

            VAppProductSpec spec = new VAppProductSpec();
            spec.setInfo(info);
-            spec.setOperation(ArrayUpdateOperation.ADD);
+            s_logger.info("Procuct info KEY " + info.getKey());


Product - typo

sureshanaparti · 2021-03-19T09:56:00Z

...ns/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

-        vmConfigSpec.getOvfSection().addAll(copyVAppConfigOvfSectionFromOVF(vAppConfig));
+
+        // For backward compatibility, prior to Vmware 6.5 use EDIT operation instead of ADD
+        boolean useEditOperation = hyperHost.getContext().getServiceContent().getAbout().getApiVersion().compareTo("6.5") < 1;


Suggested change

boolean useEditOperation = hyperHost.getContext().getServiceContent().getAbout().getApiVersion().compareTo("6.5") < 1;

boolean useEditOperation = ((HostMO) hyperHost).getHostAboutInfo().getApiVersion().compareTo("6.5") < 1;

yadvr · 2021-03-24T07:04:28Z

@blueorangutan package

blueorangutan · 2021-03-24T07:05:03Z

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

blueorangutan · 2021-03-24T07:20:40Z

Packaging result: ✖️ centos7 ✖️ centos8 ✖️ debian. SL-JID 221

blueorangutan · 2021-04-07T19:43:03Z

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

blueorangutan · 2021-04-07T20:12:24Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 353

nvazquez · 2021-04-07T20:15:35Z

@blueorangutan package

blueorangutan · 2021-04-07T20:16:02Z

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

blueorangutan · 2021-04-07T20:47:58Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 355

borisstoyanov · 2021-04-07T20:53:42Z

@blueorangutan test centos7 vmware-60u2

blueorangutan · 2021-04-07T20:54:03Z

@borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + vmware-60u2) has been kicked to run smoke tests

blueorangutan · 2021-04-08T07:48:30Z

Trillian test result (tid-378)
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 38130 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t378-vmware-60u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 85 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_deploy_kubernetes_cluster	`Failure`	89.37	test_kubernetes_clusters.py
test_02_invalid_upgrade_kubernetes_cluster	`Failure`	83.88	test_kubernetes_clusters.py
test_03_deploy_and_upgrade_kubernetes_cluster	`Failure`	70.65	test_kubernetes_clusters.py
test_04_deploy_and_scale_kubernetes_cluster	`Failure`	66.41	test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster	`Failure`	67.43	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	66.48	test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster	`Failure`	66.39	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	65.31	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	103.51	test_kubernetes_clusters.py
ContextSuite context=TestVAppsVM>:setup	`Error`	43.53	test_vm_life_cycle.py

blueorangutan · 2021-04-08T23:39:33Z

Trillian test result (tid-384)
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47353 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t384-vmware-60u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 85 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_deploy_kubernetes_cluster	`Failure`	85.12	test_kubernetes_clusters.py
test_02_invalid_upgrade_kubernetes_cluster	`Failure`	79.77	test_kubernetes_clusters.py
test_03_deploy_and_upgrade_kubernetes_cluster	`Failure`	74.68	test_kubernetes_clusters.py
test_04_deploy_and_scale_kubernetes_cluster	`Failure`	65.38	test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster	`Failure`	63.43	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	65.36	test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster	`Failure`	69.51	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	69.40	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	107.50	test_kubernetes_clusters.py
ContextSuite context=TestVAppsVM>:setup	`Error`	49.55	test_vm_life_cycle.py

yadvr · 2021-04-09T06:06:28Z

@blueorangutan test centos7 vmware-67u3

blueorangutan · 2021-04-09T06:07:02Z

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

nvazquez · 2021-04-09T14:21:07Z

@blueorangutan package

blueorangutan · 2021-04-09T14:22:03Z

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

blueorangutan · 2021-04-09T14:43:23Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 376

blueorangutan · 2021-04-09T16:20:39Z

Trillian test result (tid-388)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35738 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t388-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 85 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_deploy_kubernetes_cluster	`Failure`	81.44	test_kubernetes_clusters.py
test_02_invalid_upgrade_kubernetes_cluster	`Failure`	96.27	test_kubernetes_clusters.py
test_03_deploy_and_upgrade_kubernetes_cluster	`Failure`	56.45	test_kubernetes_clusters.py
test_04_deploy_and_scale_kubernetes_cluster	`Failure`	58.36	test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster	`Failure`	57.41	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	59.40	test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster	`Failure`	57.41	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	62.03	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	107.23	test_kubernetes_clusters.py
ContextSuite context=TestVAppsVM>:setup	`Error`	44.64	test_vm_life_cycle.py

blueorangutan · 2021-04-10T01:57:51Z

Trillian test result (tid-398)
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39249 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t398-vmware-60u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 85 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_10_traceroute_in_vr	`Failure`	61.13	test_diagnostics.py
test_01_vapps_vm_cycle	`Error`	0.01	test_vm_life_cycle.py

nvazquez · 2021-04-10T04:56:57Z

@blueorangutan package

nvazquez · 2021-04-10T05:52:23Z

@blueorangutan package

blueorangutan · 2021-04-10T05:53:02Z

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

blueorangutan · 2021-04-10T06:14:30Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 378

blueorangutan · 2021-04-10T17:06:35Z

Trillian test result (tid-400)
Environment: vmware-60u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 37884 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4738-t400-vmware-60u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Smoke tests completed. 86 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_10_traceroute_in_vr	`Failure`	61.15	test_diagnostics.py

borisstoyanov

LGTM, tested OVF properties and advanced vsphere capabilities features with setup of ESXi6.0, 6.5 and 6.7 hosts. Other than the known issues there were no issues with this bugfix.

nvazquez · 2021-04-12T12:28:56Z

@rhtyd can you give this PR a final review? Test fixes added after your review

yadvr · 2021-04-12T12:33:13Z

Lgtm!

Fix VMware OVF properties copy from template

07b3dd7

nvazquez added this to the 4.15.1.0 milestone Mar 1, 2021

nvazquez requested review from borisstoyanov and yadvr March 1, 2021 12:06

yadvr changed the base branch from master to 4.15 March 1, 2021 13:28

sureshanaparti reviewed Mar 19, 2021

View reviewed changes

yadvr approved these changes Mar 24, 2021

View reviewed changes

nvazquez mentioned this pull request Apr 7, 2021

fix test_data for vapps tests shapeblue/Trillian#128

Merged

Remove unused code

0a25c52

Fix check for deploy as is details

090d963

Access class fields

fee1a52

borisstoyanov approved these changes Apr 12, 2021

View reviewed changes

yadvr merged commit 9cf1e0e into apache:4.15 Apr 12, 2021

nvazquez deleted the fixovfcopy branch May 15, 2021 22:14

	boolean useEditOperation = hyperHost.getContext().getServiceContent().getAbout().getApiVersion().compareTo("6.5") < 1;
	boolean useEditOperation = ((HostMO) hyperHost).getHostAboutInfo().getApiVersion().compareTo("6.5") < 1;

Conversation

nvazquez commented Mar 1, 2021

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

nvazquez commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 1, 2021

Uh oh!

nvazquez commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 1, 2021

Uh oh!

nvazquez commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 1, 2021

Uh oh!

yadvr commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 1, 2021

Uh oh!

blueorangutan commented Mar 2, 2021

Uh oh!

borisstoyanov commented Mar 10, 2021

Uh oh!

blueorangutan commented Mar 10, 2021

Uh oh!

blueorangutan commented Mar 10, 2021

Uh oh!

blueorangutan commented Mar 10, 2021

Uh oh!

yadvr commented Mar 11, 2021

Uh oh!

blueorangutan commented Mar 11, 2021

Uh oh!

blueorangutan commented Mar 11, 2021

Uh oh!

yadvr commented Mar 18, 2021

Uh oh!

sureshanaparti Mar 19, 2021

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Mar 19, 2021

Choose a reason for hiding this comment

Uh oh!

yadvr commented Mar 24, 2021

Uh oh!

blueorangutan commented Mar 24, 2021

Uh oh!

blueorangutan commented Mar 24, 2021

Uh oh!

blueorangutan commented Apr 7, 2021

Uh oh!

blueorangutan commented Apr 7, 2021

Uh oh!

nvazquez commented Apr 7, 2021

Uh oh!

blueorangutan commented Apr 7, 2021

Uh oh!

blueorangutan commented Apr 7, 2021

Uh oh!

borisstoyanov commented Apr 7, 2021

Uh oh!

blueorangutan commented Apr 7, 2021

Uh oh!

blueorangutan commented Apr 8, 2021

Uh oh!

blueorangutan commented Apr 8, 2021

Uh oh!

yadvr commented Apr 9, 2021

Uh oh!