KVM: Enable SSL if keystore exists by weizhouapache · Pull Request #6200 · apache/cloudstack

weizhouapache · 2022-04-04T12:18:22Z

Description

This PR enables SSL in kvm agent if keystore exists.

This fixes the issue in URL check of direct-download templates

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?

weizhouapache · 2022-04-04T12:18:55Z

@blueorangutan package

blueorangutan · 2022-04-04T12:20:03Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-04-04T13:17:25Z

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

nvazquez · 2022-04-04T13:31:10Z

@blueorangutan test

blueorangutan · 2022-04-04T13:32:03Z

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

blueorangutan · 2022-04-04T22:58:01Z

Trillian test result (tid-3807)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32581 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6200-t3807-kvm-centos7.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

nvazquez

LGTM

DaanHoogland

looks good. some refinements possible.

agent/src/main/java/com/cloud/agent/AgentShell.java

weizhouapache · 2022-04-19T14:29:29Z

@blueorangutan package

acs-robot · 2022-04-19T14:30:16Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

acs-robot · 2022-04-19T14:30:17Z

Found Java/XML changes, kicking packaging job
@blueorangutan package

acs-robot · 2022-04-19T15:09:56Z

PR Coverage Report

CLASS	INSTRUCTION MISSED	INSTRUCTION COVERED	BRANCH MISSED	BRANCH COVERED	LINE MISSED	LINE COVERED
























StorageManager	0	211	0	0	0	18
AgentAttache	1042	0	124	0	219	0
AgentManagerImpl	3463	0	380	0	714	0
ClusteredAgentManagerImpl	2361	0	242	0	536	0
NetworkOrchestrator	9636	0	1176	0	1901	0
VolumeOrchestrator	5170	0	560	0	977	0


NetworkDaoImpl	3307	0	116	0	467	0
SnapshotVO	172	58	12	0	48	20

SnapshotDaoImpl	768	0	8	0	128	0
Upgrade41610to41700	82	7	4	0	23	2

DirectDownloadCertificateHostMapDaoImpl	121	0	0	0	18	0
DirectDownloadCertificateHostMapVO	54	0	4	0	19	0

AncientDataMotionStrategy	1458	52	170	4	338	10
DefaultSnapshotStrategy	758	220	100	10	164	37
SnapshotDataFactoryImpl	152	58	15	5	37	13
DefaultVMSnapshotStrategy	486	677	52	30	100	140
ScaleIOVMSnapshotStrategy	1063	4	80	0	224	1
StorageStrategyFactoryImpl	37	77	1	5	8	18
SnapshotDataStoreDaoImpl	1683	60	44	2	292	13
DefaultHostListener	537	0	40	0	101	0

LibvirtComputingResource	8927	1961	1096	140	1992	444
LibvirtVMDef	37	114	6	4	11	36
LibvirtReadyCommandWrapper	8	37	2	2	1	10
LibvirtRevertSnapshotCommandWrapper	387	130	20	0	69	16
LibvirtUtilitiesHelper	115	58	4	2	27	8
IscsiAdmStorageAdaptor	981	0	52	0	178	0
IscsiAdmStoragePool	129	0	0	0	32	0
KVMStoragePoolManager	926	4	76	0	192	1
KVMStorageProcessor	5992	498	448	22	1239	71
LibvirtStorageAdaptor	3376	19	257	0	797	2
LibvirtStoragePool	239	89	15	9	64	29
LinstorStorageAdaptor	1076	0	50	0	246	0
ManagedNfsStorageAdaptor	446	0	20	0	125	0
ScaleIOStorageAdaptor	684	121	75	13	152	31

QemuImg	674	0	64	0	160	0




MockVmManagerImpl	1495	0	90	0	338	0
VmwareServerDiscoverer	1586	0	182	0	378	0
VmwareManagerImpl	2613	528	296	38	615	117
VmwareResource	20060	0	2242	0	4330	0
VmwareStorageProcessor	9886	9	940	0	2121	2
XcpServerDiscoverer	1554	101	176	6	345	21
CitrixResourceBase	14566	557	1452	34	3160	122
CitrixReadyCommandWrapper	58	37	3	1	15	11
ListVMsMetricsCmd	39	0	0	0	10	0

MetricsServiceImpl	1673	0	98	0	337	0
NetScalerControlCenterResource	1943	0	144	0	468	0
NetscalerResource	6882	0	806	0	1623	0
ElastistorHostListener	150	0	14	0	30	0
DateraPrimaryDataStoreDriver	3195	0	283	0	748	0
DateraHostListener	635	0	74	0	136	0
CloudStackPrimaryDataStoreDriverImpl	903	0	114	0	229	0
LinstorPrimaryDataStoreDriverImpl	1442	0	91	0	348	0



ScaleIOPrimaryDataStoreDriver	2537	0	246	0	537	0
ScaleIOHostListener	196	0	14	0	43	0
SolidFirePrimaryDataStoreDriver	3347	0	284	0	697	0
SolidFireHostListener	545	0	60	0	112	0
SolidFireSharedHostListener	407	0	30	0	82	0
SAMLUtils	202	465	41	11	53	108
ApiDBUtils	2361	0	206	0	588	0
ApiResponseHelper	11878	0	1242	0	2711	0
ParamProcessWorker	1027	0	147	0	237	0
QueryManagerImpl	14153	0	1242	0	2389	0
ViewResponseHelper	1662	0	150	0	305	0

UserVmJoinDaoImpl	1531	0	184	0	328	0
Config	152	5162	30	6	42	342
ConfigurationManagerImpl	18094	0	3042	0	3571	0
LibvirtServerDiscoverer	988	0	116	0	218	0
ConfigDriveNetworkElement	1466	0	173	0	306	0
NetworkHelperImpl	2019	0	264	0	428	0
NetworkACLServiceImpl	2698	0	302	0	520	0
ResourceManagerImpl	8512	0	982	0	1658	0
ManagementServerImpl	11764	0	1048	0	2349	0
StatsCollector	1875	0	104	0	308	0
StorageManagerImpl	8547	0	974	0	1704	0
VolumeApiServiceImpl	10826	0	1498	0	2031	0
SnapshotManager	107	0	0	0	9	0
SnapshotManagerImpl	4186	0	410	0	751	0
TaggedResourceManagerImpl	473	0	58	0	96	0
TemplateManagerImpl	4996	0	696	0	1042	0
AccountManagerImpl	6427	0	900	0	1348	0
UserVmManagerImpl	20824	0	2576	0	3873	0
VMSnapshotManagerImpl	3135	0	292	0	623	0
BackupManagerImpl	2776	0	224	0	488	0
DirectDownloadManagerImpl	1679	0	186	0	361	0
UnmanagedVMsManagerImpl	4881	0	542	0	800	0




























PremiumSecondaryStorageManagerImpl	775	0	64	0	116	0
SecondaryStorageManagerImpl	3494	149	343	11	623	32

weizhouapache · 2022-04-19T18:23:06Z

@blueorangutan package

blueorangutan · 2022-04-19T18:24:03Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-04-19T19:00:27Z

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

weizhouapache · 2022-04-20T07:38:43Z

@blueorangutan test ubuntu20 kvm-ubuntu20

blueorangutan · 2022-04-20T07:39:03Z

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

blueorangutan · 2022-04-20T08:06:42Z

Trillian Build Failed (tid-3939)

weizhouapache · 2022-04-20T09:10:17Z

@blueorangutan test ubuntu20 kvm-ubuntu20

blueorangutan · 2022-04-20T09:11:03Z

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

blueorangutan · 2022-04-20T20:47:16Z

Trillian test result (tid-3940)
Environment: kvm-ubuntu20 (x2), Advanced Networking with Mgmt server u20
Total time taken: 40036 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6200-t3940-kvm-ubuntu20.zip
Smoke tests completed. 93 look OK, 3 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_add_primary_storage_disabled_host	`Error`	0.69	test_primary_storage.py
test_01_primary_storage_nfs	`Error`	0.19	test_primary_storage.py
ContextSuite context=TestStorageTags>:setup	`Error`	0.32	test_primary_storage.py
test_01_deploy_vm_on_specific_host	`Error`	1.22	test_vm_deployment_planner.py
test_02_deploy_vm_on_specific_cluster	`Error`	0.16	test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod	`Error`	0.20	test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster	`Error`	1.26	test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod	`Error`	0.18	test_vm_deployment_planner.py
test_hostha_enable_ha_when_host_in_maintenance	`Error`	305.17	test_hostha_kvm.py

weizhouapache · 2022-04-20T21:59:16Z

@blueorangutan test ubuntu20 kvm-ubuntu20

nvazquez · 2022-04-21T13:38:36Z

@blueorangutan test

blueorangutan · 2022-04-21T13:39:02Z

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

weizhouapache · 2022-04-21T17:40:38Z

@blueorangutan package

blueorangutan · 2022-04-21T17:41:03Z

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-04-21T18:17:30Z

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

weizhouapache · 2022-04-21T18:55:22Z

@blueorangutan test

blueorangutan · 2022-04-21T18:58:03Z

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

nvazquez · 2022-04-22T02:29:49Z

@blueorangutan test

blueorangutan · 2022-04-22T02:54:03Z

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

blueorangutan · 2022-04-22T14:49:40Z

Trillian test result (tid-3977)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41440 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6200-t3977-kvm-centos7.zip
Smoke tests completed. 96 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

This reverts commit 4525f8c.

* agent: enable ssl only for kvm agent (not in system vms) * Revert "agent: enable ssl only for kvm agent (not in system vms)" This reverts commit b2d76ba. * Revert "KVM: Enable SSL if keystore exists (#6200)" This reverts commit 4525f8c. * KVM: Enable SSL if keystore exists in LibvirtComputingResource.java

* KVM: Enable SSL if keystore exists * Update apache#6200: add logs if no passphrase or no keystore Co-authored-by: Wei Zhou <weizhou@apache.org>

apache#151) * agent: enable ssl only for kvm agent (not in system vms) * Revert "agent: enable ssl only for kvm agent (not in system vms)" This reverts commit b2d76ba. * Revert "KVM: Enable SSL if keystore exists (apache#6200)" This reverts commit 4525f8c. * KVM: Enable SSL if keystore exists in LibvirtComputingResource.java Co-authored-by: Wei Zhou <weizhou@apache.org>

KVM: Enable SSL if keystore exists

7ba345b

weizhouapache requested review from Pearl1594 and nvazquez April 4, 2022 12:18

weizhouapache added this to the 4.17.0.0 milestone Apr 4, 2022

nvazquez added the type:bug label Apr 4, 2022

nvazquez approved these changes Apr 5, 2022

View reviewed changes

weizhouapache marked this pull request as ready for review April 12, 2022 11:10

weizhouapache requested review from DaanHoogland and yadvr April 12, 2022 11:11

weizhouapache self-assigned this Apr 12, 2022

DaanHoogland approved these changes Apr 13, 2022

View reviewed changes

agent/src/main/java/com/cloud/agent/AgentShell.java Show resolved Hide resolved

agent/src/main/java/com/cloud/agent/AgentShell.java Show resolved Hide resolved

Update apache#6200: add logs if no passphrase or no keystore

29fada7

boring-cyborg bot added the component:agent label Apr 19, 2022

nvazquez merged commit 4525f8c into apache:main Apr 22, 2022

weizhouapache mentioned this pull request May 10, 2022

agent: enable ssl only for kvm agent (not in system vms) #6371

Merged

12 tasks

weizhouapache added a commit to weizhouapache/cloudstack that referenced this pull request May 11, 2022

Revert "KVM: Enable SSL if keystore exists (apache#6200)"

a16b46e

This reverts commit 4525f8c.

weizhouapache deleted the 4.17-kvm-enable-ssl branch December 9, 2022 10:08

weizhouapache mentioned this pull request Aug 30, 2023

kvm: fix error when enable SSL for kvm agent #7923

Merged

12 tasks

Conversation

weizhouapache commented Apr 4, 2022

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!

weizhouapache commented Apr 4, 2022

Uh oh!

blueorangutan commented Apr 4, 2022

Uh oh!

blueorangutan commented Apr 4, 2022

Uh oh!

nvazquez commented Apr 4, 2022

Uh oh!

blueorangutan commented Apr 4, 2022

Uh oh!

blueorangutan commented Apr 4, 2022

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Apr 19, 2022

Uh oh!

acs-robot commented Apr 19, 2022

Uh oh!

acs-robot commented Apr 19, 2022

Uh oh!

acs-robot commented Apr 19, 2022

PR Coverage Report

Uh oh!

weizhouapache commented Apr 19, 2022

Uh oh!

blueorangutan commented Apr 19, 2022

Uh oh!

blueorangutan commented Apr 19, 2022

Uh oh!

weizhouapache commented Apr 20, 2022

Uh oh!

blueorangutan commented Apr 20, 2022

Uh oh!

blueorangutan commented Apr 20, 2022

Uh oh!

weizhouapache commented Apr 20, 2022

Uh oh!

blueorangutan commented Apr 20, 2022

Uh oh!

blueorangutan commented Apr 20, 2022

Uh oh!

weizhouapache commented Apr 20, 2022

Uh oh!

nvazquez commented Apr 21, 2022

Uh oh!

blueorangutan commented Apr 21, 2022

Uh oh!

weizhouapache commented Apr 21, 2022

Uh oh!

blueorangutan commented Apr 21, 2022

Uh oh!

blueorangutan commented Apr 21, 2022

Uh oh!

weizhouapache commented Apr 21, 2022

Uh oh!

blueorangutan commented Apr 21, 2022

Uh oh!

nvazquez commented Apr 22, 2022

Uh oh!

blueorangutan commented Apr 22, 2022

Uh oh!

blueorangutan commented Apr 22, 2022

Uh oh!

Reviewers