----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/10005/ -----------------------------------------------------------
(Updated June 5, 2013, 11:39 a.m.) Review request for cloudstack, Murali Reddy and Sateesh Chodapuneedi. Changes ------- Resolving merge conflicts with latest master. Description ------- In cases where the start ip and end ip of guest vm cidr and network cidr are same, even when the cidrs appear to be different,the reservation procedure should not go through and user should get a message mentioning that. Added extra check for the same with proper alert message. This addresses bug CLOUDSTACK-1647. Diffs (updated) ----- server/src/com/cloud/network/NetworkServiceImpl.java 2bf9f40 utils/src/com/cloud/utils/net/NetUtils.java 8c094c8 utils/test/com/cloud/utils/net/NetUtilsTest.java 16d3402 Diff: https://reviews.apache.org/r/10005/diff/ Testing (updated) ------- CIDR : 10.0.144.0/20, Network CIDR : null, guestVmCidr : 10.0.151.0/20 => Reservation is not applied. CIDR : 10.0.144.0/21, Network CIDR : 10.0.144.0/20, guestVmCidr : 10.0.151.0/20 => Existing Reservation is not affected. Added UnitTest testIsSameIpRange() Thanks, Saksham Srivastava
