mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-12 00:13:05 +02:00
Code Issues Projects Releases Wiki Activity

Minor fix for tapi helper and for TAPI Rpc error message

Browse Source 
Change-Id: Ieef1c0937f797efc26a00d9e9e67850cb92f6919
This commit is contained in:
Andrea Campanella 2019-02-27 16:10:08 +01:00
parent dcdbc894b4
commit 34694eb54a
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/odtn/api/src/test/resources/openconfig-device-link.json
View File

@ -4,42 +4,48 @@
"basic": {
"type": "OPTICAL",
"metric": 1,
"durable": true
"durable": true,
"bidirectional": true
}
},
"netconf:127.0.0.1:11002/202-netconf:127.0.0.1:11003/202": {
"basic": {
"type": "OPTICAL",
"metric": 1,
"durable": true
"durable": true,
"bidirectional": true
}
},
"netconf:127.0.0.1:11002/203-netconf:127.0.0.1:11003/203": {
"basic": {
"type": "OPTICAL",
"metric": 1,
"durable": true
"durable": true,
"bidirectional": true
}
},
"netconf:127.0.0.1:11002/204-netconf:127.0.0.1:11003/204": {
"basic": {
"type": "OPTICAL",
"metric": 1,
"durable": true
"durable": true,
"bidirectional": true
}
},
"netconf:127.0.0.1:11002/205-netconf:127.0.0.1:11003/205": {
"basic": {
"type": "OPTICAL",
"metric": 1,
"durable": true
"durable": true,
"bidirectional": true
}
},
"netconf:127.0.0.1:11002/206-netconf:127.0.0.1:11003/206": {
"basic": {
"type": "OPTICAL",
"metric": 1,
"durable": true
"durable": true,
"bidirectional": true
}
}
}

2
apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DcsBasedTapiConnectivityRpc.java
View File

@ -82,7 +82,7 @@ public class DcsBasedTapiConnectivityRpc implements TapiConnectivityService {
// check SIP validation
if (!disjoint(getUsedSips(), input.getSips())) {
log.error("check SIP validation : NG");
log.error("SIPS {} are already used, please use a different pair", input.getSips());
return new RpcOutput(RpcOutput.Status.RPC_FAILURE, null);
}
log.debug("check SIP validation : OK");

22
tools/test/scenarios/bin/tapiHelper.py
View File

@ -141,6 +141,8 @@ def create_client_connection(url_context, url_connectivity):
assert topo["uuid"] == nep_pair[1]["topology-uuid"]
(src_onep, dst_onep) = (find_client_onep(nep_pair[0], topo["node"]),
find_client_onep(nep_pair[1], topo["node"]))
print "client side neps", (src_onep, dst_onep)
src_sip_uuid, dst_sip_uuid = \
(src_onep["mapped-service-interface-point"][0]["service-interface-point-uuid"],
dst_onep["mapped-service-interface-point"][0]["service-interface-point-uuid"])
@ -157,6 +159,14 @@ def create_client_connection(url_context, url_connectivity):
raise Exception('POST {}'.format(resp.status_code))
return resp
#
# Parse array structure "name" under structure "owned node edge point"
#
def parse_value(arr):
rtn = {}
for item in arr:
rtn[item["value-name"]] = item["value"]
return rtn
#
# Find node edge point of node structure in topology with client-side port, by using nep with line-side port.
@ -168,16 +178,18 @@ def find_client_onep(line_nep_in_link, nodes):
conn_id = None
for onep in node["owned-node-edge-point"]:
if onep["uuid"] == line_nep_in_link["node-edge-point-uuid"]:
assert onep["name"][1]["value-name"] == "odtn-connection-id"
assert onep["name"][0]["value"] == "line"
conn_id = onep["name"][1]["value"]
break
name = parse_value(onep["name"])
if name["odtn-port-type"] == "line":
conn_id = name["odtn-connection-id"]
break
if conn_id is None:
raise AssertionError("Cannot find owned node edge point with node id %s and nep id %s."
% (line_nep_in_link["node-uuid"], line_nep_in_link["node-edge-point-uuid"], ))
for onep in node["owned-node-edge-point"]:
if onep["name"][1]["value"] == conn_id and onep["name"][0]["value"] == "client":
name = parse_value(onep["name"])
if name["odtn-port-type"] == "client" and name["odtn-connection-id"] == conn_id:
return onep
return None