Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
4 participants
@kioie
Copy link

kioie commented Feb 19, 2019

Description

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

Signed-off-by: @kioie kioieddy@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

This comment has been minimized.

Copy link
Contributor

dhlaluku commented Feb 20, 2019

@kioie may you please resolve the merge conflicts

@dhlaluku
Copy link
Contributor

dhlaluku left a comment

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

@kioie kioie changed the title apache/cloudstack#3114 Fix Bug that prevents adding multiple public IP ranges on the same subnet Feb 20, 2019

kioie
#3114
Signed-off-by: kioie <kioieddy@google.com>

@kioie kioie force-pushed the kioie:kioie/publicIPRanges branch from f9c7fb3 to 95c3806 Feb 20, 2019

@dhlaluku

This comment has been minimized.

Copy link
Contributor

dhlaluku commented Feb 20, 2019

@blueorangutan package

@blueorangutan

This comment has been minimized.

Copy link

blueorangutan commented Feb 20, 2019

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

@blueorangutan

This comment has been minimized.

Copy link

blueorangutan commented Feb 20, 2019

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

@dhlaluku

This comment has been minimized.

Copy link
Contributor

dhlaluku commented Feb 20, 2019

@blueorangutan

This comment has been minimized.

Copy link

blueorangutan commented Feb 20, 2019

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

@blueorangutan

This comment has been minimized.

Copy link

blueorangutan commented Feb 21, 2019

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
@rhtyd
Copy link
Member

rhtyd left a comment

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.