config-drive: support user data on L2 networks by nvazquez · Pull Request #2615 · apache/cloudstack

nvazquez · 2018-04-30T10:59:06Z

Description

This provides the ability to create L2 network providing ConfigDrive service.

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)

GitHub Issue/PRs

Screenshots (if appropriate):

How Has This Been Tested?

Create an L2 network offering using 'User Data' checkbox
Enable network offering
Create L2 network from the network offering
Deploy VM on network, verify ConfigDrive can be used

Checklist:

I have read the CONTRIBUTING document.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
Testing
I have added tests to cover my changes.
All relevant new and existing integration tests have passed.
A full integration testsuite with all test that can run on my environment has passed.

PaulAngus · 2018-04-30T11:24:24Z

@blueorangutan package

blueorangutan · 2018-04-30T11:25:08Z

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

blueorangutan · 2018-04-30T11:53:22Z

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

PaulAngus · 2018-05-04T08:20:08Z

@blueorangutan test

blueorangutan · 2018-05-04T08:20:49Z

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

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This would allow configuring of config drive while creating a L2 network offering. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2018-05-04T10:52:57Z

@blueorangutan package

blueorangutan · 2018-05-04T10:53:49Z

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

blueorangutan · 2018-05-04T11:23:23Z

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

yadvr · 2018-05-04T11:25:18Z

@blueorangutan test

blueorangutan · 2018-05-04T11:25:49Z

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

nvazquez · 2018-05-04T12:26:26Z

                                        } else if ($guestTypeField.val() == 'L2') {
                                            $useVpc.hide();
-                                            $supportedServices.hide();
+                                            $supportedServices.css('display', 'inline-block');


@rhtyd what if we display a checkbox with label 'User data (ConfigDrive)'? If it is checked, we can set serviceProviderList parameter to ConfigDrive and if not we'll pass it blank. This way we avoid user selecting unsupported services from the UI. What do you think?

Good idea, perhaps you or Ernie can improve the UI changes.

Sure, I can pick it up during the weekend

Cool, Monday is fine too.

DaanHoogland · 2018-05-04T13:31:26Z

code looks good so far (just in case I don't pass by anymore) I like the checkbox option to prevent the selection of unsupported services. Better would be if unsupported services wouldn't be visible but as long as it is only one there is no difference.

blueorangutan · 2018-05-04T18:20:02Z

Trillian test result (tid-2605)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 22750 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2615-t2605-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
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_01_vpc_site2site_vpn_multiple_options	`Failure`	144.29	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	166.57	test_vpc_vpn.py

nvazquez · 2018-05-05T20:11:58Z

@rhtyd @DaanHoogland @PaulAngus @borisstoyanov last commit includes the checkbox in the UI for User Data on L2 network offerings as shown in the screenshot on the PR description

nvazquez · 2018-05-06T16:13:36Z

@blueorangutan test

blueorangutan · 2018-05-06T16:13:50Z

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

blueorangutan · 2018-05-06T22:42:28Z

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

Test	Result	Time (s)	Test File
test_01_redundant_vpc_site2site_vpn	`Failure`	204.99	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	140.56	test_vpc_vpn.py

yadvr · 2018-05-08T10:28:00Z

@DaanHoogland are you lgtm on the changes now?

nvazquez · 2018-05-08T12:28:16Z

@blueorangutan package

blueorangutan · 2018-05-08T12:28:50Z

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

blueorangutan · 2018-05-08T13:09:17Z

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

borisstoyanov · 2018-05-09T05:27:53Z

@blueorangutan test

blueorangutan · 2018-05-09T05:28:50Z

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

borisstoyanov

LGTM based on code review, lets see the test results

blueorangutan · 2018-05-09T15:26:02Z

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

Test	Result	Time (s)	Test File

nvazquez added the status:work-in-progress label Apr 30, 2018

nvazquez force-pushed the l2cfgdrive branch from e10208a to 6cc25df Compare April 30, 2018 11:06

yadvr added this to the 4.11.1.0 milestone May 1, 2018

yadvr assigned nvazquez and unassigned nvazquez May 2, 2018

yadvr changed the title ~~WIP: Supporting ConfigDrive user data on L2 networks~~ config-drive: support user data on L2 networks May 4, 2018

nvazquez and others added 2 commits May 4, 2018 15:04

config-drive: Supporting ConfigDrive user data on L2 networks

d765283

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

ui: allow support services to be configured for L2

33f4227

This would allow configuring of config drive while creating a L2 network offering. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr force-pushed the l2cfgdrive branch from 6cc25df to 33f4227 Compare May 4, 2018 09:36

yadvr added 2 commits May 4, 2018 15:39

networkguru: don't force CIDRs on L2 guest network

764381d

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

network: allow L2 to be used for deployment

d5f2e8c

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr force-pushed the l2cfgdrive branch from 80fe43d to d5f2e8c Compare May 4, 2018 10:49

yadvr removed the status:work-in-progress label May 4, 2018

yadvr requested review from DaanHoogland, fmaximus and rafaelweingartner and removed request for DaanHoogland May 4, 2018 10:52

yadvr added the type:config label May 4, 2018

nvazquez commented May 4, 2018

View reviewed changes

UI improvement and checks for services

bfef680

yadvr approved these changes May 8, 2018

View reviewed changes

Check for new checkbox only on L2

734915c

borisstoyanov approved these changes May 9, 2018

View reviewed changes

apache deleted a comment from blueorangutan May 9, 2018

DaanHoogland approved these changes May 9, 2018

View reviewed changes

yadvr merged commit bd89760 into apache:4.11 May 9, 2018

ernjvr mentioned this pull request May 11, 2018

config drive - send user-defined vm name as host name, not uuid #2637

Closed

11 tasks

nvazquez deleted the l2cfgdrive branch April 6, 2020 14:48

Conversation

nvazquez commented Apr 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

GitHub Issue/PRs

Screenshots (if appropriate):

How Has This Been Tested?

Checklist:

Uh oh!

PaulAngus commented Apr 30, 2018

Uh oh!

blueorangutan commented Apr 30, 2018

Uh oh!

blueorangutan commented Apr 30, 2018

Uh oh!

PaulAngus commented May 4, 2018

Uh oh!

blueorangutan commented May 4, 2018

Uh oh!

yadvr commented May 4, 2018

Uh oh!

blueorangutan commented May 4, 2018

Uh oh!

blueorangutan commented May 4, 2018

Uh oh!

yadvr commented May 4, 2018

Uh oh!

blueorangutan commented May 4, 2018

Uh oh!

nvazquez May 4, 2018

Choose a reason for hiding this comment

Uh oh!

yadvr May 4, 2018

Choose a reason for hiding this comment

Uh oh!

nvazquez May 4, 2018

Choose a reason for hiding this comment

Uh oh!

yadvr May 4, 2018

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented May 4, 2018

Uh oh!

blueorangutan commented May 4, 2018

Uh oh!

nvazquez commented May 5, 2018

Uh oh!

nvazquez commented May 6, 2018

Uh oh!

blueorangutan commented May 6, 2018

Uh oh!

blueorangutan commented May 6, 2018

Uh oh!

yadvr commented May 8, 2018

Uh oh!

nvazquez commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

borisstoyanov commented May 9, 2018

Uh oh!

blueorangutan commented May 9, 2018

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nvazquez commented Apr 30, 2018 •

edited

Loading