Fixed null pointer and deployment issue on Xenserver with L2 Guest network with configDrive by Spaceman1984 · Pull Request #4004 · apache/cloudstack

Spaceman1984 · 2020-03-31T08:39:08Z

Description

This PR fixes an issue where an instance fails to deploy due to a null pointer when using an L2 Guest Network with DefaultL2NetworkOfferingConfigDrive on Xenserver. It also fixes migrating an instance to another host.

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)

Screenshots (if appropriate):

How Has This Been Tested?

This has been tested by:

Creating an L2 Guest network, using DefaultL2NetworkOfferingConfigDrive as the network offering.
Deploying an instance using the L2 Guest network created.
Migrating the instance away from the host and back

Spaceman1984 · 2020-03-31T08:44:31Z

@blueorangutan package

blueorangutan · 2020-03-31T08:45:41Z

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

blueorangutan · 2020-03-31T09:03:38Z

Packaging result: ✔centos7 ✔debian. JID-1109

nvazquez · 2020-04-09T00:44:32Z

@blueorangutan test centos7 xenserver-65sp1

blueorangutan · 2020-04-09T00:45:48Z

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

blueorangutan · 2020-04-10T17:41:21Z

Trillian test result (tid-1402)
Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35354 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4004-t1402-xenserver-65sp1.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Smoke tests completed. 76 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_vpc_privategw_static_routes	`Failure`	272.70	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	256.84	test_privategw_acl.py
test_04_rvpc_privategw_static_routes	`Failure`	402.47	test_privategw_acl.py

DaanHoogland

code looks good, but CitrixStartCommandWrapper is a one method class in which the method is 180 lines. can you partition that instead of adding to it, please.

…d disk prepare method.

Spaceman1984 · 2020-05-04T08:43:25Z

@blueorangutan package

blueorangutan · 2020-05-04T08:44:37Z

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

Spaceman1984 · 2020-05-04T08:45:27Z

@blueorangutan test centos7 xenserver-65sp1

blueorangutan · 2020-05-04T08:46:20Z

@Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + xenserver-65sp1) has been kicked to run smoke tests

blueorangutan · 2020-05-04T09:02:39Z

Packaging result: ✔centos7 ✔debian. JID-1208

borisstoyanov

LGTM, was able to configure and use CD in Xen 7.0

borisstoyanov · 2020-05-19T08:15:52Z

@blueorangutan test centos7 xenserver70

DaanHoogland

one more question, @Spaceman1984

Pearl1594

NPE has been fixed for both creation and migration of VM on xen.
LGTM

nvazquez · 2020-05-27T13:37:38Z

@blueorangutan package

blueorangutan · 2020-05-27T13:38:00Z

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

blueorangutan · 2020-05-27T13:58:35Z

Packaging result: ✔centos7 ✔debian. JID-1251

nvazquez · 2020-05-27T15:37:20Z

@blueorangutan test centos7 xenserver-71

blueorangutan · 2020-05-27T15:38:06Z

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

blueorangutan · 2020-05-28T02:49:35Z

Trillian test result (tid-1575)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 38207 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4004-t1575-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_iso.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 75 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_vpc_privategw_static_routes	`Failure`	262.94	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	223.79	test_privategw_acl.py
test_04_rvpc_privategw_static_routes	`Failure`	314.26	test_privategw_acl.py
test_01_scale_vm	`Failure`	20.63	test_scale_vm.py

yadvr · 2020-06-04T02:29:16Z

@DaanHoogland can you review this? Thanks (I'm not following this)

DaanHoogland · 2020-06-08T07:57:50Z

@nvazquez (cc @Spaceman1984 ) I'm leaving this with you for now? it was reviewed and tested. Can you give it a last glance and merge?

yadvr · 2020-06-12T04:49:57Z

@blueorangutan package

blueorangutan · 2020-06-12T04:51:25Z

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

blueorangutan · 2020-06-12T05:47:16Z

Packaging result: ✔centos7 ✔debian. JID-1355

yadvr · 2020-06-13T00:34:44Z

@blueorangutan test centos7 xenserver-71

blueorangutan · 2020-06-13T00:35:11Z

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

yadvr · 2020-06-13T22:29:06Z

@blueorangutan test centos7 xenserver-71

blueorangutan · 2020-06-13T22:30:48Z

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

blueorangutan · 2020-06-14T07:16:15Z

Trillian test result (tid-1719)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29887 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4004-t1719-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Smoke tests completed. 75 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_vpc_privategw_static_routes	`Failure`	225.13	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	233.12	test_privategw_acl.py
test_04_rvpc_privategw_static_routes	`Failure`	342.23	test_privategw_acl.py
test_01_scale_vm	`Failure`	20.49	test_scale_vm.py

DaanHoogland

looks ok, only case i wonder about is a VM with multiple nics and configdrive. did you test this ?

yadvr · 2020-06-15T07:40:26Z

@Spaceman1984 cc @nvazquez please advise, if you've tested then we can merge this

Spaceman1984 · 2020-06-15T07:45:50Z

I didn't test multiple network interfaces.

yadvr · 2020-06-16T04:45:14Z

@borisstoyanov per your testing is this ready to be merged, or needs further testing, the case of multiple nics per Daan's comment?

yadvr · 2020-06-23T06:50:47Z

Discussed with @Pearl1594, the operations for config drive are only consumed on the default nics; in case of multiple nics there won't be any regressions.

Fixed null pointer and deployment issue on configDrive network

6833d8b

svenvogel added type:bug component:networking labels Apr 1, 2020

DaanHoogland reviewed Apr 11, 2020

View reviewed changes

Comment thread ...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java Outdated

Spaceman1984 marked this pull request as draft April 15, 2020 14:27

Review changes - Created const value for user device id and refactore…

412694c

…d disk prepare method.

Spaceman1984 marked this pull request as ready for review April 17, 2020 09:37

Spaceman1984 marked this pull request as draft April 17, 2020 10:02

Fixed vm with configdrive migration error

0c2773c

Spaceman1984 marked this pull request as ready for review April 20, 2020 11:33

Spaceman1984 marked this pull request as draft April 20, 2020 12:36

DaanHoogland reviewed Apr 20, 2020

View reviewed changes

Comment thread ...sors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java Outdated

Spaceman1984 added 3 commits May 4, 2020 10:20

Fixed iso not attaching after migration

ea077bc

Added static string

f1779e3

Added static string

cbbaad8

Spaceman1984 marked this pull request as ready for review May 4, 2020 08:43

Spaceman1984 changed the title ~~Fixed null pointer and deployment issue on Xenserver and L2 Guest network with configDrive~~ Fixed null pointer and deployment issue on Xenserver with L2 Guest network with configDrive May 4, 2020

borisstoyanov approved these changes May 19, 2020

View reviewed changes

DaanHoogland reviewed May 21, 2020

View reviewed changes

Comment thread server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java Outdated

DaanHoogland added this to the 4.13.2.0 milestone May 26, 2020

Pearl1594 approved these changes May 26, 2020

View reviewed changes

Removed public modifier

1f5df35

apache deleted a comment from blueorangutan Jun 13, 2020

yadvr requested review from DaanHoogland and nvazquez June 15, 2020 03:52

DaanHoogland reviewed Jun 15, 2020

View reviewed changes

yadvr merged commit 97f21c1 into apache:4.13 Jun 23, 2020

DaanHoogland added the Severity:Major label Nov 10, 2020

Uh oh!

Conversation

Spaceman1984 commented Mar 31, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

Spaceman1984 commented Mar 31, 2020

Uh oh!

blueorangutan commented Mar 31, 2020

Uh oh!

blueorangutan commented Mar 31, 2020

Uh oh!

nvazquez commented Apr 9, 2020

Uh oh!

blueorangutan commented Apr 9, 2020

Uh oh!

blueorangutan commented Apr 10, 2020

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Spaceman1984 commented May 4, 2020

Uh oh!

blueorangutan commented May 4, 2020

Uh oh!

Spaceman1984 commented May 4, 2020

Uh oh!

blueorangutan commented May 4, 2020

Uh oh!

blueorangutan commented May 4, 2020

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

borisstoyanov commented May 19, 2020

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented May 27, 2020

Uh oh!

blueorangutan commented May 27, 2020

Uh oh!

blueorangutan commented May 27, 2020

Uh oh!

nvazquez commented May 27, 2020

Uh oh!

blueorangutan commented May 27, 2020

Uh oh!

blueorangutan commented May 28, 2020

Uh oh!

yadvr commented Jun 4, 2020

Uh oh!

DaanHoogland commented Jun 8, 2020

Uh oh!

yadvr commented Jun 12, 2020

Uh oh!

blueorangutan commented Jun 12, 2020

Uh oh!

blueorangutan commented Jun 12, 2020

Uh oh!

yadvr commented Jun 13, 2020

Uh oh!

blueorangutan commented Jun 13, 2020

Uh oh!

yadvr commented Jun 13, 2020

Uh oh!

blueorangutan commented Jun 13, 2020

Uh oh!

blueorangutan commented Jun 14, 2020

Uh oh!

Spaceman1984 commented Mar 31, 2020 •

edited

Loading