cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [18/23] git commit: updated refs/heads/master to fc08c23
Date Fri, 19 Apr 2013 17:28:07 GMT
Merge branch 'master' into ui-mixed-zone-management


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

Branch: refs/heads/master
Commit: 5d05e49fa650c58301ee1b492e160e07f85e4294
Parents: dd62b3d 90e8158
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Apr 16 11:45:05 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Apr 16 11:45:05 2013 -0700

----------------------------------------------------------------------
 DISCLAIMER                                         |    7 -
 .../agent/api/DeleteSnapshotBackupCommand.java     |    6 +-
 api/src/com/cloud/async/AsyncJob.java              |    3 +-
 .../cloud/configuration/ConfigurationService.java  |    6 +
 api/src/com/cloud/event/EventTypes.java            |   12 +-
 .../cloud/exception/AffinityConflictException.java |   34 +
 api/src/com/cloud/network/Network.java             |   15 +-
 api/src/com/cloud/network/NetworkService.java      |    2 +-
 api/src/com/cloud/offering/NetworkOffering.java    |    2 +
 api/src/com/cloud/server/ManagementService.java    |    4 +-
 api/src/com/cloud/vm/DiskProfile.java              |    2 +-
 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    |    6 +-
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    8 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |   18 +-
 .../command/admin/cluster/UpdateClusterCmd.java    |   15 +-
 .../admin/config/ListDeploymentPlannersCmd.java    |   71 +
 .../admin/offering/CreateServiceOfferingCmd.java   |    7 +
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |  108 +
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |   77 +
 .../command/user/address/AssociateIPAddrCmd.java   |   31 +-
 .../user/affinitygroup/CreateAffinityGroupCmd.java |  167 +
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |  154 +
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |   67 +
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |   90 +
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |  164 +
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |    3 +
 .../api/command/user/vm/DeployVMCmd.java           |   41 +-
 .../api/response/DeploymentPlannersResponse.java   |   37 +
 .../api/response/GlobalLoadBalancerResponse.java   |    8 +
 .../cloudstack/api/response/UserVmResponse.java    |   14 +
 .../network/ExternalNetworkDeviceManager.java      |    1 +
 .../org/apache/cloudstack/query/QueryService.java  |    4 +
 .../com/cloud/bridge/service/EC2RestServlet.java   |    2 +-
 build/replace.properties                           |    1 +
 client/pom.xml                                     |   17 +-
 client/tomcatconf/applicationContext.xml.in        |   23 +-
 client/tomcatconf/commands.properties.in           |   20 +
 client/tomcatconf/componentContext.xml.in          |   20 +-
 client/tomcatconf/nonossComponentContext.xml.in    |   28 +
 client/tomcatconf/simulatorComponentContext.xml.in |   30 +-
 core/src/com/cloud/vm/VmDetailConstants.java       |    1 +
 debian/cloudstack-awsapi.install                   |   10 +-
 debian/rules                                       |   20 +-
 docs/en-US/Admin_Guide.xml                         |    2 +-
 docs/en-US/Book_Info.xml                           |    2 +-
 docs/en-US/CloudStack_Nicira_NVP_Guide.xml         |    2 +-
 docs/en-US/Developers_Guide.xml                    |    2 +-
 docs/en-US/Installation_Guide.xml                  |    2 +-
 docs/en-US/Release_Notes.xml                       | 4413 ++++++++++++++-
 docs/en-US/hypervisor-kvm-install-flow.xml         |    1 +
 docs/en-US/images/VMSnapshotButton.png             |  Bin 0 -> 967 bytes
 docs/en-US/images/revert-vm.png                    |  Bin 0 -> 860 bytes
 docs/en-US/ipv6-support.xml                        |    4 +-
 docs/en-US/virtual-machines.xml                    |    1 +
 docs/en-US/vm-snapshots.xml                        |  146 +
 .../subsystem/api/storage/CommandResult.java       |    2 +-
 .../api/storage/ObjectInDataStoreStateMachine.java |    2 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |   82 +-
 .../platform/orchestration/CloudOrchestrator.java  |   63 +-
 .../driver/AncientImageDataStoreDriverImpl.java    |   10 +-
 .../image/motion/DefaultImageMotionStrategy.java   |    4 +-
 .../cloudstack/storage/test/DirectAgentTest.java   |    4 +-
 .../test/MockHypervisorHostEndPointRpcServer.java  |   72 +
 .../test/MockHypervsiorHostEndPointRpcServer.java  |   72 -
 .../integration-test/test/resource/component.xml   |    2 +-
 .../storage/snapshot/SnapshotObject.java           |    2 +-
 .../storage/HypervisorHostEndPointRpcServer.java   |  119 +
 .../storage/HypervsiorHostEndPointRpcServer.java   |  119 -
 .../allocator/AbstractStoragePoolAllocator.java    |    2 +-
 .../allocator/ZoneWideStoragePoolAllocator.java    |    2 +-
 .../command/CreateVolumeFromBaseImageCommand.java  |    6 +-
 .../storage/datastore/DataObjectManagerImpl.java   |    6 +-
 .../provider/DataStoreProviderManagerImpl.java     |    4 +-
 .../storage/to/ImageOnPrimaryDataStoreTO.java      |   44 +
 .../storage/to/ImageOnPrimayDataStoreTO.java       |   44 -
 .../driver/DefaultPrimaryDataStoreDriverImpl.java  |    4 +-
 .../DefaultPrimaryDatastoreProviderImpl.java       |    6 +-
 .../volume/TemplateInstallStrategyImpl.java        |    6 +-
 packaging/centos63/cloud-usage.rc                  |    2 +-
 packaging/centos63/cloud.spec                      |   14 +-
 packaging/centos63/replace.properties              |    2 +-
 .../host-anti-affinity/pom.xml                     |   33 +
 .../affinity/HostAntiAffinityProcessor.java        |   93 +
 .../cloudstack/syslog/AlertsSyslogAppender.java    |    4 +-
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |   37 +-
 .../vmware/manager/VmwareManagerImpl.java          |    3 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   31 +-
 .../xen/resource/XenServerStorageResource.java     |    4 +-
 plugins/network-elements/cisco-vnmc/pom.xml        |   42 +
 .../scripts/network/cisco/assoc-asa1000v.xml       |   34 +
 .../network/cisco/associate-acl-policy-set.xml     |   37 +
 .../network/cisco/associate-dhcp-policy.xml        |   34 +
 .../network/cisco/associate-dhcp-server.xml        |   32 +
 .../network/cisco/associate-nat-policy-set.xml     |   35 +
 .../network/cisco/associate-route-policy.xml       |   33 +
 .../network/cisco/create-acl-policy-ref.xml        |   38 +
 .../network/cisco/create-acl-policy-set.xml        |   36 +
 .../scripts/network/cisco/create-acl-policy.xml    |   35 +
 .../network/cisco/create-acl-rule-for-dnat.xml     |   82 +
 .../network/cisco/create-acl-rule-for-pf.xml       |  156 +
 .../scripts/network/cisco/create-dhcp-policy.xml   |   72 +
 .../scripts/network/cisco/create-dnat-rule.xml     |   91 +
 .../network/cisco/create-edge-device-profile.xml   |   32 +
 .../cisco/create-edge-device-route-policy.xml      |   30 +
 .../network/cisco/create-edge-device-route.xml     |   35 +
 .../scripts/network/cisco/create-edge-firewall.xml |   89 +
 .../network/cisco/create-edge-security-profile.xml |   41 +
 .../network/cisco/create-egress-acl-rule.xml       |  201 +
 .../cisco/create-generic-egress-acl-rule.xml       |  122 +
 .../cisco/create-generic-ingress-acl-rule.xml      |  121 +
 .../network/cisco/create-ingress-acl-rule.xml      |  201 +
 .../scripts/network/cisco/create-ip-pool.xml       |   58 +
 .../network/cisco/create-nat-policy-ref.xml        |   38 +
 .../network/cisco/create-nat-policy-set.xml        |   37 +
 .../scripts/network/cisco/create-nat-policy.xml    |   33 +
 .../scripts/network/cisco/create-pf-rule.xml       |  166 +
 .../scripts/network/cisco/create-port-pool.xml     |   72 +
 .../network/cisco/create-source-nat-pool.xml       |   58 +
 .../network/cisco/create-source-nat-rule.xml       |  103 +
 .../scripts/network/cisco/create-tenant.xml        |   29 +
 .../scripts/network/cisco/create-vdc.xml           |   30 +
 .../network/cisco/delete-acl-policy-set.xml        |   30 +
 .../scripts/network/cisco/delete-acl-policy.xml    |   33 +
 .../scripts/network/cisco/delete-edge-firewall.xml |   30 +
 .../network/cisco/delete-edge-security-profile.xml |   38 +
 .../network/cisco/delete-nat-policy-set.xml        |   30 +
 .../scripts/network/cisco/delete-nat-policy.xml    |   33 +
 .../scripts/network/cisco/delete-rule.xml          |   31 +
 .../scripts/network/cisco/delete-tenant.xml        |   30 +
 .../scripts/network/cisco/delete-vdc.xml           |   30 +
 .../scripts/network/cisco/disassoc-asa1000v.xml    |   30 +
 .../scripts/network/cisco/list-acl-policies.xml    |   31 +
 .../scripts/network/cisco/list-children.xml        |   27 +
 .../scripts/network/cisco/list-nat-policies.xml    |   31 +
 .../network/cisco/list-policyrefs-in-policyset.xml |   31 +
 .../scripts/network/cisco/list-tenants.xml         |   26 +
 .../network/cisco/list-unassigned-asa1000v.xml     |   39 +
 .../cisco-vnmc/scripts/network/cisco/login.xml     |   20 +
 ...AssociateAsaWithLogicalEdgeFirewallCommand.java |   53 +
 .../api/CleanupLogicalEdgeFirewallCommand.java     |   43 +
 .../agent/api/ConfigureNexusVsmForAsaCommand.java  |   95 +
 .../api/CreateLogicalEdgeFirewallCommand.java      |   94 +
 .../api/commands/AddCiscoAsa1000vResourceCmd.java  |  116 +
 .../api/commands/AddCiscoVnmcResourceCmd.java      |  115 +
 .../commands/DeleteCiscoAsa1000vResourceCmd.java   |   93 +
 .../api/commands/DeleteCiscoVnmcResourceCmd.java   |   93 +
 .../commands/ListCiscoAsa1000vResourcesCmd.java    |  110 +
 .../api/commands/ListCiscoVnmcResourcesCmd.java    |  106 +
 .../response/CiscoAsa1000vResourceResponse.java    |   88 +
 .../api/response/CiscoVnmcResourceResponse.java    |   75 +
 .../cloud/network/cisco/CiscoAsa1000vDevice.java   |   39 +
 .../cloud/network/cisco/CiscoAsa1000vDeviceVO.java |  101 +
 .../cloud/network/cisco/CiscoVnmcConnection.java   |  196 +
 .../network/cisco/CiscoVnmcConnectionImpl.java     | 1415 +++++
 .../cloud/network/cisco/CiscoVnmcController.java   |   40 +
 .../cloud/network/cisco/CiscoVnmcControllerVO.java |  102 +
 .../cloud/network/cisco/NetworkAsa1000vMap.java    |   31 +
 .../cloud/network/cisco/NetworkAsa1000vMapVO.java  |   73 +
 .../com/cloud/network/dao/CiscoAsa1000vDao.java    |   33 +
 .../cloud/network/dao/CiscoAsa1000vDaoImpl.java    |   63 +
 .../src/com/cloud/network/dao/CiscoVnmcDao.java    |   32 +
 .../com/cloud/network/dao/CiscoVnmcDaoImpl.java    |   51 +
 .../cloud/network/dao/NetworkAsa1000vMapDao.java   |   28 +
 .../network/dao/NetworkAsa1000vMapDaoImpl.java     |   61 +
 .../network/element/CiscoAsa1000vService.java      |   43 +
 .../cloud/network/element/CiscoVnmcElement.java    |  928 +++
 .../network/element/CiscoVnmcElementService.java   |   42 +
 .../cloud/network/resource/CiscoVnmcResource.java  |  780 +++
 .../contrib/ssl/EasySSLProtocolSocketFactory.java  |  232 +
 .../contrib/ssl/EasyX509TrustManager.java          |  114 +
 .../network/cisco/CiscoVnmcConnectionTest.java     |  248 +
 .../network/element/CiscoVnmcElementTest.java      |  401 ++
 .../network/resource/CiscoVnmcResourceTest.java    |  285 +
 .../dns-notifier/resources/components-example.xml  |    2 +-
 .../element/F5ExternalLoadBalancerElement.java     |   15 +-
 .../element/JuniperSRXExternalFirewallElement.java |   58 +-
 .../cloud/network/element/NetscalerElement.java    |    3 +-
 plugins/pom.xml                                    |    2 +
 .../CloudStackPrimaryDataStoreProviderImpl.java    |    6 +-
 server/pom.xml                                     |    2 -
 server/src/com/cloud/api/ApiDBUtils.java           |   28 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |   75 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |  177 +-
 .../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 +
 server/src/com/cloud/configuration/Config.java     |    3 +
 .../cloud/configuration/ConfigurationManager.java  |    8 +-
 .../configuration/ConfigurationManagerImpl.java    |  216 +-
 .../AgentBasedConsoleProxyManager.java             |    8 +-
 .../AgentBasedConsoleProxyManager.java.orig        |  298 -
 .../src/com/cloud/consoleproxy/AgentHookBase.java  |   50 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   21 +-
 .../cloud/deploy/DeploymentPlanningManager.java    |   45 +
 .../deploy/DeploymentPlanningManagerImpl.java      |  106 +
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   56 +-
 server/src/com/cloud/domain/dao/DomainDaoImpl.java |   11 +-
 .../cloud/network/ExteralIpAddressAllocator.java   |  165 -
 .../cloud/network/ExternalIpAddressAllocator.java  |  165 +
 server/src/com/cloud/network/IpAddrAllocator.java  |    2 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |  317 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   26 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |  109 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   16 +-
 .../src/com/cloud/offerings/NetworkOfferingVO.java |   12 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |   22 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   25 +-
 server/src/com/cloud/server/ManagementServer.java  |    3 +
 .../src/com/cloud/server/ManagementServerImpl.java |  199 +-
 .../src/com/cloud/service/ServiceOfferingVO.java   |   81 +-
 .../ConsoleProxyPasswordBasedEncryptor.java        |   99 +-
 .../src/com/cloud/servlet/ConsoleProxyServlet.java |   16 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   11 +-
 .../com/cloud/template/TemplateManagerImpl.java    |    2 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |   44 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   15 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   73 +-
 .../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 +
 .../configuration/ConfigurationManagerTest.java    |  413 ++
 .../com/cloud/network/MockNetworkManagerImpl.java  |   38 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   16 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   25 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   54 +-
 .../affinity/AffinityApiTestConfiguration.java     |  344 ++
 .../cloudstack/affinity/AffinityApiUnitTest.java   |  187 +
 .../networkoffering/ChildTestConfiguration.java    |    7 +-
 .../networkoffering/CreateNetworkOfferingTest.java |    1 -
 server/test/resources/affinityContext.xml          |   47 +
 server/test/resources/network-mgr-component.xml    |    2 +-
 .../ConsoleProxyPasswordBasedEncryptor.java        |  253 +-
 setup/db/db/schema-410to420.sql                    |  277 +-
 test/integration/component/test_asa1000v_fw.py     |  134 +
 test/integration/smoke/test_ScaleVm.py             |    4 +-
 test/integration/smoke/test_affinity_groups.py     |  194 +
 test/integration/smoke/test_iso.py                 |    3 +-
 test/integration/smoke/test_network.py             |    4 +-
 test/integration/smoke/test_public_ip_range.py     |  173 +
 test/integration/smoke/test_routers.py             |    2 +-
 test/integration/smoke/test_templates.py           |    3 +-
 test/integration/smoke/test_vm_life_cycle.py       |    2 +-
 test/integration/smoke/test_volumes.py             |   55 +-
 tools/apidoc/gen_toc.py                            |    4 +-
 tools/build/build_asf.sh                           |   12 +-
 tools/build/build_docs.sh                          |   19 +-
 tools/cli/cloudmonkey/requester.py                 |    4 +-
 tools/marvin/marvin/integration/lib/base.py        |  122 +-
 ui/css/cloudstack3.css                             |    6 +-
 ui/index.jsp                                       |    2 +-
 ui/scripts/cloudStack.js                           |    4 +-
 ui/scripts/dashboard.js                            |    2 +-
 ui/scripts/instances.js                            |   29 +-
 ui/scripts/network.js                              |   10 +-
 ui/scripts/regions.js                              |  169 +-
 ui/scripts/sharedFunctions.js                      |   28 +-
 ui/scripts/system.js                               |    5 +-
 ui/scripts/ui-custom/regions.js                    |    2 +-
 ui/scripts/ui/widgets/listView.js                  |    6 +-
 usage/pom.xml                                      |    5 +
 usage/src/com/cloud/usage/UsageServer.java         |   16 +-
 utils/src/com/cloud/utils/SerialVersionUID.java    |    1 +
 .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java  |   22 +
 .../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java |  213 +
 .../cloud/utils/component/ComponentContext.java    |    4 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |   45 +-
 281 files changed, 21503 insertions(+), 2184 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d05e49f/ui/css/cloudstack3.css
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d05e49f/ui/scripts/network.js
----------------------------------------------------------------------


Mime
View raw message