server: fix for inactive service offering for VM by shwstppr · Pull Request #3320 · apache/cloudstack

shwstppr · 2019-05-09T11:10:17Z

Description

Fixes #3315
Currently, the code was allowed to change service offering for VM to a deleted or inactive service offering. Added check for it to throw an exception.

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?

Using cmk

Fixes apache#3315 Currently code was allowing to change service offering for VM to a deleted or inactive service offering. Added check for it to throw an exception. Signed-off-by: Abhishek Kumar <abhishek.kumar@shapeblue.com>

anuragaw · 2019-05-10T05:15:52Z

        Map<String, String> customParameters = cmd.getDetails();
        ServiceOfferingVO newServiceOffering = _offeringDao.findById(svcOffId);
+        if (newServiceOffering.getState() == DiskOffering.State.Inactive) {
+            throw new InvalidParameterValueException(String.format("Unable to upgrade virtual machine %s with an inactive service offering %s", vmInstance.toString(), newServiceOffering.getUuid()));


nit - vmInstance.name?

@anuragaw instead vmInstance.getUuid()? As we show UUIDs mostly.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

anuragaw · 2019-05-20T04:22:34Z

LGTM

yadvr · 2019-05-23T05:47:33Z

@blueorangutan package

blueorangutan · 2019-05-23T05:47:57Z

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

blueorangutan · 2019-05-23T06:52:09Z

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

shwstppr · 2019-05-23T06:58:48Z

@blueorangutan package

blueorangutan · 2019-05-23T06:59:58Z

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

blueorangutan · 2019-05-23T07:22:23Z

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

DaanHoogland · 2019-05-23T10:00:45Z

@blueorangutan test

blueorangutan · 2019-05-23T10:00:58Z

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

DaanHoogland

test suite running

DaanHoogland · 2019-05-23T10:01:29Z

        Map<String, String> customParameters = cmd.getDetails();
        ServiceOfferingVO newServiceOffering = _offeringDao.findById(svcOffId);
+        if (newServiceOffering.getState() == DiskOffering.State.Inactive) {
+            throw new InvalidParameterValueException(String.format("Unable to upgrade virtual machine %s with an inactive service offering %s", vmInstance.getUuid(), newServiceOffering.getUuid()));


yadvr · 2019-05-23T14:35:36Z

@blueorangutan package

blueorangutan · 2019-05-23T14:35:59Z

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

blueorangutan · 2019-05-23T16:55:16Z

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

blueorangutan · 2019-05-23T19:27:22Z

Trillian test result (tid-3571)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32146 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3320-t3571-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 69 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_cancel_host_maintenace_with_migration_jobs	`Error`	3.52	test_host_maintenance.py

anuragaw reviewed May 10, 2019

View reviewed changes

anuragaw approved these changes May 10, 2019 •

edited

Loading

View reviewed changes

show VM UUID in exception error message

b65d44c

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

yadvr added this to the 4.13.0.0 milestone May 23, 2019

yadvr approved these changes May 23, 2019

View reviewed changes

yadvr added the type:bug label May 23, 2019

DaanHoogland approved these changes May 23, 2019

View reviewed changes

yadvr requested a review from PaulAngus May 24, 2019 11:22

yadvr merged commit d1090c0 into apache:master May 27, 2019

Uh oh!

Conversation

shwstppr commented May 9, 2019 • 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!

anuragaw May 10, 2019

Choose a reason for hiding this comment

Uh oh!

shwstppr May 10, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anuragaw commented May 20, 2019

Uh oh!

yadvr commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

shwstppr commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

DaanHoogland commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland May 23, 2019

Choose a reason for hiding this comment

Uh oh!

yadvr commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

blueorangutan commented May 23, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

shwstppr commented May 9, 2019 •

edited

Loading