Merge pull request #741 from koushik-das/simulator_fixes Made following fixes in simulator - Support for ScaleVmCommand/NetworkRulesVmSecondaryIpCommand in resource layer - Added support for scaling up a running VM in simulator - Fixed some method names not following convention
In order to test PR #725 using simulator some of these changes are needed. Based on the way HV check is present in the scale VM API, had to explicitly put simulator related check to allow support. The ideal way would be to remove all these HV specific check from code and made them some configuration (by putting them in hypervisor_capabilities table in DB). But that will be a bigger effort outside the scope of this PR. Signed-off-by: Koushik Das <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53cba7c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53cba7c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53cba7c7 Branch: refs/heads/master Commit: 53cba7c741ff21ed798e6ae3801dd1db568e9a9c Parents: 8bc0294 acc11dc Author: Koushik Das <[email protected]> Authored: Mon Aug 31 12:15:34 2015 +0530 Committer: Koushik Das <[email protected]> Committed: Mon Aug 31 12:15:54 2015 +0530 ---------------------------------------------------------------------- .../com/cloud/agent/manager/MockVmManager.java | 12 ++-- .../cloud/agent/manager/MockVmManagerImpl.java | 45 +++++++++--- .../agent/manager/SimulatorManagerImpl.java | 12 ++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- setup/dev/advanced.cfg | 4 ++ test/integration/smoke/test_scale_vm.py | 74 +++++++++++++++++++- 6 files changed, 124 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53cba7c7/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53cba7c7/server/src/com/cloud/vm/UserVmManagerImpl.java ----------------------------------------------------------------------
