Minor fixed on tapiHelper.py to match Nokia's condition where line-side and client-side may be not mapped all the time.
Change-Id: Icc816755ec54e43374781de533d38f53ddc5409f
diff --git a/tools/test/scenarios/bin/tapiHelper.py b/tools/test/scenarios/bin/tapiHelper.py
index 47fdd65..b016fb2 100755
--- a/tools/test/scenarios/bin/tapiHelper.py
+++ b/tools/test/scenarios/bin/tapiHelper.py
@@ -219,7 +219,7 @@
vals = parse_value(onep["name"])
if vals["odtn-connection-id"] == conn_id and vals["odtn-port-type"] == "client":
return onep["mapped-service-interface-point"][0]["service-interface-point-uuid"], vals
- return None
+ return None, None
#
@@ -249,6 +249,10 @@
src_onep, dst_onep, src_sip_uuid, dst_sip_uuid = parse_src_dst(topo, link_index)
client_src_sip_uuid, client_src_name = find_mapped_client_sip_uuid(src_sip_uuid, topo["node"])
client_dst_sip_uuid, client_dst_name = find_mapped_client_sip_uuid(dst_sip_uuid, topo["node"])
+ if client_src_sip_uuid is None or client_dst_sip_uuid is None:
+ # If there is no two mapped client-side ports existed, then skip all next steps,
+ # and traverse the next link directly
+ continue
# firstly, check if line-side service exists
# If line-side service exists
if src_sip_uuid in used_sip_uuids and dst_sip_uuid in used_sip_uuids: