You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Saksham Srivastava <sa...@citrix.com> on 2013/09/13 12:23:59 UTC
Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is added
to network tier of VPC then IP reservation allows the CIDR to be a superset
of Network CIDR for that VPC tier
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
Review request for cloudstack and Sateesh Chodapuneedi.
Bugs: CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs
-----
server/src/com/cloud/network/NetworkServiceImpl.java 4169d42
utils/src/com/cloud/utils/net/NetUtils.java 05b485b
utils/test/com/cloud/utils/net/NetUtilsTest.java 3cfc98f
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/#review30864
-----------------------------------------------------------
Commit d825b3dd141c76c0af8d02bac2147378a3506e96 in branch refs/heads/4.3 from Saksham Srivastava
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=d825b3d ]
CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier
Signed-off-by: Jayapal <ja...@apache.org>
- ASF Subversion and Git Services
On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/
> -----------------------------------------------------------
>
> (Updated Dec. 24, 2013, 9:20 a.m.)
>
>
> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>
>
> Bugs: CLOUDSTACK-4622
> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> Add a new utility method for comparing 2 CIDRs.
> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>
>
> Diffs
> -----
>
> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>
> Diff: https://reviews.apache.org/r/14124/diff/
>
>
> Testing
> -------
>
> Added unit test for the utility.
> Tested locally.
> Build is successful.
> Patch applies cleanly.
>
>
> Thanks,
>
> Saksham Srivastava
>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/#review30904
-----------------------------------------------------------
Commit 07de75191c487de980be795b202b0a8d8bbda4d6 in branch refs/heads/master from Jayapal
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=07de751 ]
Revert "CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier"
Reverting this commit as it is breaking vpc deployment, CLOUDSTACK-5652
This reverts commit ab4f095c68d4a4b4fb354b3d95096b193706987d.
- ASF Subversion and Git Services
On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/
> -----------------------------------------------------------
>
> (Updated Dec. 24, 2013, 9:20 a.m.)
>
>
> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>
>
> Bugs: CLOUDSTACK-4622
> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> Add a new utility method for comparing 2 CIDRs.
> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>
>
> Diffs
> -----
>
> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>
> Diff: https://reviews.apache.org/r/14124/diff/
>
>
> Testing
> -------
>
> Added unit test for the utility.
> Tested locally.
> Build is successful.
> Patch applies cleanly.
>
>
> Thanks,
>
> Saksham Srivastava
>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated March 12, 2014, 2:25 p.m.)
Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs
-----
utils/src/com/cloud/utils/net/NetUtils.java 6350986
utils/test/com/cloud/utils/net/NetUtilsTest.java 3183826
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
No FindBug issues.
Results of marvin test: test_vpc.py
Test list VPC APIs ... ok
Test restart VPC having no networks ... ok
Test restart VPC having networks ... ok
Test delete VPC having no networks ... ok
Test delete VPC having networks ... ok
Test list VPC APIs for different user roles ... ok
Test Restart VPC when there are multiple networks associated ... ok
Test vpc deletion after account deletion ... ok
Test to create vpc and verify VPC state, VR and SourceNatIP ... ok
Test creation of multiple VPCs with non-overlapping CIDRs ... ok
Test deployment of vm in a VPC without network domain ... ok
Test deployment of vm in a VPC with network domain ... ok
Test deployment of vm in a VPC with network domain ... ok
Test vm deploy in network by a user where VPC was created without account/domain ID ... ok
Test deployment of vm in a network in a domain admin account where VPC is created without account/domain ID ... ok
Test deployment of vm in a network by root admin for user. ... ok
Test deployment of vm in a network by domain admin for user. ... ok
Test creation of network by domain admin for user from different domain ... ok
Test creation of VPC without mandatory parameters ... ok
Test to verify updation of vpc name and display text ... ok
few tests from: test_vpc_network.py
Test create network in VPC ... ok
Test create network in VPC ... SKIP: Netscaler not configured: skipping test
Test create network in VPC mismatched services (Should fail) ... ok
Test create multiple networks with LB service (Should fail) ... ok
Test create network with external LB devices ... ok
Test create network with redundant router capability ... SKIP: skipped - RvR didn't support VPC currently
Test create network services not supported by VPC (Should fail) ... ok
Test create network without sourceNAT service in VPC (should fail) ... ok
Test create network with shared network offering ... ok
Test create network with conserve mode ON ... ok
Test create network with conserve mode ON ... ok
Test network gc after shutdown of vms in the network ... ok
Test network rules after starting a VpcVr that was shutdown after network.gc ... ok
Test Stop all the Vms that are part of the a Network ... ok
Test create network outside cidr range of VPC ... ok
Test create network outside cidr range of VPC ... ok
Test create network inside cidr range of VPC ... ok
Test create network overlapping cidr range of VPC ... ok
Test create network from different account in VPC ... ok
Test update Network that is NOT part of a VPC to a nw offering that has services that are provided by VPCVR and vice versa ... ok
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated March 12, 2014, 2:23 p.m.)
Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
Changes
-------
Adding the output of marvin tests.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs (updated)
-----
utils/src/com/cloud/utils/net/NetUtils.java 6350986
utils/test/com/cloud/utils/net/NetUtilsTest.java 3183826
Diff: https://reviews.apache.org/r/14124/diff/
Testing (updated)
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
No FindBug issues.
Results of marvin test: test_vpc.py
Test list VPC APIs ... ok
Test restart VPC having no networks ... ok
Test restart VPC having networks ... ok
Test delete VPC having no networks ... ok
Test delete VPC having networks ... ok
Test list VPC APIs for different user roles ... ok
Test Restart VPC when there are multiple networks associated ... ok
Test vpc deletion after account deletion ... ok
Test to create vpc and verify VPC state, VR and SourceNatIP ... ok
Test creation of multiple VPCs with non-overlapping CIDRs ... ok
Test deployment of vm in a VPC without network domain ... ok
Test deployment of vm in a VPC with network domain ... ok
Test deployment of vm in a VPC with network domain ... ok
Test vm deploy in network by a user where VPC was created without account/domain ID ... ok
Test deployment of vm in a network in a domain admin account where VPC is created without account/domain ID ... ok
Test deployment of vm in a network by root admin for user. ... ok
Test deployment of vm in a network by domain admin for user. ... ok
Test creation of network by domain admin for user from different domain ... ok
Test creation of VPC without mandatory parameters ... ok
Test to verify updation of vpc name and display text ... ok
few tests from: test_vpc_network.py
Test create network in VPC ... ok
Test create network in VPC ... SKIP: Netscaler not configured: skipping test
Test create network in VPC mismatched services (Should fail) ... ok
Test create multiple networks with LB service (Should fail) ... ok
Test create network with external LB devices ... ok
Test create network with redundant router capability ... SKIP: skipped - RvR didn't support VPC currently
Test create network services not supported by VPC (Should fail) ... ok
Test create network without sourceNAT service in VPC (should fail) ... ok
Test create network with shared network offering ... ok
Test create network with conserve mode ON ... ok
Test create network with conserve mode ON ... ok
Test network gc after shutdown of vms in the network ... ok
Test network rules after starting a VpcVr that was shutdown after network.gc ... ok
Test Stop all the Vms that are part of the a Network ... ok
Test create network outside cidr range of VPC ... ok
Test create network outside cidr range of VPC ... ok
Test create network inside cidr range of VPC ... ok
Test create network overlapping cidr range of VPC ... ok
Test create network from different account in VPC ... ok
Test update Network that is NOT part of a VPC to a nw offering that has services that are provided by VPCVR and vice versa ... ok
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Jayapal Reddy <ja...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/#review32472
-----------------------------------------------------------
Can you please run marvin test cases of VPC with this patch and update the testing done section
- Jayapal Reddy
On Jan. 7, 2014, 11:58 a.m., Saksham Srivastava wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/
> -----------------------------------------------------------
>
> (Updated Jan. 7, 2014, 11:58 a.m.)
>
>
> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>
>
> Bugs: CLOUDSTACK-4622
> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> Add a new utility method for comparing 2 CIDRs.
> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>
>
> Diffs
> -----
>
> utils/src/com/cloud/utils/net/NetUtils.java 266a5d1
> utils/test/com/cloud/utils/net/NetUtilsTest.java b049516
>
> Diff: https://reviews.apache.org/r/14124/diff/
>
>
> Testing
> -------
>
> Added unit test for the utility.
> Tested locally.
> Build is successful.
> Patch applies cleanly.
>
>
> Thanks,
>
> Saksham Srivastava
>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated Jan. 7, 2014, 11:58 a.m.)
Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
Changes
-------
Updating patch, resolving conflicts and adding more unit-tests.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs (updated)
-----
utils/src/com/cloud/utils/net/NetUtils.java 266a5d1
utils/test/com/cloud/utils/net/NetUtilsTest.java b049516
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated Dec. 30, 2013, 3:22 p.m.)
Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs (updated)
-----
utils/src/com/cloud/utils/net/NetUtils.java a315b93
utils/test/com/cloud/utils/net/NetUtilsTest.java 3cfc98f
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Jayapal Reddy <ja...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/#review30865
-----------------------------------------------------------
Ship it!
Ship It!
- Jayapal Reddy
On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/
> -----------------------------------------------------------
>
> (Updated Dec. 24, 2013, 9:20 a.m.)
>
>
> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>
>
> Bugs: CLOUDSTACK-4622
> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> Add a new utility method for comparing 2 CIDRs.
> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>
>
> Diffs
> -----
>
> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>
> Diff: https://reviews.apache.org/r/14124/diff/
>
>
> Testing
> -------
>
> Added unit test for the utility.
> Tested locally.
> Build is successful.
> Patch applies cleanly.
>
>
> Thanks,
>
> Saksham Srivastava
>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/#review30903
-----------------------------------------------------------
Commit 0478aee78fe481e81eb4820cf181e4beb42ae22a in branch refs/heads/4.3 from Jayapal
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=0478aee ]
Revert "CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier"
Reverted the commit as it is breaking vpc CLOUDSTACK-5652
This reverts commit ab4f095c68d4a4b4fb354b3d95096b193706987d.
- ASF Subversion and Git Services
On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/
> -----------------------------------------------------------
>
> (Updated Dec. 24, 2013, 9:20 a.m.)
>
>
> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>
>
> Bugs: CLOUDSTACK-4622
> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> Add a new utility method for comparing 2 CIDRs.
> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>
>
> Diffs
> -----
>
> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>
> Diff: https://reviews.apache.org/r/14124/diff/
>
>
> Testing
> -------
>
> Added unit test for the utility.
> Tested locally.
> Build is successful.
> Patch applies cleanly.
>
>
> Thanks,
>
> Saksham Srivastava
>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest
network is added to network tier of VPC then IP reservation allows the CIDR
to be a superset of Network CIDR for that VPC tier
Posted by Marcus Sorensen <sh...@gmail.com>.
Yes, I verified that reverting the change on my local copy fixed the issue.
On Thu, Dec 26, 2013 at 2:55 PM, Alena Prokharchyk
<Al...@citrix.com> wrote:
> This is definitely the cause of the regression.
>
> Sateesh/Jaypal, please revert your change. It doesn¹t do the correct cidd
> validation.
>
>
> + if((startIpFirst >= startIpSecond) && (endIpFirst <= endIpSecond))
> + return true;
>
> You can¹t just compare CIDRs ip ranges as they may never cross. For
> example, 10.0.1.0/24 (10.0.1.0-10.0.1.255) and 10.0.2.0/24
> (10.0.2.0-10.0.2.0) mentoned in the CLOUDSTACK-5652, with your code will
> be considered as overlapped.
>
>
>
> -Alena.
>
>
>
> On 12/26/13, 1:33 PM, "Marcus Sorensen" <sh...@gmail.com> wrote:
>
>>Could this be causing CLOUDSTACK-5652? I just see that it touches the
>>isNetworkAWithinNetworkB, which now seems to return true for
>>everything I try when deploying two networks in a vpc.
>>
>>On Thu, Dec 26, 2013 at 4:51 AM, ASF Subversion and Git Services
>><as...@urd.zones.apache.org> wrote:
>>>
>>> -----------------------------------------------------------
>>> This is an automatically generated e-mail. To reply, visit:
>>> https://reviews.apache.org/r/14124/#review30866
>>> -----------------------------------------------------------
>>>
>>>
>>> Commit ab4f095c68d4a4b4fb354b3d95096b193706987d in branch
>>>refs/heads/master from Saksham Srivastava
>>> [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=ab4f095 ]
>>>
>>> CLOUDSTACK-4622:If a VM from guest network is added to network tier of
>>>VPC then IP reservation allows the CIDR to be a superset of Network CIDR
>>>for that VPC tier
>>>
>>> Signed-off-by: Jayapal <ja...@apache.org>
>>>
>>>
>>> - ASF Subversion and Git Services
>>>
>>>
>>> On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>>>>
>>>> -----------------------------------------------------------
>>>> This is an automatically generated e-mail. To reply, visit:
>>>> https://reviews.apache.org/r/14124/
>>>> -----------------------------------------------------------
>>>>
>>>> (Updated Dec. 24, 2013, 9:20 a.m.)
>>>>
>>>>
>>>> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>>>>
>>>>
>>>> Bugs: CLOUDSTACK-4622
>>>> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>>>>
>>>>
>>>> Repository: cloudstack-git
>>>>
>>>>
>>>> Description
>>>> -------
>>>>
>>>> Add a new utility method for comparing 2 CIDRs.
>>>> The method takes in 2 cidrs, cidrA and cidrB and returns true if
>>>>cidrA's IP range is equal or a subset of cidrB's IP range.
>>>>
>>>>
>>>> Diffs
>>>> -----
>>>>
>>>> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
>>>> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>>>>
>>>> Diff: https://reviews.apache.org/r/14124/diff/
>>>>
>>>>
>>>> Testing
>>>> -------
>>>>
>>>> Added unit test for the utility.
>>>> Tested locally.
>>>> Build is successful.
>>>> Patch applies cleanly.
>>>>
>>>>
>>>> Thanks,
>>>>
>>>> Saksham Srivastava
>>>>
>>>>
>>>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest
network is added to network tier of VPC then IP reservation allows the CIDR
to be a superset of Network CIDR for that VPC tier
Posted by Alena Prokharchyk <Al...@citrix.com>.
This is definitely the cause of the regression.
Sateesh/Jaypal, please revert your change. It doesn¹t do the correct cidd
validation.
+ if((startIpFirst >= startIpSecond) && (endIpFirst <= endIpSecond))
+ return true;
You can¹t just compare CIDRs ip ranges as they may never cross. For
example, 10.0.1.0/24 (10.0.1.0-10.0.1.255) and 10.0.2.0/24
(10.0.2.0-10.0.2.0) mentoned in the CLOUDSTACK-5652, with your code will
be considered as overlapped.
-Alena.
On 12/26/13, 1:33 PM, "Marcus Sorensen" <sh...@gmail.com> wrote:
>Could this be causing CLOUDSTACK-5652? I just see that it touches the
>isNetworkAWithinNetworkB, which now seems to return true for
>everything I try when deploying two networks in a vpc.
>
>On Thu, Dec 26, 2013 at 4:51 AM, ASF Subversion and Git Services
><as...@urd.zones.apache.org> wrote:
>>
>> -----------------------------------------------------------
>> This is an automatically generated e-mail. To reply, visit:
>> https://reviews.apache.org/r/14124/#review30866
>> -----------------------------------------------------------
>>
>>
>> Commit ab4f095c68d4a4b4fb354b3d95096b193706987d in branch
>>refs/heads/master from Saksham Srivastava
>> [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=ab4f095 ]
>>
>> CLOUDSTACK-4622:If a VM from guest network is added to network tier of
>>VPC then IP reservation allows the CIDR to be a superset of Network CIDR
>>for that VPC tier
>>
>> Signed-off-by: Jayapal <ja...@apache.org>
>>
>>
>> - ASF Subversion and Git Services
>>
>>
>> On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>>>
>>> -----------------------------------------------------------
>>> This is an automatically generated e-mail. To reply, visit:
>>> https://reviews.apache.org/r/14124/
>>> -----------------------------------------------------------
>>>
>>> (Updated Dec. 24, 2013, 9:20 a.m.)
>>>
>>>
>>> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>>>
>>>
>>> Bugs: CLOUDSTACK-4622
>>> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>>>
>>>
>>> Repository: cloudstack-git
>>>
>>>
>>> Description
>>> -------
>>>
>>> Add a new utility method for comparing 2 CIDRs.
>>> The method takes in 2 cidrs, cidrA and cidrB and returns true if
>>>cidrA's IP range is equal or a subset of cidrB's IP range.
>>>
>>>
>>> Diffs
>>> -----
>>>
>>> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
>>> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>>>
>>> Diff: https://reviews.apache.org/r/14124/diff/
>>>
>>>
>>> Testing
>>> -------
>>>
>>> Added unit test for the utility.
>>> Tested locally.
>>> Build is successful.
>>> Patch applies cleanly.
>>>
>>>
>>> Thanks,
>>>
>>> Saksham Srivastava
>>>
>>>
>>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest
network is added to network tier of VPC then IP reservation allows the CIDR
to be a superset of Network CIDR for that VPC tier
Posted by Marcus Sorensen <sh...@gmail.com>.
Could this be causing CLOUDSTACK-5652? I just see that it touches the
isNetworkAWithinNetworkB, which now seems to return true for
everything I try when deploying two networks in a vpc.
On Thu, Dec 26, 2013 at 4:51 AM, ASF Subversion and Git Services
<as...@urd.zones.apache.org> wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/#review30866
> -----------------------------------------------------------
>
>
> Commit ab4f095c68d4a4b4fb354b3d95096b193706987d in branch refs/heads/master from Saksham Srivastava
> [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=ab4f095 ]
>
> CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier
>
> Signed-off-by: Jayapal <ja...@apache.org>
>
>
> - ASF Subversion and Git Services
>
>
> On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>>
>> -----------------------------------------------------------
>> This is an automatically generated e-mail. To reply, visit:
>> https://reviews.apache.org/r/14124/
>> -----------------------------------------------------------
>>
>> (Updated Dec. 24, 2013, 9:20 a.m.)
>>
>>
>> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>>
>>
>> Bugs: CLOUDSTACK-4622
>> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>>
>>
>> Repository: cloudstack-git
>>
>>
>> Description
>> -------
>>
>> Add a new utility method for comparing 2 CIDRs.
>> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>>
>>
>> Diffs
>> -----
>>
>> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
>> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>>
>> Diff: https://reviews.apache.org/r/14124/diff/
>>
>>
>> Testing
>> -------
>>
>> Added unit test for the utility.
>> Tested locally.
>> Build is successful.
>> Patch applies cleanly.
>>
>>
>> Thanks,
>>
>> Saksham Srivastava
>>
>>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by ASF Subversion and Git Services <as...@urd.zones.apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/#review30866
-----------------------------------------------------------
Commit ab4f095c68d4a4b4fb354b3d95096b193706987d in branch refs/heads/master from Saksham Srivastava
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=ab4f095 ]
CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier
Signed-off-by: Jayapal <ja...@apache.org>
- ASF Subversion and Git Services
On Dec. 24, 2013, 9:20 a.m., Saksham Srivastava wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/14124/
> -----------------------------------------------------------
>
> (Updated Dec. 24, 2013, 9:20 a.m.)
>
>
> Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
>
>
> Bugs: CLOUDSTACK-4622
> https://issues.apache.org/jira/browse/CLOUDSTACK-4622
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> Add a new utility method for comparing 2 CIDRs.
> The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
>
>
> Diffs
> -----
>
> utils/src/com/cloud/utils/net/NetUtils.java f6f6285
> utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
>
> Diff: https://reviews.apache.org/r/14124/diff/
>
>
> Testing
> -------
>
> Added unit test for the utility.
> Tested locally.
> Build is successful.
> Patch applies cleanly.
>
>
> Thanks,
>
> Saksham Srivastava
>
>
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated Dec. 24, 2013, 9:20 a.m.)
Review request for cloudstack, Jayapal Reddy and Sateesh Chodapuneedi.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs
-----
utils/src/com/cloud/utils/net/NetUtils.java f6f6285
utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated Dec. 24, 2013, 9:18 a.m.)
Review request for cloudstack and Sateesh Chodapuneedi.
Changes
-------
Modified isNetworkAWithinNetworkB to compare IP ranges.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs (updated)
-----
utils/src/com/cloud/utils/net/NetUtils.java f6f6285
utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
Thanks,
Saksham Srivastava
Re: Review Request 14124: CLOUDSTACK-4622 : If a VM from guest network is
added to network tier of VPC then IP reservation allows the CIDR to be a
superset of Network CIDR for that VPC tier
Posted by Saksham Srivastava <sa...@citrix.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/14124/
-----------------------------------------------------------
(Updated Dec. 9, 2013, 11:30 a.m.)
Review request for cloudstack and Sateesh Chodapuneedi.
Changes
-------
Updating a three month old patch as it was not applying cleanly on master.
Bugs: CLOUDSTACK-4622
https://issues.apache.org/jira/browse/CLOUDSTACK-4622
Repository: cloudstack-git
Description
-------
Add a new utility method for comparing 2 CIDRs.
The method takes in 2 cidrs, cidrA and cidrB and returns true if cidrA's IP range is equal or a subset of cidrB's IP range.
Diffs (updated)
-----
server/src/com/cloud/network/NetworkServiceImpl.java 6855587
utils/src/com/cloud/utils/net/NetUtils.java c0c792f
utils/test/com/cloud/utils/net/NetUtilsTest.java c7407bf
Diff: https://reviews.apache.org/r/14124/diff/
Testing
-------
Added unit test for the utility.
Tested locally.
Build is successful.
Patch applies cleanly.
Thanks,
Saksham Srivastava