Comment 51 for bug 1813007

Submitter: Zuul
Branch: stable/stein

commit f6652f0ee6c51a0238d2b1ce10a86040456c85d9
Author: Brian Haley <email address hidden>
Date: Thu Feb 28 22:19:16 2019 -0500

    Fix KeyError in OVS firewall

    When merging port ranges, the code never assumed the
    conjunction ID might not be present in the set due to
    already being removed.

    In this case there were two security groups, both using
    the same remote security group, but the first security
    group does not define a port range and the second one does.
    Or more generally, the first SG port range is a subset
    of the second, as no port-range means the full range.

    Change-Id: I17ab643abbd2ec21eda4ae1dfb9abf2d4b0657f2
    Closes-bug: #1813007
    (cherry picked from commit 18c578aa10c19a6befdf1f1510645200f173eb44)