Add internal cs name to vm during the ingest #5242

DK101010 · 2021-07-26T12:49:37Z

Description

Each VM deployed in CS get an alphanumeric value as internal CS name (cloud.vm.internal.name) . Each VM that will be ingested get no internal CS name and the internal name = VM name.

CS use for a couple of actions the internal CS name if exist and therefore CS can no longer update this properties. For an example power state.

This PR add the internalCSName to VirtualMaschineMO and UnmanagedInstanceTO inside the loadCache method to use this value as instance name during the ingest.

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?

Tested in own VMWare env.

DaanHoogland

makes sense, clgtm

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

…gerImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com>

shwstppr · 2021-07-30T11:08:35Z

@blueorangutan package

blueorangutan · 2021-07-30T11:09:03Z

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

blueorangutan · 2021-07-30T11:15:28Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian. SL-JID 710

shwstppr · 2021-07-30T11:38:21Z

@DK101010 can you please merge the latest main and fix the build issue

[ERROR] /jenkins/workspace/acs-centos7-pkg-builder/dist/rpmbuild/BUILD/cloudstack-4.16.0.0-SNAPSHOT/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java:[961,11] error: reference to StringUtils is ambiguous
[ERROR]   both class org.apache.commons.lang3.StringUtils in org.apache.commons.lang3 and class org.apache.commons.lang.StringUtils in org.apache.commons.lang match

…ithub.com/NDBSGMS/cloudstack into bug/update_internal_cs_name_during_ingest

shwstppr · 2021-08-02T06:52:29Z

@blueorangutan package

blueorangutan · 2021-08-02T06:53:03Z

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

blueorangutan · 2021-08-02T07:52:17Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 723

shwstppr

Works when VM has internal name set and it is of format i-[ACCOUNT_ID]-[VM_ID]-

DaanHoogland · 2021-08-02T09:11:02Z

@shwstppr did you try other formats?

DaanHoogland · 2021-08-02T09:13:20Z

And, @shwstppr , what do you mean "when VM has internal name"? isn't it set during ingestion?

shwstppr · 2021-08-02T09:22:08Z

@DaanHoogland

I've not debugged the reason but not all VMs have an internal name in vCenter in my env
I cloned a VM in vCenter. Cloned VM didn't have an internal name assigned though it had the property.
I manually set the value there to ak-cloned
Code didn't pick this value during import as the method isUserVMInternalCSName would return false. So after import instance_name in the vm_instancetable for the VM remainedcloned`

shwstppr · 2021-08-02T09:26:20Z

@DaanHoogland I think @DK101010 wants to fix the case where a CloudStack VM is unmanaged and then imported again it gets the correct instance name. In that case unmanaged VM will already have an internal name set. During import no change is made to cloud.vm.internal.name property

rohityadavcloud · 2021-08-02T10:54:02Z

@blueorangutan test centos7 vmware-65u2

blueorangutan · 2021-08-02T10:55:02Z

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

shwstppr · 2021-08-08T11:50:55Z

@blueorangutan package

blueorangutan · 2021-08-08T11:52:03Z

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

blueorangutan · 2021-08-08T12:18:01Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 795

rohityadavcloud · 2021-08-09T08:34:17Z

@blueorangutan test centos7 vmware-65u2

blueorangutan · 2021-08-09T08:35:03Z

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

nvazquez

Code LGTM

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

…O.java Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>

nvazquez · 2021-08-11T03:18:29Z

@blueorangutan package

blueorangutan · 2021-08-11T03:19:03Z

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

blueorangutan · 2021-08-11T03:51:36Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian. SL-JID 835

nvazquez · 2021-08-11T03:52:57Z

@blueorangutan package

blueorangutan · 2021-08-11T03:54:03Z

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

blueorangutan · 2021-08-11T04:07:31Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ debian. SL-JID 836

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

…O.java Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2021-08-11T08:40:31Z

@blueorangutan package

blueorangutan · 2021-08-11T08:41:04Z

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

blueorangutan · 2021-08-11T09:08:35Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 840

DaanHoogland · 2021-08-11T14:24:29Z

@blueorangutan test

blueorangutan · 2021-08-11T14:25:04Z

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

blueorangutan · 2021-08-12T13:09:12Z

Trillian test result (tid-1602)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 79572 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5242-t1602-kvm-centos7.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_reset_vm_on_reboot.py
Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_routers.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 77 look OK, 12 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestResetVmOnReboot>:setup	`Error`	0.00	test_reset_vm_on_reboot.py
ContextSuite context=TestRAMCPUResourceAccounting>:setup	`Error`	0.00	test_resource_accounting.py
ContextSuite context=TestRouterDHCPHosts>:setup	`Error`	0.00	test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup	`Error`	0.00	test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup	`Error`	0.00	test_router_dns.py
ContextSuite context=TestRouterDnsService>:setup	`Error`	0.00	test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup	`Error`	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup	`Error`	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestIsolatedNetworks>:setup	`Error`	0.00	test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup	`Error`	0.00	test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup	`Error`	0.00	test_routers.py
ContextSuite context=TestCpuCapServiceOfferings>:setup	`Error`	0.00	test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup	`Error`	0.12	test_service_offerings.py
ContextSuite context=TestSnapshotRootDisk>:setup	`Error`	0.00	test_snapshots.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers	`Failure`	420.57	test_vpc_redundant.py
test_02_VPC_default_routes	`Failure`	975.94	test_vpc_router_nics.py

DaanHoogland · 2021-08-13T07:26:33Z

@blueorangutan test keepEnv

blueorangutan · 2021-08-13T07:27:02Z

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

blueorangutan · 2021-08-13T17:37:09Z

Trillian test result (tid-1627)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34809 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5242-t1627-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_outofbandmanagement.py
Smoke tests completed. 89 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

add internal cs name to vm during the ingest

ef17a68

DaanHoogland approved these changes Jul 27, 2021

View reviewed changes

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java Outdated Show resolved Hide resolved

Update server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsMana…

57873a3

…gerImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com>

rohityadavcloud requested a review from shwstppr July 29, 2021 09:23

rohityadavcloud added this to the 4.16.0.0 milestone Jul 29, 2021

shwstppr closed this Jul 30, 2021

shwstppr reopened this Jul 30, 2021

DK101010 added 3 commits August 2, 2021 07:12

Merge branch 'master' into bug/update_internal_cs_name_during_ingest

2b30b33

Merge branch 'bug/update_internal_cs_name_during_ingest' of https://g…

25c71b7

…ithub.com/NDBSGMS/cloudstack into bug/update_internal_cs_name_during_ingest

remove lang.StringUtils

68927f6

shwstppr approved these changes Aug 2, 2021

View reviewed changes

apache deleted a comment from blueorangutan Aug 9, 2021

nvazquez approved these changes Aug 10, 2021

View reviewed changes

sureshanaparti reviewed Aug 10, 2021

View reviewed changes

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java Outdated Show resolved Hide resolved

Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostM…

e4b1b77

…O.java Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>

shwstppr reviewed Aug 11, 2021

View reviewed changes

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java Outdated Show resolved Hide resolved

Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostM…

4826694

…O.java Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

nvazquez merged commit 1d17d7c into apache:main Aug 13, 2021

nvazquez added component:vmware type:bug labels Oct 14, 2021

Add internal cs name to vm during the ingest #5242

Add internal cs name to vm during the ingest #5242

Uh oh!

Conversation

DK101010 commented Jul 26, 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!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shwstppr commented Jul 30, 2021

Uh oh!

blueorangutan commented Jul 30, 2021

Uh oh!

blueorangutan commented Jul 30, 2021

Uh oh!

shwstppr commented Jul 30, 2021

Uh oh!

shwstppr commented Aug 2, 2021

Uh oh!

blueorangutan commented Aug 2, 2021

Uh oh!

blueorangutan commented Aug 2, 2021

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Aug 2, 2021

Uh oh!

DaanHoogland commented Aug 2, 2021

Uh oh!

shwstppr commented Aug 2, 2021

Uh oh!

shwstppr commented Aug 2, 2021

Uh oh!

rohityadavcloud commented Aug 2, 2021

Uh oh!

blueorangutan commented Aug 2, 2021

Uh oh!

shwstppr commented Aug 8, 2021

Uh oh!

blueorangutan commented Aug 8, 2021

Uh oh!

blueorangutan commented Aug 8, 2021

Uh oh!

rohityadavcloud commented Aug 9, 2021

Uh oh!

blueorangutan commented Aug 9, 2021

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nvazquez commented Aug 11, 2021

Uh oh!

blueorangutan commented Aug 11, 2021

Uh oh!

blueorangutan commented Aug 11, 2021

Uh oh!

nvazquez commented Aug 11, 2021

Uh oh!

blueorangutan commented Aug 11, 2021

Uh oh!

blueorangutan commented Aug 11, 2021

Uh oh!

Uh oh!

shwstppr commented Aug 11, 2021

Uh oh!

blueorangutan commented Aug 11, 2021

Uh oh!

blueorangutan commented Aug 11, 2021

Uh oh!

DaanHoogland commented Aug 11, 2021