VPC VR: fix Conflicting device id on private gw nic when restart vpc with cleanup

[ustcweizhou]

Description

Some issues with vpc vr have been fixed in #4484
This PR fixes the last two issues we found in our testing.

We run the the integration tests in test/integration/component/test_multiple_subnets*.py many times (>20) , all are SUCCESSFUL.

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)

Feature/Enhancement Scale or Bug Severity

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

[yadvr]

@weizhouapache is this critical fix wrt 4.15 or can we do in the next release? cc @DaanHoogland@PaulAngus
@blueorangutan package

[blueorangutan]

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

[weizhouapache]

@weizhouapache is this critical fix wrt 4.15 or can we do in the next release? cc @DaanHoogland@PaulAngus
@blueorangutan package

@rhtyd it is better to merge it into 4.15.0.0

[blueorangutan]

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

[blueorangutan]

Packaging result: ✔centos7 ✖centos8 ✔debian. JID-2454

[yadvr]

@weizhouapache okay I've bumped to critical but let's also hear from @PaulAngus and @DaanHoogland
@blueorangutan test

[blueorangutan]

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

[blueorangutan]

Packaging result: ✔centos7 ✖centos8 ✔debian. JID-2455

[DaanHoogland]

seems like a proper refactor though I'd liked to have seen the code taken out in a separate method. The component tests are fixed as well, let's have these run.

[DaanHoogland]

@blueorangutan test centos7 kvm-centos7 keepEnv

[blueorangutan]

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

[DaanHoogland]

@rhtyd @PaulAngus I would put this in and merge forward. testing in an independent env (not @weizhouapache's) advised

[weizhouapache]

@rhtyd @PaulAngus I would put this in and merge forward. testing in an independent env (not @weizhouapache's) advised

@DaanHoogland this pr does not have any change with iptables rules in VRs.
if all integration tests pass, it should be good.

[blueorangutan]

Trillian test result (tid-3300)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 30110 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4512-t3300-kvm-centos7.zip
Smoke tests completed. 83 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[blueorangutan]

Trillian test result (tid-3302)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31604 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4512-t3302-kvm-centos7.zip
Smoke tests completed. 83 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[DaanHoogland]

i ran the test_multiple_subnets_in_isolated_network.py component tests and they passed. I just wanted to conform to the external test party rule for merging , @weizhouapache ; good to go as far as i am concerned.