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/26756848 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26756848 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26756848 Branch: refs/heads/master Commit: 267568483b6219c810caa1bd007f6037a73df666 Parents: 51cfc07 1f76d8b Author: Brian Federle <brian.fede...@citrix.com> Authored: Mon Apr 15 10:24:36 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Mon Apr 15 10:24:36 2013 -0700 ---------------------------------------------------------------------- DISCLAIMER | 7 - .../cloud/configuration/ConfigurationService.java | 6 + api/src/com/cloud/event/EventTypes.java | 4 + api/src/com/cloud/network/Network.java | 1 + api/src/com/cloud/network/NetworkService.java | 2 +- api/src/com/cloud/vm/DiskProfile.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../admin/vlan/DedicatePublicIpRangeCmd.java | 108 + .../admin/vlan/ReleasePublicIpRangeCmd.java | 77 + .../command/user/address/AssociateIPAddrCmd.java | 31 +- .../network/ExternalNetworkDeviceManager.java | 1 + client/pom.xml | 10 + client/tomcatconf/applicationContext.xml.in | 6 +- client/tomcatconf/commands.properties.in | 13 + client/tomcatconf/componentContext.xml.in | 1 + client/tomcatconf/nonossComponentContext.xml.in | 20 + debian/cloudstack-awsapi.install | 10 +- debian/rules | 20 +- docs/en-US/Release_Notes.xml | 4414 ++++++++++++++- docs/en-US/hypervisor-kvm-install-flow.xml | 1 + .../subsystem/api/storage/CommandResult.java | 2 +- .../api/storage/ObjectInDataStoreStateMachine.java | 2 +- .../image/motion/DefaultImageMotionStrategy.java | 4 +- .../test/MockHypervisorHostEndPointRpcServer.java | 72 + .../test/MockHypervsiorHostEndPointRpcServer.java | 72 - .../integration-test/test/resource/component.xml | 2 +- .../storage/HypervisorHostEndPointRpcServer.java | 119 + .../storage/HypervsiorHostEndPointRpcServer.java | 119 - .../allocator/AbstractStoragePoolAllocator.java | 2 +- .../allocator/ZoneWideStoragePoolAllocator.java | 2 +- .../storage/datastore/DataObjectManagerImpl.java | 6 +- .../driver/DefaultPrimaryDataStoreDriverImpl.java | 4 +- .../DefaultPrimaryDatastoreProviderImpl.java | 6 +- .../volume/TemplateInstallStrategyImpl.java | 6 +- packaging/centos63/cloud.spec | 19 +- .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 18 +- .../vmware/manager/VmwareManagerImpl.java | 3 +- .../hypervisor/vmware/resource/VmwareResource.java | 13 +- 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 | 1 + .../CloudStackPrimaryDataStoreProviderImpl.java | 6 +- server/src/com/cloud/api/ApiResponseHelper.java | 4 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 65 +- .../cloud/configuration/ConfigurationManager.java | 5 +- .../configuration/ConfigurationManagerImpl.java | 177 +- .../AgentBasedConsoleProxyManager.java.orig | 298 - .../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 +- .../src/com/cloud/network/NetworkServiceImpl.java | 109 +- .../src/com/cloud/server/ManagementServerImpl.java | 3 + .../com/cloud/template/TemplateManagerImpl.java | 2 +- server/src/com/cloud/user/AccountManagerImpl.java | 6 +- .../configuration/ConfigurationManagerTest.java | 413 ++ .../com/cloud/network/MockNetworkManagerImpl.java | 38 +- .../cloud/vpc/MockConfigurationManagerImpl.java | 23 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 54 +- server/test/resources/network-mgr-component.xml | 2 +- setup/db/db/schema-410to420.sql | 38 +- test/integration/component/test_asa1000v_fw.py | 134 + 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 | 1 + tools/build/build_docs.sh | 11 +- tools/marvin/marvin/integration/lib/base.py | 84 +- ui/scripts/dashboard.js | 2 +- ui/scripts/instances.js | 29 +- ui/scripts/network.js | 2 +- ui/scripts/sharedFunctions.js | 28 +- .../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 +- 167 files changed, 15778 insertions(+), 1408 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26756848/ui/scripts/instances.js ----------------------------------------------------------------------
