diff options
author | 2018-09-07 23:00:43 +0530 | |
---|---|---|
committer | 2018-09-07 23:00:49 +0530 | |
commit | 911b3733c248a4c9ecbd4d5bbc3ae9991b3b8a74 (patch) | |
tree | fb766cc71e87c91fa76038d9558c6a2ca308dca9 /platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml | |
parent | 55b429cfc73802e3e52fa2f3864ecc4cdd552728 (diff) |
integration test issues fix for sdwan and sotn
Change-Id: I3bc75cd456c15a89ebf3b4e91e9b3836e7322b66
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 24f0d8fc370633b26f18015e15c4c62002d697e1
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml')
-rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml index 23b28c85..7ec1dd82 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml @@ -378,8 +378,7 @@ </set> <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" - key="network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id - AND pnf.pnf-name = $oof.vpn.access-node-id + key="pnf.pnf-name = $oof.vpn.access-node-id AND depth = '0'" pfx='tmp.aai.pnf' local-only='false' > <outcome value='success'> @@ -431,7 +430,7 @@ </get-resource> <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" /> - <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" /> + <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" /> <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" /> <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" /> <parameter name="format" value="json"/> @@ -489,7 +488,7 @@ key='vpn-binding.vpn-id = $tmp.vpnName' force="true" pfx="tmp.AnAI-data"> <parameter name="relationship-list.relationship[0].related-to" value="p-interface" /> - <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $src-ltpId`" /> + <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" /> </save> @@ -497,7 +496,7 @@ key='vpn-binding.vpn-id = $tmp.vpnName' force="true" pfx="tmp.AnAI-data"> <parameter name="relationship-list.relationship[0].related-to" value="p-interface" /> - <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $dst-ltpId`" /> + <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" /> </save> @@ -571,8 +570,7 @@ pfx='pfx' local-only='false' force='false'> <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" /> <parameter name="selflink" value="`$tmp.ar.self-link`" /> - <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /> - <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /> + <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /--> <parameter name="operational-status" value="Active" /> <outcome value='failure'> <return status='failure'> |