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

[4.11] Fix set initial reservation on public IP ranges #2980

Merged
merged 2 commits into from Nov 7, 2018

Conversation

@nvazquez
Copy link
Contributor

commented Oct 29, 2018

Description

Fix initial reservation on public IP range addition. Also, if the range is dedicated for system VMs do not allow dedicating it to any account

Fixes: #2929

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?

  • Set reservation to a domain, add range. Verify domain is set to the domain.

@nvazquez nvazquez changed the title Iprangedomainuifix Fix set initial reservation on public IP ranges Oct 29, 2018

@nvazquez nvazquez requested review from rhtyd and DaanHoogland Oct 29, 2018

@nvazquez nvazquez changed the title Fix set initial reservation on public IP ranges [4.11] Fix set initial reservation on public IP ranges Oct 29, 2018

@rhtyd

This comment has been minimized.

Copy link
Member

commented Oct 30, 2018

@blueorangutan package

@blueorangutan

This comment has been minimized.

Copy link

commented Oct 30, 2018

@rhtyd 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

commented Oct 30, 2018

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

@rhtyd

This comment has been minimized.

Copy link
Member

commented Oct 30, 2018

@blueorangutan

This comment has been minimized.

Copy link

commented Oct 30, 2018

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

// This VLAN is domain-wide, so create a DomainVlanMapVO entry
//final DomainVlanMapVO domainVlanMapVO = new DomainVlanMapVO(domain.getId(), vlan.getId());
//_domainVlanMapDao.persist(domainVlanMapVO);
final DomainVlanMapVO domainVlanMapVO = new DomainVlanMapVO(domain.getId(), vlan.getId());

This comment has been minimized.

Copy link
@DaanHoogland

DaanHoogland Oct 30, 2018

Contributor

the rest of the change seems trivial. I just wonder why these lines where commented in the first place. Can you explain @nvazquez ?

This comment has been minimized.

Copy link
@svenvogel

svenvogel Oct 30, 2018

Contributor

Hi @nvazquez as i can say. we tested it. it works now! Great work!

This comment has been minimized.

Copy link
@nvazquez

nvazquez Oct 31, 2018

Author Contributor

Thanks @svenvogel for testing it.

@DaanHoogland it was conflicting with the public IP range retrieval for system VMs. If the selected range was for system VMs then it won't be considered because of the entry on domain_vlan_map

This comment has been minimized.

Copy link
@svenvogel

svenvogel Nov 1, 2018

Contributor

@nvazquez is there any problem to merge it?

@DaanHoogland DaanHoogland referenced this pull request Oct 30, 2018
1 of 5 tasks complete
@blueorangutan

This comment has been minimized.

Copy link

commented Oct 30, 2018

Trillian test result (tid-3129)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 23742 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2980-t3129-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 65 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
runTest Error 0.00 test_vm_life_cycle.py
test_04_rvpc_network_garbage_collector_nics Failure 261.39 test_vpc_redundant.py
@svenvogel

This comment has been minimized.

Copy link
Contributor

commented Nov 1, 2018

@nvazquez will it merged?

@nvazquez nvazquez requested a review from rafaelweingartner Nov 7, 2018

@nvazquez

This comment has been minimized.

Copy link
Contributor Author

commented Nov 7, 2018

@borisstoyanov
Copy link
Contributor

left a comment

LGTM

@rafaelweingartner rafaelweingartner added this to the 4.11.2.0 milestone Nov 7, 2018

@rafaelweingartner rafaelweingartner merged commit 7d8eb37 into apache:4.11 Nov 7, 2018

2 checks passed

Jenkins This pull request looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
rafaelweingartner added a commit that referenced this pull request Nov 7, 2018

@nvazquez nvazquez deleted the shapeblue:iprangedomainuifix branch Nov 7, 2018

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.