Backports for 4.11 branch by yadvr · Pull Request #2621 · apache/cloudstack

yadvr · 2018-05-03T11:08:37Z

Description

This PR has backported changes/PRs merged on master that we can consider for 4.11, limiting to fixes and no features.

I've few more PRs, please advise if we should backport:
#2499
#2401
#2574
#2387
#2414 (tagged bugfix)
#2404 (tagged bugfix)
#2443 (tagged bugfix)

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?

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.

…ded code to skip disabled clusters when selecting a host (apache#2442) (cherry picked from commit c3488a5) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

(cherry picked from commit 4412563) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

… if hypervisor is not KVM. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Since CloudStack 4.10 Basic Networking supports IPv6 and thus should be allowed to be specified when creating a network. Signed-off-by: Wido den Hollander <wido@widodh.nl> (cherry picked from commit 9733a10) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Allow admins to remove primary storage pool. Cherry-picked from eba2e1d Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Signed-off-by: Yoan Blanc <yoan.blanc@exoscale.ch> Signed-off-by: Daan Hoogland <daan.hoogland@shapeblue.com> (cherry picked from commit 2ad5202) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

(cherry picked from commit bb607d0) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2018-05-04T07:20:26Z

@blueorangutan package

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

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

blueorangutan · 2018-05-04T08:02:11Z

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

yadvr · 2018-05-04T08:23:34Z

@blueorangutan test

blueorangutan · 2018-05-04T08:23:50Z

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

…ct “root admin” as the role for the new user (apache#2606) * create account with domain admin showing 'root admin' role Domain admins should not be able to assign the role of root admin to new users. Therefore, the role ‘root admin’ (or any other of the same type) should not be visible to domain admins. * License and formatting * Break long sentence into multiple lines * Fix wording of method 'getCurrentAccount' * fix typo in variable name

…stAccounts

yadvr · 2018-05-07T08:03:53Z

@blueorangutan package

blueorangutan · 2018-05-07T08:04:50Z

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

blueorangutan · 2018-05-07T09:11:24Z

Packaging result: ✔centos6 ✖centos7 ✖debian. JID-2017

yadvr · 2018-05-07T14:35:30Z

@blueorangutan package

blueorangutan · 2018-05-07T14:35:50Z

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

blueorangutan · 2018-05-07T15:10:38Z

Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2023

yadvr · 2018-05-08T10:37:07Z

@blueorangutan package

blueorangutan · 2018-05-08T10:37:50Z

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

blueorangutan · 2018-05-08T11:00:09Z

Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2025

yadvr · 2018-05-08T11:26:54Z

@blueorangutan test matrix

blueorangutan · 2018-05-08T11:27:50Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

rafaelweingartner · 2018-05-08T12:47:30Z

@rhtyd I think we should proceed and merge as soon as test results are fine here. There are already a big amount of changes. It is easy to get lost and let things slip through in this volume of changes.

yadvr · 2018-05-08T12:49:04Z

@rafaelweingartner sure, given these changes are already reviewed and tested on master. If tests are fine, I'll merge them on 4.11 and then forward merge on master using -X ours to perform an empty forward merge and ignore changes from this backport PR.

rafaelweingartner · 2018-05-08T12:50:57Z

Awesome. thanks.
Just watch-out that the branch 4.11 might have merged PRs that were not forwarded to master yet. Therefore, it might be good to check it before "merging" this one forward.

blueorangutan · 2018-05-08T18:16:10Z

Trillian test result (tid-2638)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 22652 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2621-t2638-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 64 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_05_rvpc_multi_tiers	`Failure`	307.05	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	329.07	test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn	`Failure`	217.99	test_vpc_vpn.py
test_01_vpc_site2site_vpn_multiple_options	`Failure`	134.95	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	156.11	test_vpc_vpn.py
test_hostha_enable_ha_when_host_in_maintenance	`Error`	1.61	test_hostha_kvm.py

yadvr · 2018-05-08T20:39:37Z

@blueorangutan test matrix

blueorangutan · 2018-05-08T20:39:50Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2018-05-09T05:49:59Z

Trillian test result (tid-2645)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31294 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2621-t2645-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_usage.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 61 look OK, 6 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_04_extract_template	`Failure`	128.34	test_templates.py
ContextSuite context=TestISOUsage>:setup	`Error`	0.00	test_usage.py
test_06_download_detached_volume	`Failure`	136.72	test_volumes.py
test_05_rvpc_multi_tiers	`Failure`	303.93	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	327.01	test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn	`Failure`	205.46	test_vpc_vpn.py
test_01_vpc_site2site_vpn_multiple_options	`Failure`	129.82	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	137.80	test_vpc_vpn.py
test_hostha_enable_ha_when_host_in_maintenance	`Error`	3.64	test_hostha_kvm.py

blueorangutan · 2018-05-09T06:00:12Z

Trillian test result (tid-2646)
Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31862 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2621-t2646-vmware-65.zip
Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_usage.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 64 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_04_extract_template	`Failure`	141.60	test_templates.py
ContextSuite context=TestISOUsage>:setup	`Error`	0.00	test_usage.py
test_06_download_detached_volume	`Failure`	164.24	test_volumes.py

yadvr · 2018-05-09T06:54:50Z

@blueorangutan test centos7 xenserver-71

blueorangutan · 2018-05-09T06:55:50Z

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

yadvr · 2018-05-09T09:48:42Z

I looked at the reported errors, none of them are PR related, but either issue with the PR itself or network/env issue. I'll fix some tests in a separate PR.
I'll do a squash merge, after check 4.11 branch and doing any fwd-merge. Then merge this PR from 4.11 onto master with -X ours since the backported changes are already on master.

houthuisand others added 2 commits May 3, 2018 16:18

CLOUDSTACK-10147 Disabled Xenserver Cluster can still deploy VM's. Ad…
462cfbd
…ded code to skip disabled clusters when selecting a host (apache#2442) (cherry picked from commit c3488a5) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

CLOUDSTACK-10318: Bug on sorting ACL rules list in chrome (apache#2478)
bc11956
(cherry picked from commit 4412563) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr added this to the 4.11.1.0 milestone May 3, 2018

niteshsardaand others added 5 commits May 3, 2018 16:46

CLOUDSTACK-10284:Creating a snapshot from VM Snapshot generates error…
ccaf782
… if hypervisor is not KVM. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

CLOUDSTACK-10214: Unable to remove local primary storage (apache#2390)
885e523
Allow admins to remove primary storage pool. Cherry-picked from eba2e1d Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

dateutil: constistency of tzdate input and output (apache#2392)
e39ad6f
Signed-off-by: Yoan Blanc <yoan.blanc@exoscale.ch> Signed-off-by: Daan Hoogland <daan.hoogland@shapeblue.com> (cherry picked from commit 2ad5202) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

CLOUDSTACK-10054:Volume download times out in 3600 seconds (apache#2244)
bb4021d
(cherry picked from commit bb607d0) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

apache deleted a comment from blueorangutan May 3, 2018

yadvr added the Backport label May 3, 2018

yadvr requested review from DaanHoogland, nvazquez and rafaelweingartner and removed request for DaanHoogland May 3, 2018 11:56

apache deleted a comment from blueorangutan May 4, 2018

apache deleted a comment from borisstoyanov May 4, 2018

apache deleted a comment from blueorangutan May 4, 2018

apache deleted a comment from borisstoyanov May 4, 2018

yadvr mentioned this pull request May 4, 2018
[CLOUDSTACK-9338] ACS is not accounting resources of VMs with custom service offering properly #2443
Merged

rafaelweingartner added 2 commits May 4, 2018 08:24

[CLOUDSTACK-10259] Missing float part of secondary storage data in li…
3bdbd5f
…stAccounts

yadvr mentioned this pull request May 7, 2018
Updates to capacity management #2499
Merged
11 tasks

Updates to capacity management
b565387

mike-tutkowski force-pushed the 41110-fix-and-bports branch from 95f1a85 to b565387Compare May 7, 2018 19:49

apache deleted a comment from blueorangutan May 9, 2018

yadvr merged commit 4534cef into apache:4.11May 9, 2018

snyk-bot mentioned this pull request Jul 13, 2021
[Snyk] Upgrade node-sass from 4.11.0 to 4.14.1 SNiTEBoBy/cloudstack#37
Open

Uh oh!

Conversation

yadvr commented May 3, 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!

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!

yadvr commented May 7, 2018

Uh oh!

blueorangutan commented May 7, 2018

Uh oh!

blueorangutan commented May 7, 2018

Uh oh!

yadvr commented May 7, 2018

Uh oh!

blueorangutan commented May 7, 2018

Uh oh!

blueorangutan commented May 7, 2018

Uh oh!

yadvr commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

yadvr commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

rafaelweingartner commented May 8, 2018

Uh oh!

yadvr commented May 8, 2018

Uh oh!

rafaelweingartner commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

yadvr commented May 8, 2018

Uh oh!

blueorangutan commented May 8, 2018

Uh oh!

blueorangutan commented May 9, 2018

Uh oh!

blueorangutan commented May 9, 2018

Uh oh!

yadvr commented May 9, 2018

Uh oh!

blueorangutan commented May 9, 2018

Uh oh!

yadvr commented May 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

yadvr commented May 3, 2018•
edited
Loading