At first, refactored vpn-manager/SubnetmapChangeListener.java,

Take in account VPN type (BGPVPN External/InternetVPN) in onSubnetAddedToVpn() and onSubnetDeletedFromVpn() methods from VpnSubnetRouteHandler.java.

https://git.opendaylight.org/gerrit/#/c/68558/

Is 68558 the fix for this issue?  Please cherry pick to the oxygen branch and +2 when ready.

Patch for Oxygen is already here:

https://git.opendaylight.org/gerrit/#/c/68808/

valentina.krasnobaeva - Looks like 68808 needs a rebase? Friendly reminder that we need to close this ASAP to unblock the imminent Oxygen release.

Hi,

68808 was rebased, will wait recheck job results, to prove that it compiles well

Looks like rebase is done, the standard verify job is passing and some extra verify jobs are currently running.

valentina.krasnobaeva - Looks like the job finished. How do the results look? Issue fixed? Should we start bugging shague et al for a +2?

Yes, thank you.  Results look as expected. vpn_basic.robot and vpn_basic_ipv6.robot are passed successfully, so we can start bugging shague et al for a +2 for this patch.

shague - To verify 68808 fixes the issue and +2/merge.

shague - CSIT results:

https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/netvirt-csit-1node-openstack-queens-gate-stateful-oxygen/87/robot-plugin/log_full.html.gz

https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/netvirt-csit-1node-openstack-queens-gate-tdd-wip-oxygen/4/robot-plugin/log_full.html.gz

shague - Your test-netvirt-current verify job finished but it doesn't seem like the logs were copied?

https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/netvirt-patch-test-current-oxygen/977

I guess they are still in the console:

https://jenkins.opendaylight.org/releng/job/netvirt-patch-test-current-oxygen/977/console

I kicked off another one, just to do something that might help.

Sam Hague - Your test-netvirt-current verify job finished but it doesn't seem like the logs were copied?

https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/netvirt-patch-test-current-oxygen/977

this is the gate job we want to look at. you have
to click on the child job of the patch-test job.

shague can verify, but the exception log of that job looks totally clean.

shague said on a mailing list thread that https://git.opendaylight.org/gerrit/#/c/69379/ is related to this (and is merged). Just tracking it here too.

Bumping that https://git.opendaylight.org/gerrit/#/c/68808/ is the currently outstanding (but seemingly ready to merge) patch.

shague - What's going on with 68808? It seems to be ready to merge.

68808 has a -1 - it was removed on the last rebase, but there are still comments to address there. working on getting those comments addressed.

https://git.opendaylight.org/gerrit/#/c/68203 is the patch that 68808 is parented on. That one is about ready. Running another csit job on it, which should be good and then we can merge 68203.

Oh okay, yeah I see the ongoing feedback on the master version. I was only looking at the stable/oxygen cherry-pick, sorry. Thanks for clarifying/pushing shague!

The parent of the change that fixes this bug seems ready to merge: https://git.opendaylight.org/gerrit/#/c/68807/

We're still waiting on: https://git.opendaylight.org/gerrit/#/c/68808/

We need to get it merged immediately if we want to have any chance of making the (already delayed, really last possible date) Oxygen release date. We then need to get lucky and get an autorelease with no "sporadic" failures almost immediately, and then get quick sign-offs on the remaining failures from all projects.

We're at the point that imho, this fix has taken too long. If we don't get a fix in immediately I'm going to start recommending we release without this.

Per discussion on release list, as 68808 has not been merged and autorelease 234 passed, we have declared Oxygen RC3 from autorelease 234. We can target 68808 for the Oxygen SR1 release, or from the oxygen CD repos as soon as it's merged into stable/oxygen.

I'm not sure how we should handle the Jira flags here shague. Set the Fix Version to Oxygen-SR1 or change the Severity flag to Critical?

Working with latest build.