Filtration of aggregation points where input model is inventory and output is i2rs and unification inside of termination points where input model is network topology or inventory and output model is i2rs does not work correctly.

Number of termination points should be correct, but number of supporting termination points is not. They do not contain tp-id from underlay topology in tp-ref tag and in aggregation is per termination point only one supporting termination point (sometimes there should be more).

System tests for this bug are in this [1] change in files 010 Aggregation and 030 Filtration termination points.

[1] - https://git.opendaylight.org/gerrit/#/c/36896/