Updated Branches: refs/heads/master 1fb80fc6c -> 17b11d735
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/17b11d73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/17b11d73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/17b11d73 Branch: refs/heads/master Commit: 17b11d7356a05ef36a2b9263ab9456726d65c146 Parents: eaa05f0 1fb80fc Author: Pranav Saxena <[email protected]> Authored: Tue Nov 27 02:59:11 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Nov 27 02:59:11 2012 +0530 ---------------------------------------------------------------------- .../com/cloud/agent/api/CheckNetworkCommand.java | 8 +- api/src/com/cloud/agent/api/SnapshotCommand.java | 54 +- .../cloud/agent/api/AgentControlAnswerTest.java | 32 - .../cloud/agent/api/AgentControlCommandTest.java | 31 - api/test/com/cloud/agent/api/AnswerTest.java | 67 -- .../com/cloud/agent/api/AttachIsoCommandTest.java | 77 -- .../cloud/agent/api/AttachVolumeAnswerTest.java | 59 -- .../cloud/agent/api/AttachVolumeCommandTest.java | 116 --- .../cloud/agent/api/BackupSnapshotAnswerTest.java | 56 -- .../cloud/agent/api/BackupSnapshotCommandTest.java | 220 ------ .../cloud/agent/api/BumpUpPriorityCommandTest.java | 73 -- .../com/cloud/agent/api/CancelCommandTest.java | 43 -- .../com/cloud/agent/api/ChangeAgentAnswerTest.java | 39 - .../cloud/agent/api/ChangeAgentCommandTest.java | 44 -- .../com/cloud/agent/api/CheckHealthAnswerTest.java | 45 -- .../cloud/agent/api/CheckHealthCommandTest.java | 37 - .../cloud/agent/api/CheckNetworkAnswerTest.java | 51 -- .../cloud/agent/api/CheckNetworkCommandTest.java | 39 - .../cloud/agent/api/CheckOnHostCommandTest.java | 366 --------- .../com/cloud/agent/api/SnapshotCommandTest.java | 98 --- .../cloud/api/commands/ActivateProjectCmdTest.java | 86 --- .../api/commands/AddAccountToProjectCmdTest.java | 175 ----- .../com/cloud/api/commands/AddClusterCmdTest.java | 123 ---- .../com/cloud/api/commands/AddHostCmdTest.java | 169 ----- .../commands/AddNetworkServiceProviderCmdTest.java | 118 --- .../api/commands/AddSecondaryStorageCmdTest.java | 120 --- .../com/cloud/api/commands/AddSwiftCmdTest.java | 92 --- .../com/cloud/api/commands/AddVpnUserCmdTest.java | 143 ---- .../agent/api/test/AgentControlAnswerTest.java | 35 + .../agent/api/test/AgentControlCommandTest.java | 33 + .../src/com/cloud/agent/api/test/AnswerTest.java | 73 ++ .../cloud/agent/api/test/AttachIsoCommandTest.java | 80 ++ .../agent/api/test/AttachVolumeAnswerTest.java | 65 ++ .../agent/api/test/AttachVolumeCommandTest.java | 120 +++ .../agent/api/test/BackupSnapshotAnswerTest.java | 75 ++ .../agent/api/test/BackupSnapshotCommandTest.java | 271 +++++++ .../agent/api/test/BumpUpPriorityCommandTest.java | 83 +++ .../cloud/agent/api/test/CancelCommandTest.java | 46 ++ .../agent/api/test/ChangeAgentAnswerTest.java | 44 ++ .../agent/api/test/ChangeAgentCommandTest.java | 50 ++ .../agent/api/test/CheckHealthAnswerTest.java | 49 ++ .../agent/api/test/CheckHealthCommandTest.java | 40 + .../agent/api/test/CheckNetworkAnswerTest.java | 62 ++ .../agent/api/test/CheckNetworkCommandTest.java | 53 ++ .../agent/api/test/CheckOnHostCommandTest.java | 477 ++++++++++++ .../cloud/agent/api/test/SnapshotCommandTest.java | 107 +++ .../api/commands/test/ActivateProjectCmdTest.java | 87 +++ .../commands/test/AddAccountToProjectCmdTest.java | 175 +++++ .../cloud/api/commands/test/AddClusterCmdTest.java | 120 +++ .../cloud/api/commands/test/AddHostCmdTest.java | 165 +++++ .../test/AddNetworkServiceProviderCmdTest.java | 122 +++ .../commands/test/AddSecondaryStorageCmdTest.java | 124 ++++ .../cloud/api/commands/test/AddSwiftCmdTest.java | 97 +++ .../cloud/api/commands/test/AddVpnUserCmdTest.java | 148 ++++ .../debian/config/etc/init.d/cloud-passwd-srvr | 16 +- .../debian/config/etc/iptables/iptables-router | 1 + patches/systemvm/debian/config/etc/iptables/rules | 1 + .../debian/config/opt/cloud/bin/patchsystemvm.sh | 16 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 + .../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh | 2 + .../systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 3 +- pom.xml | 10 + server/src/com/cloud/vm/UserVmManagerImpl.java | 4 +- tools/cli/cloudmonkey/cloudmonkey.py | 3 +- ui/scripts/instanceWizard.js | 58 ++- ui/scripts/network.js | 31 +- ui/scripts/system.js | 16 +- ui/scripts/ui-custom/zoneWizard.js | 4 +- ui/scripts/zoneWizard.js | 570 +++++++++------ 69 files changed, 3288 insertions(+), 2831 deletions(-) ----------------------------------------------------------------------
