SCS ignores excludeHops on one path when there are multiple paths

[Aaron Helsinger]

If a request has multiple paths, a hop_exclusion_list on only one of the paths gets ignored.

Request RSpec is attached.

Failure case:

12:39:01 DEBUG   : Calling SCS with options {'geni_workflow_paths_merged': True, 'geni_routing_profile': {'link-gpo-stan': {'hop_inclusion_list': ['urn:publicid:IDN+instageni.stanford.edu+interface+procurve2:1.24.ion.salt.xe-0_1_1']}, u'link-stan-miss': {'hop_exclusion_list': [u'urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.kans.net.internet2.edu:eth5/1:*=1164', u'urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.sunn.net.internet2.edu:e5/1:*=1644']}}}
12:39:18 DEBUG   : SCS gave hop urn:publicid:IDN+instageni.rnet.missouri.edu+interface+procurve2:1.19.al2s.kans.eth5_1 suggested VLAN 1164, avail: '1161-1165'
12:39:18 DEBUG   : SCS gave hop urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.kans.net.internet2.edu:eth5/1:* suggested VLAN 1164, avail: '1161-1165'
12:39:18 DEBUG   : SCS gave hop urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.sunn.net.internet2.edu:e5/1:* suggested VLAN 1643, avail: '1640-1644,1650-1669'
12:39:18 DEBUG   : SCS gave hop urn:publicid:IDN+instageni.stanford.edu+interface+procurve2:1.24.al2s.sunn.e5_1 suggested VLAN 1643, avail: '1640-1644'

As you can see, the SCS picked a tag I specifically asked it not to.

Works:

12:30:08 DEBUG   : Calling SCS with options {'geni_workflow_paths_merged': True, 'geni_routing_profile': {u'link-gpo-stan': {'hop_exclusion_list': [u'urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.kans.net.internet2.edu:eth5/1:*=1164', u'urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.sunn.net.internet2.edu:e5/1:*=1644'], 'hop_inclusion_list': ['urn:publicid:IDN+instageni.stanford.edu+interface+procurve2:1.24.ion.salt.xe-0_1_1']}, u'link-stan-miss': {'hop_exclusion_list': [u'urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.kans.net.internet2.edu:eth5/1:*=1164', u'urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.sunn.net.internet2.edu:e5/1:*=1644']}}}
...
12:30:24 DEBUG   : SCS gave hop urn:publicid:IDN+instageni.rnet.missouri.edu+interface+procurve2:1.19.al2s.kans.eth5_1 suggested VLAN 1165, avail: '1161-1163,1165'
12:30:24 DEBUG   : SCS gave hop urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.kans.net.internet2.edu:eth5/1:* suggested VLAN 1165, avail: '1161-1163,1165'
12:30:24 DEBUG   : SCS gave hop urn:publicid:IDN+al2s.internet2.edu+interface+sdn-sw.sunn.net.internet2.edu:e5/1:* suggested VLAN 1642, avail: '1640-1643,1650-1669'
12:30:24 DEBUG   : SCS gave hop urn:publicid:IDN+instageni.stanford.edu+interface+procurve2:1.24.al2s.sunn.e5_1 suggested VLAN 1642, avail: '1640-1643'

This is the desired behavior. The SCS excluded the tag that I said was unavailable from the vlanRangeRequest - both at the hop where I said it was unavailable, AND at the hop where that hop actually imports tags.

[xyang@maxgigapop.net]

Fixed in trunk code with revision 743. Will pass to release r2.5 for NOC deployment.