Merge pull request #1297 from DaanHoogland/CLOUDSTACK-9203
CLOUDSTACK-9203 Implement security group move on updateVM API call
cherry-picked from a exoscale internal fix
Conflicts:
api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
server/src/com/cloud/vm/UserVmManager.java
server/src/com/cloud/vm/UserVmManagerImpl.java
* pr/1297:
CLOUDSTACK-9203 refactorred DeployVM code to be used by UpdateVM as well
CLOUDSTACK-9203 security group update on running instance
Signed-off-by: Will Stevens <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de205c58
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de205c58
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de205c58
Branch: refs/heads/master
Commit: de205c5805b356d7dc261e10519901bebfa85e04
Parents: 550aabb 78cd64a
Author: Will Stevens <[email protected]>
Authored: Wed May 25 22:59:35 2016 -0400
Committer: Will Stevens <[email protected]>
Committed: Wed May 25 22:59:35 2016 -0400
----------------------------------------------------------------------
.../api/command/user/vm/DeployVMCmd.java | 212 ++++--------------
.../command/user/vm/SecurityGroupAction.java | 25 +++
.../api/command/user/vm/UpdateVMCmd.java | 40 +++-
server/src/com/cloud/vm/UserVmManager.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 216 ++++++++++++++++++-
5 files changed, 309 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
