From 45668145649102a2b1b2378e682c8e23f756a8b8 Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Wed, 13 May 2020 23:26:53 +0000 Subject: Using RestApiCallNode instead of RestconfApiCallNode and updating templates accordingly. - This is also required for F release. Issue-ID: SDNC-1184 Signed-off-by: Hesam Rahimi Change-Id: I527253d75dd1e49e87877b17588c1d4c2c3dbed1 Former-commit-id: ca9f45cb92f35a6f0235f0a84e8d7b2f50e0e0de --- .../src/main/json/sotn-ethernet-service.json | 80 ++++++++++++++-------- .../src/main/json/sotn-otn-tunnel-service.json | 72 ++++++++++++------- 2 files changed, 97 insertions(+), 55 deletions(-) (limited to 'platform-logic/restapi-templates/src') diff --git a/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json b/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json index 582e88e3..6fdb4e10 100644 --- a/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json +++ b/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json @@ -1,42 +1,64 @@ { "ietf-eth-tran-service:etht-svc": { - "globals": { - "etht-svc-bandwidth-profiles": [ - { - "bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name}, - "bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp", - "CIR": ${prop.global.sotn.cir}, - "EIR": ${prop.global.sotn.eir}, - "color-aware": ${prop.global.sotn.colorAware}, - "coupling-flag": ${prop.global.sotn.couplingFlag} - } - ] - }, "etht-svc-instances": [ { "etht-svc-name": ${prop.global.sotn.etht-svc-name}, - "access-provider-id": ${oof.vpn.access-provider-id}, - "access-client-id": ${oof.vpn.access-client-id}, - "access-topology-id": ${oof.vpn.access-topology-id}, + "te-topology-identifier":{ + "provider-id":${oof.vpn.access-provider-id}, + "client-id":${oof.vpn.access-client-id}, + "topology-id":${oof.vpn.access-topology-id} + }, "etht-svc-type": "ietf-eth-tran-types:p2p-svc", + "underlay":{ + "pw":{ + "pw-name":"pwName", + "pw-id":"123", + "pw-paths":[ + { + "path-id":"123", + "tp-tunnels":[ + { + "name":"tptunnel-22" + } + ] + } + ] + } + }, + "resilience":{ + "protection":{ + "enable":"true", + "hold-off-time":"0", + "protection-reversion-disable":"true", + "protection-type":"ietf-te-types:lsp-protection-unprotected", + "wait-to-revert":"0" + } + }, "admin-status": "ietf-te-types:tunnel-state-up", - "etht-svc-access-ports": [ - { - "access-port-id": "0", - "access-node-id": ${oof.vpn.access-node-id}, - "access-ltp-id": ${oof.vpn.src-access-ltp-id}, - "service-classification-type": "ietf-eth-tran-types:port-classification", - "ingress-egress-bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name} - }, + "etht-svc-end-points":[ { - "access-port-id": "1", - "access-node-id": ${oof.vpn.access-node-id}, - "access-ltp-id": ${oof.vpn.dst-access-ltp-id}, - "service-classification-type": "ietf-eth-tran-types:port-classification", - "ingress-egress-bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name} + "etht-svc-end-point-name":"source-point-name", + "etht-svc-access-points":[ + { + "access-point-id":"0", + "access-node-id":${oof.vpn.access-node-id}, + "access-ltp-id":${oof.vpn.src-access-ltp-id} + }, + { + "access-point-id":"1", + "access-node-id":${oof.vpn.access-node-id}, + "access-ltp-id":${oof.vpn.dst-access-ltp-id} + } + ], + "outer-tag":{ + "tag-type":"ietf-eth-tran-types:classify-c-vlan", + "vlan-value":1 + }, + "service-classification-type":"ietf-eth-tran-types:vlan-classification", + "ingress-egress-bandwidth-profile":${prop.global.sotn.bandwidth-profile-name} } ] } ] } -} \ No newline at end of file +} diff --git a/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json b/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json index 085d4944..38869639 100644 --- a/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json +++ b/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json @@ -3,34 +3,54 @@ "tunnels":{ "tunnel":[ { - "destination": ${oof.vpn.access-node-id}, - "source": ${otn-domain.node-id}, - "src-ttp-id": ${otn-domain.ttp-id}, - "ietf-otn-tunnel:src-tpn": ${otn-domain.tpn}, - "name": "otntunnel-22", - "te-topology-identifier": { - "client-id": ${otn-domain.client-id}, - "provider-id": ${otn-domain.provider-id}, - "topology-id": ${otn-domain.te-topo-id} - } + "destination": ${ietf-te_te.tunnels.tunnel[0].destination}, + "source": ${ietf-te_te.tunnels.tunnel[0].source}, + "src-ttp-id": ${ietf-te_te.tunnels.tunnel[0].src-ttp-id}, + "dst-ttp-id": ${ietf-te_te.tunnels.tunnel[0].dst-ttp-id}, + "ietf-otn-tunnel:src-tpn": ${ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn}, + "ietf-otn-tunnel:dst-tpn": ${ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn}, + "te-bandwidth": { + "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp" }, + "encoding": "ietf-te-types:lsp-encoding-oduk", + "name": ${ietf-te_te.tunnels.tunnel[0].name}, + "restoration": { + "enable": "false", + "hold-off-time": "0", + "restoration-reversion-disable": "true", + "restoration-type": "ietf-te-types:lsp-restoration-restore-any", + "wait-to-revert": "0" + }, + "switching-type": "ietf-te-types:switching-otn", + "provisioning-state": "ietf-te-types:tunnel-state-down", + "te-topology-identifier": { + "client-id": ${ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id}, + "provider-id": ${ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id}, + "topology-id": ${ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id} + } + }, { - "destination": ${oof.vpn.access-node-id}, - "source": ${otn-domain.node-id}, - "src-ttp-id": ${otn-domain.ttp-id}, - "ietf-otn-tunnel:src-tpn": ${otn-domain.tpn}, - "name": "tptunnel-22", - "dependency-tunnels": { - "dependency-tunnel": [ - "name": "tptunnel-22" - ] - }, - "te-topology-identifier": { - "client-id": ${otn-domain.client-id}, - "provider-id": ${otn-domain.provider-id}, - "topology-id": ${otn-domain.te-topo-id} - } - } + "destination": ${ietf-te_te.tunnels.tunnel[1].destination}, + "source": ${ietf-te_te.tunnels.tunnel[1].source}, + "encoding": "ietf-te-types:lsp-encoding-packet", + "name": ${ietf-te_te.tunnels.tunnel[1].name}, + "dependency-tunnels": { + "dependency-tunnel": [ + { + "name": ${ietf-te_te.tunnels.tunnel[0].name}, + "encoding": "ietf-te-types:lsp-encoding-oduk", + "switching-type": "ietf-te-types:switching-otn" + } + ] + }, + "switching-type": "ietf-te-types:switching-psc1", + "te-topology-identifier": { + "client-id": ${ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id}, + "provider-id": ${ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id}, + "topology-id": ${ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id} + }, + "provisioning-state": "ietf-te-types:tunnel-state-down" + } ] } } -- cgit 1.2.3-korg