Skip to content

revert dedicate vlan code removal#2664

Merged
yadvr merged 1 commit intoapache:4.11from
shapeblue:dedicatePublicIpRangeFix
May 23, 2018
Merged

revert dedicate vlan code removal#2664
yadvr merged 1 commit intoapache:4.11from
shapeblue:dedicatePublicIpRangeFix

Conversation

@DaanHoogland
Copy link
Contributor

@DaanHoogland DaanHoogland commented May 23, 2018

Description

this supposedly fixes #2545, as reported by the issuer. Testing will need to be added as of now.

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)

GitHub Issue/PRs

Fixes: #2545

Screenshots (if appropriate):

How Has This Been Tested?

Checklist:

  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
    Testing
  • I have added tests to cover my changes.
  • All relevant new and existing integration tests have passed.
  • A full integration testsuite with all test that can run on my environment has passed.

@DaanHoogland
Copy link
Contributor Author

@blueorangutan package

Copy link
Member

@yadvr yadvr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, pending tests.

@yadvr
Copy link
Member

yadvr commented May 23, 2018

@blueorangutan package

@blueorangutan
Copy link

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

Copy link
Contributor

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on code

@blueorangutan
Copy link

Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2078

@DaanHoogland
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

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

Copy link
Contributor

@nvazquez nvazquez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@rafaelweingartner rafaelweingartner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland everything seems ok here. There is one thing that I do not understand though. Is this a revert PR (meaning, revert something that was done by other PR), or is it adding something that was overlooked/forgotten by past PRs?

@borisstoyanov
Copy link
Contributor

It says 'Fixes: #2545', I think we're all happy on this one can we merge?

@DaanHoogland
Copy link
Contributor Author

@rafaelweingartner it reverts only a small (four line) part of a more than 1800 line change

@rafaelweingartner
Copy link
Member

I see. Thanks.

@DaanHoogland DaanHoogland added this to the 4.11.1.0 milestone May 23, 2018
@yadvr
Copy link
Member

yadvr commented May 23, 2018

This looks like we're in violent agreement on this. I'll merge this so as to not block RC1, based on reviews and Travis okay. If smoketests have a new error, we'll reconsider a fix as another PR.

@yadvr yadvr merged commit 7a3a882 into apache:4.11 May 23, 2018
@blueorangutan
Copy link

Trillian test result (tid-2702)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 23242 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2664-t2702-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 63 look OK, 4 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
test_03_vpc_privategw_restart_vpc_cleanup Error 119.51 test_privategw_acl.py
test_05_rvpc_multi_tiers Failure 306.02 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 331.88 test_vpc_redundant.py
test_hostha_enable_ha_when_host_in_maintenance Error 3.45 test_hostha_kvm.py

winterhazel pushed a commit that referenced this pull request Jan 28, 2026
Redes L2 pré-configuradas

Closes #2664

See merge request scclouds/scclouds!1280
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants