Merge branch 'master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3fdb61fd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3fdb61fd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3fdb61fd Branch: refs/heads/ui-restyle Commit: 3fdb61fddeacea7eb00388a8308bfe0268d0ca04 Parents: 418ebb2 56129c3 Author: Brian Federle <[email protected]> Authored: Tue Oct 15 13:19:45 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Oct 15 13:19:45 2013 -0700 ---------------------------------------------------------------------- agent/scripts/_run.sh | 26 - agent/scripts/agent.sh | 31 - agent/scripts/run.sh | 20 - .../user/snapshot/RevertSnapshotCmd.java | 11 +- .../classes/resources/messages.properties | 3 + client/tomcatconf/commands.properties.in | 2 +- core/src/com/cloud/agent/transport/Request.java | 16 +- .../api/storage/DataMotionStrategy.java | 4 +- .../subsystem/api/storage/SnapshotStrategy.java | 2 +- .../subsystem/api/storage/StrategyPriority.java | 99 +++ .../api/storage/StrategyPriorityTest.java | 116 +++ .../com/cloud/agent/manager/AgentAttache.java | 15 +- .../cloud/agent/manager/AgentManagerImpl.java | 8 +- .../agent/manager/ClusteredAgentAttache.java | 8 +- .../manager/ClusteredAgentManagerImpl.java | 7 +- .../manager/ClusteredDirectAgentAttache.java | 4 +- .../agent/manager/ConnectedAgentAttache.java | 6 +- .../cloud/agent/manager/DirectAgentAttache.java | 14 +- .../com/cloud/agent/manager/DummyAttache.java | 4 +- .../orchestration/VolumeOrchestrator.java | 25 +- .../cloud/upgrade/DatabaseUpgradeChecker.java | 78 +- .../com/cloud/upgrade/dao/Upgrade420to421.java | 217 +++++ .../com/cloud/upgrade/dao/Upgrade420to430.java | 70 -- .../com/cloud/upgrade/dao/Upgrade421to430.java | 70 ++ .../motion/AncientDataMotionStrategy.java | 10 +- .../storage/motion/DataMotionServiceImpl.java | 25 +- .../storage/test/MockStorageMotionStrategy.java | 23 +- .../cloudstack/storage/test/SnapshotTest.java | 26 +- .../storage/snapshot/SnapshotServiceImpl.java | 59 ++ .../snapshot/XenserverSnapshotStrategy.java | 5 +- plugins/hypervisors/kvm/agent-descriptor.xml | 68 -- plugins/hypervisors/kvm/pom.xml | 46 - .../motion/SimulatorDataMotionStrategy.java | 22 +- .../motion/VmwareStorageMotionStrategy.java | 12 +- .../motion/VmwareStorageMotionStrategyTest.java | 28 +- .../motion/XenServerStorageMotionStrategy.java | 18 +- scripts/vm/hypervisor/xenserver/xcposs/vmops | 3 + .../com/cloud/api/query/vo/AccountJoinVO.java | 319 +------ .../cloud/api/query/vo/AffinityGroupJoinVO.java | 79 -- .../com/cloud/api/query/vo/AsyncJobJoinVO.java | 142 +-- .../src/com/cloud/api/query/vo/BaseViewVO.java | 3 - .../cloud/api/query/vo/DataCenterJoinVO.java | 118 +-- .../cloud/api/query/vo/DiskOfferingJoinVO.java | 109 +-- .../cloud/api/query/vo/DomainRouterJoinVO.java | 531 +---------- .../src/com/cloud/api/query/vo/EventJoinVO.java | 109 +-- .../src/com/cloud/api/query/vo/HostJoinVO.java | 181 +--- .../cloud/api/query/vo/ImageStoreJoinVO.java | 68 +- .../cloud/api/query/vo/InstanceGroupJoinVO.java | 74 -- .../api/query/vo/ProjectAccountJoinVO.java | 90 +- .../api/query/vo/ProjectInvitationJoinVO.java | 72 -- .../com/cloud/api/query/vo/ProjectJoinVO.java | 104 +-- .../cloud/api/query/vo/ResourceTagJoinVO.java | 87 -- .../cloud/api/query/vo/SecurityGroupJoinVO.java | 147 ---- .../api/query/vo/ServiceOfferingJoinVO.java | 123 --- .../cloud/api/query/vo/StoragePoolJoinVO.java | 120 --- .../com/cloud/api/query/vo/TemplateJoinVO.java | 542 +----------- .../cloud/api/query/vo/UserAccountJoinVO.java | 124 +-- .../com/cloud/api/query/vo/UserVmJoinVO.java | 869 +----------------- .../com/cloud/api/query/vo/VolumeJoinVO.java | 406 --------- server/src/com/cloud/configuration/Config.java | 3 +- .../network/element/VirtualRouterElement.java | 6 +- .../com/cloud/server/ManagementServerImpl.java | 11 +- .../storage/snapshot/SnapshotManagerImpl.java | 33 +- setup/db/db/schema-420to421.sql | 26 + setup/db/db/schema-420to430-cleanup.sql | 22 - setup/db/db/schema-420to430.sql | 448 ---------- setup/db/db/schema-421to430-cleanup.sql | 22 + setup/db/db/schema-421to430.sql | 446 ++++++++++ systemvm/conf/agent.properties | 16 + systemvm/conf/agent.properties.ssvm | 17 + test/integration/component/test_accounts.py | 27 +- test/integration/component/test_blocker_bugs.py | 52 +- test/integration/component/test_haproxy.py | 874 +++++++++++++++++++ .../component/test_shared_networks.py | 8 +- test/integration/component/test_snapshot_gc.py | 17 +- test/integration/component/test_stopped_vm.py | 24 +- test/integration/smoke/test_snapshots.py | 76 +- tools/marvin/marvin/integration/lib/base.py | 3 +- tools/marvin/marvin/integration/lib/utils.py | 20 +- ui/dictionary.jsp | 3 + ui/scripts/storage.js | 34 + ui/scripts/system.js | 203 +++-- .../com/cloud/utils/PasswordGeneratorTest.java | 16 + .../com/cloud/hypervisor/vmware/mo/HostMO.java | 2 +- 84 files changed, 2581 insertions(+), 5446 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fdb61fd/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fdb61fd/ui/dictionary.jsp ----------------------------------------------------------------------
