cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [06/43] git commit: updated refs/heads/master to 5ce2890
Date Thu, 25 Apr 2013 18:08:24 GMT
Merge branch 'master' into ui-vm-affinity


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96999bec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96999bec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96999bec

Branch: refs/heads/master
Commit: 96999becf91d18243f2b3ca7700b2f04e11950c9
Parents: b6c354a 5f8a278
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Apr 11 15:12:56 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Apr 11 15:12:56 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/async/AsyncJob.java              |    3 +-
 api/src/com/cloud/event/EventTypes.java            |    8 +-
 .../cloud/exception/AffinityConflictException.java |   34 ++
 api/src/com/cloud/server/ManagementService.java    |    4 +-
 api/src/com/cloud/vm/UserVmService.java            |  183 +++++----
 .../apache/cloudstack/affinity/AffinityGroup.java  |   31 ++
 .../affinity/AffinityGroupProcessor.java           |   49 ++
 .../cloudstack/affinity/AffinityGroupResponse.java |  155 +++++++
 .../cloudstack/affinity/AffinityGroupService.java  |   79 ++++
 .../affinity/AffinityGroupTypeResponse.java        |   48 ++
 .../cloudstack/affinity/AffinityProcessorBase.java |   44 ++
 .../org/apache/cloudstack/api/ApiConstants.java    |    5 +-
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    8 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |   18 +-
 .../admin/config/ListDeploymentPlannersCmd.java    |   71 +++
 .../admin/offering/CreateServiceOfferingCmd.java   |    7 +
 .../user/affinitygroup/CreateAffinityGroupCmd.java |  167 +++++++
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |  154 +++++++
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |   67 +++
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |   90 ++++
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |  164 +++++++
 .../api/command/user/vm/DeployVMCmd.java           |   41 ++-
 .../api/response/DeploymentPlannersResponse.java   |   37 ++
 .../cloudstack/api/response/UserVmResponse.java    |   14 +
 .../org/apache/cloudstack/query/QueryService.java  |    4 +
 .../com/cloud/bridge/service/EC2RestServlet.java   |    2 +-
 client/pom.xml                                     |    7 +-
 client/tomcatconf/applicationContext.xml.in        |   10 +
 client/tomcatconf/commands.properties.in           |    7 +
 client/tomcatconf/componentContext.xml.in          |   11 +-
 client/tomcatconf/simulatorComponentContext.xml.in |   23 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |   82 ++--
 .../platform/orchestration/CloudOrchestrator.java  |   63 ++--
 .../host-anti-affinity/pom.xml                     |   33 ++
 .../affinity/HostAntiAffinityProcessor.java        |   91 ++++
 plugins/pom.xml                                    |    1 +
 server/src/com/cloud/api/ApiDBUtils.java           |   28 ++-
 server/src/com/cloud/api/ApiResponseHelper.java    |   69 +++-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |  108 +++++
 .../com/cloud/api/query/ViewResponseHelper.java    |   20 +-
 .../cloud/api/query/dao/AffinityGroupJoinDao.java  |   37 ++
 .../api/query/dao/AffinityGroupJoinDaoImpl.java    |  142 ++++++
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   27 ++
 .../cloud/api/query/vo/AffinityGroupJoinVO.java    |  248 +++++++++++
 .../src/com/cloud/api/query/vo/UserVmJoinVO.java   |   37 ++
 .../cloud/configuration/ConfigurationManager.java  |    3 +-
 .../configuration/ConfigurationManagerImpl.java    |    6 +-
 .../cloud/deploy/DeploymentPlanningManager.java    |   45 ++
 .../deploy/DeploymentPlanningManagerImpl.java      |   96 ++++
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   56 ++-
 server/src/com/cloud/domain/dao/DomainDaoImpl.java |   11 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   22 +-
 .../src/com/cloud/server/ManagementServerImpl.java |  123 ++----
 .../src/com/cloud/service/ServiceOfferingVO.java   |   81 +++--
 server/src/com/cloud/user/AccountManagerImpl.java  |    9 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   69 +++-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  132 +++---
 .../affinity/AffinityGroupServiceImpl.java         |  346 +++++++++++++++
 .../cloudstack/affinity/AffinityGroupVMMapVO.java  |   66 +++
 .../cloudstack/affinity/AffinityGroupVO.java       |  114 +++++
 .../cloudstack/affinity/dao/AffinityGroupDao.java  |   30 ++
 .../affinity/dao/AffinityGroupDaoImpl.java         |  102 +++++
 .../affinity/dao/AffinityGroupVMMapDao.java        |   47 ++
 .../affinity/dao/AffinityGroupVMMapDaoImpl.java    |  167 +++++++
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   16 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    2 +-
 .../affinity/AffinityApiTestConfiguration.java     |  332 ++++++++++++++
 .../cloudstack/affinity/AffinityApiUnitTest.java   |  174 ++++++++
 server/test/resources/affinityContext.xml          |   47 ++
 setup/db/db/schema-410to420.sql                    |  240 ++++++++++-
 test/integration/smoke/test_affinity_groups.py     |  194 ++++++++
 tools/apidoc/gen_toc.py                            |    3 +-
 tools/marvin/marvin/integration/lib/base.py        |   42 ++-
 ui/index.jsp                                       |    2 +-
 ui/scripts/cloudStack.js                           |    4 +-
 ui/scripts/network.js                              |    8 +-
 ui/scripts/regions.js                              |  145 ++++++-
 ui/scripts/ui-custom/regions.js                    |    2 +-
 ui/scripts/ui/widgets/listView.js                  |    6 +-
 utils/src/com/cloud/utils/SerialVersionUID.java    |    1 +
 80 files changed, 4813 insertions(+), 461 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96999bec/ui/index.jsp
----------------------------------------------------------------------


Mime
View raw message