Merge branch 'master' into ui-plugins
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8c1b3404 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8c1b3404 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8c1b3404 Branch: refs/heads/master Commit: 8c1b3404eafd5c06c81cffd7a007c3b18bcf5e25 Parents: 0e3184c eff0716 Author: Brian Federle <[email protected]> Authored: Thu Dec 27 13:48:04 2012 -0800 Committer: Brian Federle <[email protected]> Committed: Thu Dec 27 13:48:04 2012 -0800 ---------------------------------------------------------------------- .../src/com/cloud/agent/MetricsCollector.java | 107 -- .../src/com/cloud/agent/MockVmMetrics.java | 205 --- .../src/com/cloud/agent/MultiCaster.java | 152 -- .../src/com/cloud/agent/MultiCasterListener.java | 22 - .../src/com/cloud/agent/SimulatorCmd.java | 37 - .../src/com/cloud/agent/SimulatorMigrateVmCmd.java | 83 - .../com/cloud/agent/manager/MockAgentManager.java | 66 - .../cloud/agent/manager/MockAgentManagerImpl.java | 468 ----- .../cloud/agent/manager/MockStorageManager.java | 91 - .../agent/manager/MockStorageManagerImpl.java | 1298 -------------- .../src/com/cloud/agent/manager/MockVmManager.java | 83 - .../com/cloud/agent/manager/MockVmManagerImpl.java | 615 ------- .../src/com/cloud/agent/manager/SimulatorInfo.java | 59 - .../com/cloud/agent/manager/SimulatorManager.java | 66 - .../cloud/agent/manager/SimulatorManagerImpl.java | 336 ---- .../com/cloud/api/commands/ConfigureSimulator.java | 82 - .../configuration/SimulatorComponentLibrary.java | 50 - .../src/com/cloud/resource/AgentResourceBase.java | 284 --- .../com/cloud/resource/AgentRoutingResource.java | 363 ---- .../com/cloud/resource/AgentStorageResource.java | 117 -- .../com/cloud/resource/SimulatorDiscoverer.java | 336 ---- .../resource/SimulatorSecondaryDiscoverer.java | 151 -- .../server/ManagementServerSimulatorImpl.java | 32 - .../com/cloud/simulator/MockConfigurationVO.java | 121 -- .../src/com/cloud/simulator/MockHost.java | 62 - .../src/com/cloud/simulator/MockHostVO.java | 276 --- .../src/com/cloud/simulator/MockSecStorageVO.java | 76 - .../com/cloud/simulator/MockSecurityRulesVO.java | 104 -- .../src/com/cloud/simulator/MockStoragePoolVO.java | 102 -- .../src/com/cloud/simulator/MockVMVO.java | 130 -- .../src/com/cloud/simulator/MockVm.java | 45 - .../src/com/cloud/simulator/MockVolumeVO.java | 118 -- .../src/com/cloud/simulator/SimulatorGuru.java | 59 - .../cloud/simulator/SimulatorRuntimeException.java | 41 - .../cloud/simulator/dao/MockConfigurationDao.java | 27 - .../simulator/dao/MockConfigurationDaoImpl.java | 142 -- .../src/com/cloud/simulator/dao/MockHostDao.java | 27 - .../com/cloud/simulator/dao/MockHostDaoImpl.java | 55 - .../com/cloud/simulator/dao/MockSecStorageDao.java | 24 - .../cloud/simulator/dao/MockSecStorageDaoImpl.java | 42 - .../cloud/simulator/dao/MockSecurityRulesDao.java | 27 - .../simulator/dao/MockSecurityRulesDaoImpl.java | 60 - .../cloud/simulator/dao/MockStoragePoolDao.java | 25 - .../simulator/dao/MockStoragePoolDaoImpl.java | 57 - .../src/com/cloud/simulator/dao/MockVMDao.java | 29 - .../src/com/cloud/simulator/dao/MockVMDaoImpl.java | 92 - .../src/com/cloud/simulator/dao/MockVolumeDao.java | 30 - .../com/cloud/simulator/dao/MockVolumeDaoImpl.java | 101 -- api/src/com/cloud/api/response/UserResponse.java | 10 + client/pom.xml | 25 +- client/tomcatconf/commands.properties.in | 2 +- client/tomcatconf/simulator.properties.in | 31 - client/tomcatconf/simulator_commands.properties.in | 19 + developer/developer-prefill.sql | 2 + developer/pom.xml | 134 ++- .../debian/config/etc/init.d/cloud-early-config | 1 + .../debian/config/opt/cloud/bin/ipassoc.sh | 4 +- .../debian/config/opt/cloud/bin/passwd_server | 2 +- .../config/root/redundant_router/disable_pubip.sh | 2 - .../root/redundant_router/enable_pubip.sh.templ | 4 +- .../config/root/redundant_router/master.sh.templ | 6 + .../config/root/redundant_router/services.sh | 68 + .../systemvm/debian/config/root/savepassword.sh | 2 +- plugins/hypervisors/simulator/pom.xml | 45 + .../simulator/resources/components-simulator.xml | 66 + .../src/com/cloud/agent/MetricsCollector.java | 107 ++ .../src/com/cloud/agent/MockVmMetrics.java | 204 +++ .../simulator/src/com/cloud/agent/MultiCaster.java | 152 ++ .../src/com/cloud/agent/MultiCasterListener.java | 22 + .../src/com/cloud/agent/SimulatorCmd.java | 37 + .../src/com/cloud/agent/SimulatorMigrateVmCmd.java | 83 + .../com/cloud/agent/manager/MockAgentManager.java | 64 + .../cloud/agent/manager/MockAgentManagerImpl.java | 459 +++++ .../cloud/agent/manager/MockStorageManager.java | 82 + .../agent/manager/MockStorageManagerImpl.java | 1328 +++++++++++++++ .../src/com/cloud/agent/manager/MockVmManager.java | 84 + .../com/cloud/agent/manager/MockVmManagerImpl.java | 642 +++++++ .../src/com/cloud/agent/manager/SimulatorInfo.java | 59 + .../com/cloud/agent/manager/SimulatorManager.java | 65 + .../cloud/agent/manager/SimulatorManagerImpl.java | 329 ++++ .../com/cloud/api/commands/ConfigureSimulator.java | 82 + .../configuration/SimulatorComponentLibrary.java | 50 + .../src/com/cloud/resource/AgentResourceBase.java | 284 +++ .../com/cloud/resource/AgentRoutingResource.java | 363 ++++ .../com/cloud/resource/AgentStorageResource.java | 117 ++ .../com/cloud/resource/SimulatorDiscoverer.java | 336 ++++ .../resource/SimulatorSecondaryDiscoverer.java | 178 ++ .../server/ManagementServerSimulatorImpl.java | 32 + .../com/cloud/simulator/MockConfigurationVO.java | 120 ++ .../src/com/cloud/simulator/MockHost.java | 62 + .../src/com/cloud/simulator/MockHostVO.java | 276 +++ .../src/com/cloud/simulator/MockSecStorageVO.java | 76 + .../com/cloud/simulator/MockSecurityRulesVO.java | 104 ++ .../src/com/cloud/simulator/MockStoragePoolVO.java | 102 ++ .../src/com/cloud/simulator/MockVMVO.java | 140 ++ .../simulator/src/com/cloud/simulator/MockVm.java | 47 + .../src/com/cloud/simulator/MockVolumeVO.java | 118 ++ .../src/com/cloud/simulator/SimulatorGuru.java | 59 + .../cloud/simulator/SimulatorRuntimeException.java | 41 + .../cloud/simulator/dao/MockConfigurationDao.java | 27 + .../simulator/dao/MockConfigurationDaoImpl.java | 142 ++ .../src/com/cloud/simulator/dao/MockHostDao.java | 27 + .../com/cloud/simulator/dao/MockHostDaoImpl.java | 55 + .../com/cloud/simulator/dao/MockSecStorageDao.java | 24 + .../cloud/simulator/dao/MockSecStorageDaoImpl.java | 42 + .../cloud/simulator/dao/MockSecurityRulesDao.java | 27 + .../simulator/dao/MockSecurityRulesDaoImpl.java | 60 + .../cloud/simulator/dao/MockStoragePoolDao.java | 25 + .../simulator/dao/MockStoragePoolDaoImpl.java | 57 + .../src/com/cloud/simulator/dao/MockVMDao.java | 29 + .../src/com/cloud/simulator/dao/MockVMDaoImpl.java | 92 + .../src/com/cloud/simulator/dao/MockVolumeDao.java | 30 + .../com/cloud/simulator/dao/MockVolumeDaoImpl.java | 101 ++ .../xen/resource/CitrixResourceBase.java | 9 +- plugins/pom.xml | 12 + pom.xml | 2 - server/src/com/cloud/api/ApiDBUtils.java | 4 + server/src/com/cloud/api/ApiResponseHelper.java | 3 +- .../router/VirtualNetworkApplianceManagerImpl.java | 32 +- server/src/com/cloud/vm/dao/NicDao.java | 2 + server/src/com/cloud/vm/dao/NicDaoImpl.java | 8 + setup/db/create-schema-simulator.sql | 2 + setup/db/templates.simulator.sql | 437 +----- tools/cli/cloudmonkey/cloudmonkey.py | 5 +- tools/marvin/marvin/jsonHelper.py | 2 +- .../marvin/sandbox/demo/simulator/simulator.cfg | 4 - ui/css/cloudstack3.css | 45 +- ui/images/icons.png | Bin 49385 -> 50745 bytes ui/scripts/accounts.js | 32 +- ui/scripts/sharedFunctions.js | 16 + ui/scripts/ui/widgets/listView.js | 2 + utils/conf/db.properties | 11 + 132 files changed, 7558 insertions(+), 7510 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8c1b3404/ui/css/cloudstack3.css ----------------------------------------------------------------------
