Merge branch 'master' into ui-cisco-asa1000v-support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8811bcc3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8811bcc3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8811bcc3 Branch: refs/heads/master Commit: 8811bcc38deb9b801c28e98780afbe474b149e1e Parents: 1177589 f7fab6f Author: Brian Federle <[email protected]> Authored: Fri May 10 12:52:21 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri May 10 12:52:21 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/async/AsyncJob.java | 2 + api/src/com/cloud/event/EventTypes.java | 24 +- api/src/com/cloud/network/IpAddress.java | 3 + api/src/com/cloud/network/Network.java | 19 +- api/src/com/cloud/network/NetworkModel.java | 7 + .../network/VirtualNetworkApplianceService.java | 2 + .../com/cloud/network/VirtualRouterProvider.java | 3 +- .../com/cloud/network/lb/LoadBalancingRule.java | 83 +- .../network/lb/LoadBalancingRulesService.java | 16 +- .../com/cloud/network/router/VirtualRouter.java | 2 +- api/src/com/cloud/network/rules/LoadBalancer.java | 10 +- .../cloud/network/rules/LoadBalancerContainer.java | 33 + api/src/com/cloud/offering/NetworkOffering.java | 11 + api/src/com/cloud/offering/ServiceOffering.java | 1 + api/src/com/cloud/vm/VirtualMachine.java | 3 +- .../org/apache/cloudstack/api/ApiConstants.java | 6 + api/src/org/apache/cloudstack/api/BaseCmd.java | 7 + .../apache/cloudstack/api/ResponseGenerator.java | 44 +- .../ConfigureInternalLoadBalancerElementCmd.java | 114 ++ .../CreateInternalLoadBalancerElementCmd.java | 116 ++ .../admin/internallb/ListInternalLBVMsCmd.java | 151 +++ .../ListInternalLoadBalancerElementsCmd.java | 99 ++ .../admin/internallb/StartInternalLBVMCmd.java | 120 ++ .../admin/internallb/StopInternalLBVMCmd.java | 123 ++ .../admin/network/CreateNetworkOfferingCmd.java | 15 +- .../router/CreateVirtualRouterElementCmd.java | 21 +- .../api/command/admin/router/ListRoutersCmd.java | 7 +- .../api/command/admin/router/StartRouterCmd.java | 10 +- .../api/command/admin/router/StopRouterCmd.java | 11 +- .../CreateApplicationLoadBalancerCmd.java | 218 ++++ .../loadbalancer/CreateLoadBalancerRuleCmd.java | 6 +- .../DeleteApplicationLoadBalancerCmd.java | 116 ++ .../ListApplicationLoadBalancersCmd.java | 131 ++ .../ApplicationLoadBalancerInstanceResponse.java | 63 + .../response/ApplicationLoadBalancerResponse.java | 142 +++ .../ApplicationLoadBalancerRuleResponse.java | 51 + .../api/response/DomainRouterResponse.java | 13 +- .../InternalLoadBalancerElementResponse.java | 51 + .../api/response/NetworkOfferingResponse.java | 9 + .../response/VirtualRouterProviderResponse.java | 1 + .../InternalLoadBalancerElementService.java | 56 + .../lb/ApplicationLoadBalancerContainer.java | 28 + .../network/lb/ApplicationLoadBalancerRule.java | 24 + .../network/lb/ApplicationLoadBalancerService.java | 42 + .../network/lb/InternalLoadBalancerVMService.java | 34 + .../org/apache/cloudstack/query/QueryService.java | 3 + client/pom.xml | 5 + client/tomcatconf/applicationContext.xml.in | 9 +- client/tomcatconf/commands.properties.in | 18 +- client/tomcatconf/componentContext.xml.in | 2 + client/tomcatconf/nonossComponentContext.xml.in | 2 + client/tomcatconf/simulatorComponentContext.xml.in | 1 + docs/en-US/added-API-commands-4.2.xml | 33 +- .../external-firewalls-and-load-balancers.xml | 1 + docs/en-US/gslb.xml | 592 +++++++--- docs/en-US/images/gslb.png | Bin 184080 -> 60354 bytes docs/en-US/networks.xml | 3 +- .../com/cloud/network/dao/FirewallRulesDao.java | 1 - .../src/com/cloud/network/dao/IPAddressVO.java | 9 +- .../src/com/cloud/network/dao/LoadBalancerDao.java | 10 +- .../com/cloud/network/dao/LoadBalancerDaoImpl.java | 74 +- .../src/com/cloud/network/dao/LoadBalancerVO.java | 18 + .../cloud/network/dao/NetworkServiceMapDao.java | 1 + .../network/dao/NetworkServiceMapDaoImpl.java | 9 + .../src/com/cloud/network/dao/NetworkVO.java | 3 - .../com/cloud/network/rules/FirewallRuleVO.java | 2 - .../cloud/offerings/NetworkOfferingDetailsVO.java | 90 ++ .../src/com/cloud/offerings/NetworkOfferingVO.java | 44 +- .../cloud/offerings/dao/NetworkOfferingDao.java | 4 + .../offerings/dao/NetworkOfferingDaoImpl.java | 24 + .../offerings/dao/NetworkOfferingDetailsDao.java | 31 + .../dao/NetworkOfferingDetailsDaoImpl.java | 79 ++ .../src/com/cloud/upgrade/dao/Upgrade302to40.java | 51 +- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 95 ++- engine/schema/src/com/cloud/vm/dao/NicDao.java | 2 +- engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java | 2 +- .../lb/ApplicationLoadBalancerRuleVO.java | 133 ++ .../lb/dao/ApplicationLoadBalancerRuleDao.java | 35 + .../lb/dao/ApplicationLoadBalancerRuleDaoImpl.java | 115 ++ .../datastore/provider/DefaultHostListener.java | 2 +- .../debian/config/etc/init.d/cloud-early-config | 26 + .../debian/config/etc/iptables/iptables-ilbvm | 33 + .../systemvm/debian/config/opt/cloud/bin/ilb.sh | 211 ++++ .../debian/config/opt/cloud/bin/patchsystemvm.sh | 23 + .../config/opt/cloud/bin/vpc_loadbalancer.sh | 23 + plugins/hypervisors/vmware/pom.xml | 10 + .../hypervisor/vmware/resource/VmwareResource.java | 31 +- .../vmware/resource/VmwareResourceTest.java | 82 ++ .../network/cisco/create-egress-acl-rule.xml | 53 +- .../create-generic-egress-acl-no-protocol-rule.xml | 94 ++ .../cisco/create-generic-egress-acl-rule.xml | 1 - .../network/cisco/create-ingress-acl-rule.xml | 43 +- .../cloud/network/cisco/CiscoVnmcConnection.java | 10 +- .../network/cisco/CiscoVnmcConnectionImpl.java | 65 +- .../cloud/network/element/CiscoVnmcElement.java | 42 +- .../cloud/network/resource/CiscoVnmcResource.java | 12 +- .../network/resource/CiscoVnmcResourceTest.java | 4 +- .../element/ElasticLoadBalancerElement.java | 22 +- .../network/lb/ElasticLoadBalancerManager.java | 4 +- .../network/lb/ElasticLoadBalancerManagerImpl.java | 32 +- .../element/F5ExternalLoadBalancerElement.java | 87 ++- .../network-elements/internal-loadbalancer/pom.xml | 50 + .../element/InternalLoadBalancerElement.java | 548 +++++++++ .../network/lb/InternalLoadBalancerVMManager.java | 90 ++ .../lb/InternalLoadBalancerVMManagerImpl.java | 951 +++++++++++++++ .../ElementChildTestConfiguration.java | 124 ++ .../InternalLbElementServiceTest.java | 190 +++ .../internallbelement/InternalLbElementTest.java | 226 ++++ .../internallbvmmgr/InternalLBVMManagerTest.java | 388 ++++++ .../internallbvmmgr/InternalLBVMServiceTest.java | 291 +++++ .../internallbvmmgr/LbChildTestConfiguration.java | 170 +++ .../test/resources/lb_element.xml | 46 + .../test/resources/lb_mgr.xml | 46 + .../test/resources/lb_svc.xml | 46 + .../cloud/network/element/NetscalerElement.java | 108 ++- plugins/pom.xml | 1 + pom.xml | 1 + server/src/com/cloud/api/ApiDBUtils.java | 10 +- server/src/com/cloud/api/ApiResponseHelper.java | 108 ++- .../src/com/cloud/api/query/QueryManagerImpl.java | 45 +- .../api/query/dao/DomainRouterJoinDaoImpl.java | 9 +- .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 17 +- server/src/com/cloud/configuration/Config.java | 5 +- .../cloud/configuration/ConfigurationManager.java | 10 +- .../configuration/ConfigurationManagerImpl.java | 123 ++- .../network/ExternalLoadBalancerDeviceManager.java | 6 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 33 +- .../ExternalLoadBalancerUsageManagerImpl.java | 34 +- server/src/com/cloud/network/NetworkManager.java | 3 +- .../src/com/cloud/network/NetworkManagerImpl.java | 103 ++- server/src/com/cloud/network/NetworkModelImpl.java | 57 +- .../src/com/cloud/network/NetworkServiceImpl.java | 68 +- .../network/element/VirtualRouterElement.java | 56 +- .../network/firewall/FirewallManagerImpl.java | 77 +- .../com/cloud/network/guru/GuestNetworkGuru.java | 43 +- .../com/cloud/network/lb/LBHealthCheckManager.java | 4 +- .../cloud/network/lb/LBHealthCheckManagerImpl.java | 9 +- .../network/lb/LoadBalancingRulesManager.java | 24 +- .../network/lb/LoadBalancingRulesManagerImpl.java | 402 +++++-- .../router/VirtualNetworkApplianceManager.java | 4 + .../router/VirtualNetworkApplianceManagerImpl.java | 59 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 2 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 15 +- .../com/cloud/server/ConfigurationServerImpl.java | 14 +- .../src/com/cloud/server/ManagementServerImpl.java | 580 +++++++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 16 +- .../lb/ApplicationLoadBalancerManagerImpl.java | 524 ++++++++ .../com/cloud/network/MockNetworkManagerImpl.java | 27 +- .../com/cloud/network/MockNetworkModelImpl.java | 17 + server/test/com/cloud/vm/UserVmManagerTest.java | 83 ++- .../cloud/vpc/MockConfigurationManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 56 +- .../test/com/cloud/vpc/MockNetworkModelImpl.java | 17 + .../vpc/MockVpcVirtualNetworkApplianceManager.java | 14 +- .../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 12 +- .../vpc/dao/MockNetworkServiceMapDaoImpl.java | 6 + .../cloudstack/lb/ApplicationLoadBalancerTest.java | 292 +++++ .../cloudstack/lb/ChildTestConfiguration.java | 103 ++ .../networkoffering/CreateNetworkOfferingTest.java | 21 +- server/test/resources/appLoadBalancer.xml | 43 + services/console-proxy/server/js/ajaxkeys.js | 70 +- setup/db/db/schema-40to410.sql | 4 +- setup/db/db/schema-410to420.sql | 45 +- setup/dev/advanced.cfg | 4 + .../component/test_multiple_ip_ranges.py | 1 + test/integration/smoke/test_guest_vlan_range.py | 15 + test/integration/smoke/test_internal_lb.py | 250 ++++ tools/apidoc/gen_toc.py | 1 + tools/marvin/marvin/deployDataCenter.py | 12 + .../marvin/marvin/sandbox/advanced/advanced_env.py | 5 + tools/marvin/marvin/sandbox/advanced/sandbox.cfg | 209 ++++ ui/scripts/configuration.js | 2 +- ui/scripts/vpc.js | 33 +- ui/scripts/zoneWizard.js | 104 ++ .../cloud/hypervisor/vmware/util/VmwareHelper.java | 26 +- 175 files changed, 10506 insertions(+), 1163 deletions(-) ----------------------------------------------------------------------
