incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [22/24] git commit: Merge branch 'master' into api_limit
Date Fri, 18 Jan 2013 19:15:35 GMT
Merge branch 'master' into api_limit


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

Branch: refs/heads/master
Commit: 2fd1d476b4066cb341b23e965b90e476ebb5d280
Parents: 9ab7960 b120e19
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Jan 17 21:23:50 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Jan 17 21:23:50 2013 -0800

----------------------------------------------------------------------
 api/src/com/cloud/network/NetworkModel.java        |  250 +
 api/src/com/cloud/network/NetworkService.java      |   38 +-
 api/src/com/cloud/network/element/IpDeployer.java  |    3 +-
 .../element/RemoteAccessVPNServiceProvider.java    |    3 +-
 .../element/Site2SiteVpnServiceProvider.java       |    4 +-
 client/tomcatconf/components.xml.in                |   53 +
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |    4 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |    4 +-
 .../vmware/manager/VmwareManagerImpl.java          |    4 +-
 .../element/ElasticLoadBalancerElement.java        |    4 +-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |   21 +-
 .../element/F5ExternalLoadBalancerElement.java     |    7 +-
 .../element/JuniperSRXExternalFirewallElement.java |    8 +-
 .../cloud/network/element/NetscalerElement.java    |    8 +-
 .../cloud/network/element/NiciraNvpElement.java    |  111 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |    9 +-
 .../network/element/NiciraNvpElementTest.java      |    9 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |   13 +-
 .../src/com/cloud/network/element/OvsElement.java  |    2 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |   19 +-
 server/src/com/cloud/acl/DomainChecker.java        |   24 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   23 +-
 .../cloud/agent/manager/DirectAgentAttache.java    |   13 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   25 +-
 server/src/com/cloud/api/ApiDispatcher.java        |    7 +-
 server/src/com/cloud/api/ApiServer.java            |    4 +-
 .../com/cloud/async/AsyncJobExecutorContext.java   |    4 +-
 .../cloud/async/AsyncJobExecutorContextImpl.java   |    9 +-
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |    2 +-
 server/src/com/cloud/configuration/Config.java     |    2 +-
 .../configuration/ConfigurationManagerImpl.java    |   64 +-
 .../configuration/DefaultComponentLibrary.java     |    4 +
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   15 +-
 .../cloud/ha/ManagementIPSystemVMInvestigator.java |    4 +-
 .../src/com/cloud/ha/UserVmDomRInvestigator.java   |    4 +-
 .../kvm/discoverer/KvmServerDiscoverer.java        |    4 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |    8 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   10 +-
 .../ExternalLoadBalancerUsageManagerImpl.java      |    2 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |    2 +-
 server/src/com/cloud/network/NetworkManager.java   |  231 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  | 5024 ++-------------
 server/src/com/cloud/network/NetworkModelImpl.java | 1833 ++++++
 .../src/com/cloud/network/NetworkRuleApplier.java  |   28 +
 .../src/com/cloud/network/NetworkServiceImpl.java  | 2885 +++++++++
 .../network/element/CloudZonesNetworkElement.java  |    4 +-
 .../network/element/VirtualRouterElement.java      |   13 +-
 .../network/element/VpcVirtualRouterElement.java   |   13 +-
 .../network/firewall/FirewallManagerImpl.java      |   81 +-
 .../com/cloud/network/guru/ControlNetworkGuru.java |    4 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |    5 +-
 .../network/guru/DirectPodBasedNetworkGuru.java    |    2 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |   14 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   11 +-
 .../com/cloud/network/guru/PrivateNetworkGuru.java |    4 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   69 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |  104 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   59 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   45 +-
 .../network/security/SecurityGroupManagerImpl.java |    9 +-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    4 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |   34 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   28 +-
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |   12 +-
 server/src/com/cloud/resource/DiscovererBase.java  |    4 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    4 +-
 .../secondary/SecondaryStorageManagerImpl.java     |   12 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   56 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   15 +-
 .../test/com/cloud/alert/MockAlertManagerImpl.java |   87 +
 .../com/cloud/network/MockFirewallManagerImpl.java |  202 +
 .../com/cloud/network/MockNetworkManagerImpl.java  |  662 +--
 .../com/cloud/network/MockNetworkModelImpl.java    |  800 +++
 .../com/cloud/network/MockRulesManagerImpl.java    |  312 +
 .../test/com/cloud/network/NetworkManagerTest.java |   66 +
 .../NetworkManagerTestComponentLibrary.java        |  104 +
 .../test/com/cloud/network/NetworkModelTest.java   |   88 +
 .../network/firewall/FirewallManagerTest.java      |  177 +
 .../security/SecurityGroupManagerImpl2Test.java    |    2 +
 .../vpn/MockRemoteAccessVPNServiceProvider.java    |   78 +
 .../com/cloud/network/vpn/RemoteAccessVpnTest.java |  109 +
 .../cloud/resource/MockResourceManagerImpl.java    |  601 ++
 .../test/com/cloud/user/MockDomainManagerImpl.java |    4 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 1243 ++--
 .../cloud/vpc/MockSite2SiteVpnServiceProvider.java |   86 +
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |  391 ++
 server/test/com/cloud/vpc/Site2SiteVpnTest.java    |   98 +
 server/test/resources/network-mgr-component.xml    |  184 +
 setup/db/db/schema-40to410.sql                     |    2 +
 89 files changed, 10336 insertions(+), 6371 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fd1d476/client/tomcatconf/components.xml.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fd1d476/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fd1d476/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------


Mime
View raw message