Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature ... Squashed commit of the following: commit f244f9ce7982db16984dd87c31545f1c0240c704 Merge: 993cbb0 f5c8e38 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Mon May 20 18:54:05 2013 +0530 Merge branch 'master' into portablepublicip Conflicts: server/src/com/cloud/server/ManagementServerImpl.java server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Mon May 20 18:49:54 2013 +0530 introduce 'transferPortableIP' interface method in network manger. This method will transfer association of portable ip from one network to another network. commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1 Merge: a718d35 a29e393 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Fri May 17 02:48:54 2013 +0530 Merge branch 'master' into portablepublicip Conflicts: utils/src/com/cloud/utils/net/NetUtils.java commit a718d353f7 Merge: ecca117 c211818 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Mon May 13 21:22:19 2013 +0530 Merge branch 'master' into portablepublicip Conflicts: api/src/org/apache/cloudstack/api/ResponseGenerator.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/network/addr/PublicIp.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockConfigurationManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java setup/db/db/schema-410to420.sql commit ecca117e34 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Mon May 13 20:05:29 2013 +0530 added integration tests for testing portable ip ranges commit 895a27c277 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Mon May 13 15:12:19 2013 +0530 - establish model for transferring portable IP association from a network with which it is associated to another network. - enabling static nat api, extended to transfer potrtable IP across the networks if the VM/network is different from the current associate network of the portable ip commit 51509751b2 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Mon May 13 12:05:33 2013 +0530 seperate out associate/disassociate with guest network operations from alloc and release of portable ip commit bd058f58c2 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Sun May 12 21:14:48 2013 +0530 enhance disasociateIPAddr API to release protable IP associated with a guest network or VPC commit 27504d9098 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Sun May 12 16:53:45 2013 +0530 enhance asociateIPAddr API to acquire a protable IP and associate with a guest network or VPC commit f82c6a8431 Merge: 3dbfb44 0749013 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Sat May 11 23:32:13 2013 +0530 Merge branch 'master' into portablepublicip Conflicts: api/src/com/cloud/network/IpAddress.java api/src/org/apache/cloudstack/api/ResponseGenerator.java client/tomcatconf/commands.properties.in server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java setup/db/db/schema-410to420.sql commit 3dbfb44eb5 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Sat May 11 20:33:19 2013 +0530 - add 'portable' boolean as property of IpAddress, persist the property in IPAddressVO, return the property in IpAddressResponse - add ability to request portable IP in associateIpAddress api commit bf3cb274cf Author: Murali Reddy <muralimmreddy@gmail.com> Date: Sat May 11 16:08:40 2013 +0530 add the status of each portable IP (its state, details of associated data center/VPC/guest network etc) in the PortableIpRangeResponse returned by listPortableIpRanges API commit e7b2fb2255 Author: Murali Reddy <muralimmreddy@gmail.com> Date: Sat May 11 14:36:01 2013 +0530 Introdcues notion of 'portable IP' pool at region level. Introduces root admin only API's to provision portable ip to a region - createPortableIpRange - deletePortableIpRange - listPortableIpRanges		2013-05-20 20:05:47 +05:30
..
bindir	fixing utils license header	2012-06-06 23:06:02 -04:00
certs	Update fail-safe keystore with RSA private key	2011-07-25 18:55:16 -07:00
conf	Sync master to javelin one more time	2013-02-01 11:37:33 -08:00
src	CLOUDSTACK-652: meging 'portable public ip' feature	2013-05-20 20:05:47 +05:30
test	PVLAN: Add pvlan in createNetworkCommand	2013-05-01 13:23:08 -07:00
pom.xml	merge master	2013-05-11 15:28:43 +05:30