Merge pull request #1360 from greenqloud/pr-refactor-system-vm-network-creation
Refactor system VM default network creationTwo small commits which moves the retrieval of the default network for the console proxy and the SSVM into a separate protected method. It's a small change that makes the code more readable/maintainable and also makes the class more suitable for overriding should one want to do this. It's forward-ported from our 4.2 branch. No new tests since this should not change any functionality, and thus should be covered by the existing unit tests. Now on the master branch (#1359 was on the wrong branch). * pr/1360: Refactor ssvm default network retrieval. Refactor console proxy default network retrieval. Signed-off-by: Will Stevens <williamstev...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a6e1644 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a6e1644 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a6e1644 Branch: refs/heads/master Commit: 6a6e164448c0f7fc4f83e4a51e16d0892522a8f7 Parents: c122f4c 8971875 Author: Will Stevens <williamstev...@gmail.com> Authored: Wed May 25 23:03:31 2016 -0400 Committer: Will Stevens <williamstev...@gmail.com> Committed: Wed May 25 23:03:32 2016 -0400 ---------------------------------------------------------------------- .../consoleproxy/ConsoleProxyManagerImpl.java | 90 +++++++-- .../consoleproxy/ConsoleProxyManagerTest.java | 159 +++++++++++++++ .../SecondaryStorageManagerImpl.java | 92 +++++++-- .../SecondaryStorageManagerTest.java | 192 +++++++++++++++++++ 4 files changed, 495 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a6e1644/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a6e1644/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java ----------------------------------------------------------------------
