Fix Bug that prevents adding multiple public IP ranges on the same subnet

[kioie]

Description

Referencing this issue: #3114
Edited the code to check for an ipOverlap in the IP ranges and not subnet overlap.

Signed-off-by: @kioiekioieddy@google.com

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

STEPS TO TEST

create vlaniprange zoneId="06e5e428-1170-4ab3-bfc3-c018660bdca1" vlan=untagged gateway=192.168.2.1 netmask=255.255.255.0 startip=192.168.2.2 endip=192.168.2.200 forsystemvms=false forVirtualNetwork=true

create vlaniprange zoneId="06e5e428-1170-4ab3-bfc3-c018660bdca1" vlan=untagged gateway=192.168.2.1 netmask=255.255.255.0 startip=192.168.2.201 endip=192.168.2.220 forsystemvms=false forVirtualNetwork=true

EXPECTED RESULTS
2nd range added without issue

ACTUAL RESULTS
2nd range added without issue

[dhlaluku]

@kioie may you please resolve the merge conflicts

[dhlaluku]

Overall nice cleanup. Please revert the order of imports to follow this style;
import javax.*

import java.*

import org.*

import com.*

import all other imports

[dhlaluku]

@blueorangutan package

[blueorangutan]

@dhlaluku a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2611

[dhlaluku]

@blueorangutan test

[blueorangutan]

@dhlaluku a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-3407)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 26873 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3185-t3407-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_iso.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 67 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_04_extract_Iso	Failure	1.09	test_iso.py
test_04_extract_template	Failure	1.08	test_templates.py
test_06_download_detached_volume	Failure	10.42	test_volumes.py

[yadvr]

Needs testing for both +tive/-tive cases. cc @borisstoyanov

[shwstppr]

@kioie If you are still working on this, please resolve conflicts

[kioie]

Issue seems to be resolved on #3430