When a ROADM node includes multiple SRGs such as SRG1, SRG10, SRG11, etc., the termination points (tp-id) created under SRG1 in the openroadm topology will include erroneous entries such as SRG10-PPn-TXRX under SRG1. This is caused by the createTopologyShard method in OpenRoadmTopology.java filtering and selecting all logical connection points in the port mapping list which contains SRG1 as a substring which is also true for SRG10, SRG11, etc.