Updated Branches: refs/heads/events-framework 0f9f428ad -> e6ee26698 refs/heads/master 33b87d898 -> 96c24930a
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/96c24930 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/96c24930 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/96c24930 Branch: refs/heads/master Commit: 96c24930aeded2129a3f97732925fdd398e4df6a Parents: e7a554f 33b87d8 Author: Murali Reddy <[email protected]> Authored: Fri Feb 1 08:45:53 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Fri Feb 1 08:45:53 2013 +0530 ---------------------------------------------------------------------- .../cloud/agent/api/routing/DhcpEntryCommand.java | 35 ++- api/src/com/cloud/dc/Vlan.java | 5 + api/src/com/cloud/network/Network.java | 34 ++- api/src/com/cloud/network/NetworkModel.java | 1 + api/src/com/cloud/network/NetworkProfile.java | 14 + api/src/com/cloud/network/Networks.java | 2 +- api/src/com/cloud/vm/Nic.java | 6 + api/src/com/cloud/vm/NicProfile.java | 42 ++- api/src/com/cloud/vm/UserVmService.java | 14 +- .../org/apache/cloudstack/api/ApiConstants.java | 5 + .../api/command/user/network/CreateNetworkCmd.java | 46 +++- .../api/command/user/vm/DeployVMCmd.java | 45 ++- .../cloudstack/api/response/NetworkResponse.java | 14 + .../cloudstack/api/response/NicResponse.java | 22 ++- .../api/response/VlanIpRangeResponse.java | 33 ++ .../com/cloud/bridge/model/CloudStackUserVO.java | 49 +++ .../bridge/persist/dao/CloudStackUserDao.java | 26 ++ .../bridge/persist/dao/CloudStackUserDaoImpl.java | 66 ++++ .../com/cloud/bridge/service/EC2RestServlet.java | 138 ++++--- .../cloud/bridge/service/EC2SoapServiceImpl.java | 4 +- .../service/core/ec2/EC2AddressFilterSet.java | 17 +- .../cloud/bridge/service/core/ec2/EC2Engine.java | 164 +++++---- .../service/core/ec2/EC2KeyPairFilterSet.java | 6 +- awsapi/src/com/cloud/stack/CloudStackApi.java | 9 +- client/tomcatconf/components.xml.in | 1 + .../virtualnetwork/VirtualRoutingResource.java | 9 +- patches/systemvm/debian/config/etc/dnsmasq.conf | 278 ++++++++++++--- .../debian/config/etc/init.d/cloud-early-config | 67 +++- patches/systemvm/debian/config/etc/sysctl.conf | 6 +- patches/systemvm/debian/config/root/edithosts.sh | 116 +++++-- .../networkservice/BaremetalDhcpManagerImpl.java | 4 +- .../hypervisor/vmware/resource/VmwareResource.java | 19 +- .../xen/resource/CitrixResourceBase.java | 9 +- pom.xml | 1 + scripts/network/domr/dhcp_entry.sh | 68 ++-- server/src/com/cloud/api/ApiResponseHelper.java | 21 +- .../cloud/baremetal/ExternalDhcpManagerImpl.java | 2 +- .../cloud/configuration/ConfigurationManager.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 245 ++++++++----- .../configuration/DefaultComponentLibrary.java | 4 + server/src/com/cloud/dc/VlanVO.java | 43 +++- .../src/com/cloud/network/Ipv6AddressManager.java | 28 ++ .../com/cloud/network/Ipv6AddressManagerImpl.java | 132 +++++++ server/src/com/cloud/network/NetworkManager.java | 4 +- .../src/com/cloud/network/NetworkManagerImpl.java | 118 +++++-- server/src/com/cloud/network/NetworkModelImpl.java | 37 ++- .../src/com/cloud/network/NetworkServiceImpl.java | 143 ++++++-- server/src/com/cloud/network/NetworkVO.java | 24 ++ server/src/com/cloud/network/UserIpv6Address.java | 52 +++ .../src/com/cloud/network/UserIpv6AddressVO.java | 188 ++++++++++ server/src/com/cloud/network/addr/PublicIp.java | 15 + .../com/cloud/network/dao/UserIpv6AddressDao.java | 39 ++ .../cloud/network/dao/UserIpv6AddressDaoImpl.java | 112 ++++++ .../network/element/VirtualRouterElement.java | 5 + .../com/cloud/network/guru/DirectNetworkGuru.java | 49 ++- .../network/guru/DirectPodBasedNetworkGuru.java | 2 +- .../network/guru/ExternalGuestNetworkGuru.java | 2 +- .../com/cloud/network/guru/GuestNetworkGuru.java | 4 +- .../cloud/network/guru/PodBasedNetworkGuru.java | 2 +- .../com/cloud/network/guru/PublicNetworkGuru.java | 2 +- .../router/VirtualNetworkApplianceManagerImpl.java | 28 ++- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- server/src/com/cloud/vm/NicVO.java | 25 ++ server/src/com/cloud/vm/UserVmManagerImpl.java | 60 +++- .../com/cloud/network/MockNetworkManagerImpl.java | 4 +- .../com/cloud/network/MockNetworkModelImpl.java | 6 + .../com/cloud/user/MockAccountManagerImpl.java | 2 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 9 +- .../cloud/vpc/MockConfigurationManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 10 +- setup/db/create-schema.sql | 34 ++- setup/db/db/schema-40to410.sql | 4 + ui/scripts/ui-custom/instanceWizard.js | 3 + utils/pom.xml | 5 + utils/src/com/cloud/utils/net/NetUtils.java | 114 ++++++ utils/test/com/cloud/utils/net/NetUtilsTest.java | 35 ++- 77 files changed, 2456 insertions(+), 539 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/api/src/com/cloud/network/Network.java ---------------------------------------------------------------------- diff --cc api/src/com/cloud/network/Network.java index 1dbb327,f0f3f18..a70bf02 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@@ -222,17 -253,34 +222,43 @@@ public interface Network extends Contro s_fsm.addTransition(State.Shutdown, Event.OperationSucceeded, State.Allocated); s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Implemented); } + + public static StateMachine2<State, Network.Event, Network> getStateMachine() { + return s_fsm; + } + + String _description; + private State(String description) { + _description = description; + } } - + + public class IpAddresses { + private String ip4Address; + private String ip6Address; + + public IpAddresses(String ip4Address, String ip6Address) { + this.setIp4Address(ip4Address); + this.setIp6Address(ip6Address); + } + + public String getIp4Address() { + return ip4Address; + } + + public void setIp4Address(String ip4Address) { + this.ip4Address = ip4Address; + } + + public String getIp6Address() { + return ip6Address; + } + + public void setIp6Address(String ip6Address) { + this.ip6Address = ip6Address; + } + } + String getName(); Mode getMode(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --cc server/src/com/cloud/network/NetworkManagerImpl.java index 3d83487,67568da..218583b --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@@ -197,14 -273,12 +197,18 @@@ public class NetworkManagerImpl impleme @Inject NetworkACLManager _networkACLMgr; @Inject + UsageEventDao _usageEventDao; + @Inject NetworkModel _networkModel; + @Inject + UserIpv6AddressDao _ipv6Dao; + @Inject + Ipv6AddressManager _ipv6Mgr; + protected StateMachine2<Network.State, Network.Event, Network> _stateMachine; + private final HashMap<String, NetworkOfferingVO> _systemNetworks = new HashMap<String, NetworkOfferingVO>(5); + private static Long _privateOfferingId = null; + ScheduledExecutorService _executor; SearchBuilder<IPAddressVO> AssignIpAddressSearch; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/network/NetworkVO.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/network/guru/GuestNetworkGuru.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/96c24930/server/src/com/cloud/vm/UserVmManagerImpl.java ----------------------------------------------------------------------
