FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Deprecated changeServiceForVirtualMachine API and replaced all the oc… by harikrishna-patnala · Pull Request #6540 · apache/cloudstack · GitHub

  1. apache
  2. cloudstack

Repository navigation

Deprecated changeServiceForVirtualMachine API and replaced all the oc… #6540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Jul 9, 2022
Conversation 27 Commits 1 Checks 0 Files changed
Merged

Deprecated changeServiceForVirtualMachine API and replaced all the oc… #6540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .java  (4) .py  (3) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
import com.cloud.vm.VirtualMachine;


@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering. This command also takes into account the Volume and it may resize the root disk size according to the service offering.", responseObject = SuccessResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering. This command also considers the volume size in the service offering or disk offering linked to the new service offering and apply all characteristics to the root volume.", responseObject = SuccessResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ScaleVMCmdByAdmin extends ScaleVMCmd implements AdminCmd {}
9 changes: 5 additions & 4 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@

import com.cloud.vm.VirtualMachine;

@APICommand(name = "changeServiceForVirtualMachine", responseObject=UserVmResponse.class, description="Changes the service offering for a virtual machine. " +
"The virtual machine must be in a \"Stopped\" state for " +
"this command to take effect. Note that it only changes the VM's compute offering and it does not update the root volume offering. "
+ "If the Service Offering has a root disk size the volume will be resized only if using API command 'scaleVirtualMachine'.", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
@Deprecated(since = "4.18")
@APICommand(name = "changeServiceForVirtualMachine", responseObject=UserVmResponse.class, description="(This API is deprecated, use scaleVirtualMachine API)" +
"Changes the service offering for a virtual machine. The virtual machine must be in a \"Stopped\" state for " +
"this command to take effect.",
responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpgradeVMCmdByAdmin extends UpgradeVMCmd implements AdminCmd {}
2 changes: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import com.cloud.vm.VirtualMachine;


@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering. This command also considers the volume size in the service offering or disk offering linked to the new service offering and apply all characteristics to the root volume.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ScaleVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ScaleVMCmd.class.getName());
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@
import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;

@APICommand(name = "changeServiceForVirtualMachine", responseObject=UserVmResponse.class, description="Changes the service offering for a virtual machine. " +
"The virtual machine must be in a \"Stopped\" state for " +
@Deprecated(since = "4.18")
@APICommand(name = "changeServiceForVirtualMachine", responseObject=UserVmResponse.class, description="(This API is deprecated, use scaleVirtualMachine API)" +
"Changes the service offering for a virtual machine. The virtual machine must be in a \"Stopped\" state for " +
"this command to take effect.", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
public class UpgradeVMCmd extends BaseCmd implements UserCmd {
Expand Down
14 changes: 7 additions & 7 deletions test/integration/component/test_deploy_vgpu_vm.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# All tests inherit from cloudstackTestCase
from marvin.cloudstackTestCase import cloudstackTestCase
import unittest
from marvin.cloudstackAPI import changeServiceForVirtualMachine, startVirtualMachine
from marvin.cloudstackAPI import scaleVirtualMachine, startVirtualMachine

# Import Integration Libraries

Expand Down Expand Up @@ -594,10 +594,10 @@ def serviceoffering_upgrade(
self.destvgpuoffering = self.vgpu_serviceoffering_creation(
desttype,
destmodel)
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = vm.id
cmd.serviceofferingid = self.destvgpuoffering.id
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)

self.debug("Starting VM - ID: %s" % vm.id)
self.start_vm()
Expand Down Expand Up @@ -644,10 +644,10 @@ def vm_snapshot_serviceoffering_upgrade(
self.destvgpuoffering = self.vgpu_serviceoffering_creation(
desttype,
destmodel)
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = vm.id
cmd.serviceofferingid = self.destvgpuoffering.id
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)

self.debug("Starting VM - ID: %s" % vm.id)
self.start_vm()
Expand Down Expand Up @@ -1367,10 +1367,10 @@ def vm_snapshot_vgpu(
desttype,
destmodel)
self.stop_life_cycle_vm(vmcard)
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = vmcard.id
cmd.serviceofferingid = self.destvgpuoffering.id
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)

self.debug("Starting VM - ID: %s" % vmcard.id)
self.start_life_cycle_vm(vmcard)
Expand Down
14 changes: 7 additions & 7 deletions test/integration/smoke/test_service_offerings.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Import Local Modules
from marvin.codes import FAILED
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import (changeServiceForVirtualMachine,
from marvin.cloudstackAPI import (scaleVirtualMachine,
updateServiceOffering)
from marvin.lib.utils import (isAlmostEqual,
cleanup_resources,
Expand Down Expand Up @@ -546,10 +546,10 @@ def test_04_change_offering_small(self):
except Exception as e:
self.fail("Failed to stop VM: %s" % e)

cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = self.medium_virtual_machine.id
cmd.serviceofferingid = self.small_offering.id
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)

self.debug("Starting VM - ID: %s" % self.medium_virtual_machine.id)
self.medium_virtual_machine.start(self.apiclient)
Expand Down Expand Up @@ -695,12 +695,12 @@ def test_05_disk_offering_strictness_true(self):
offering_data,
)
self._cleanup.append(self.serviceOfferingWithDiskOfferingStrictnessTrue2)
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = self.virtual_machine_with_diskoffering_strictness_true.id
cmd.serviceofferingid = self.serviceOfferingWithDiskOfferingStrictnessTrue2.id

with self.assertRaises(Exception) as e:
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)
self.debug("Upgrade VM with new service offering having different disk offering operation failed as expected with exception: %s" %
e.exception)
return
Expand Down Expand Up @@ -800,10 +800,10 @@ def test_06_disk_offering_strictness_false(self):
offering_data,
)
self._cleanup.append(self.serviceOfferingWithDiskOfferingStrictnessFalse2)
cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = self.virtual_machine_with_diskoffering_strictness_false.id
cmd.serviceofferingid = self.serviceOfferingWithDiskOfferingStrictnessFalse2.id
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)

list_vm_response = VirtualMachine.list(
self.apiclient,
Expand Down
4 changes: 2 additions & 2 deletions tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@ def test_04_change_offering_small(self):
self.debug("Change Service offering VM - ID: %s" %
self.medium_virtual_machine.id)

cmd = changeServiceForVirtualMachine.changeServiceForVirtualMachineCmd()
cmd = scaleVirtualMachine.scaleVirtualMachineCmd()
cmd.id = self.medium_virtual_machine.id
cmd.serviceofferingid = self.small_offering.id
self.apiclient.changeServiceForVirtualMachine(cmd)
self.apiclient.scaleVirtualMachine(cmd)

self.debug("Starting VM - ID: %s" % self.medium_virtual_machine.id)
self.medium_virtual_machine.start(self.apiclient)
Expand Down
Back | FazBrowse Home | New Git URL