diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-11-10 16:04:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-10 16:04:16 +0000 |
| commit | 08cfcb2f74bcebdf714f6e47a72814234a27a195 (patch) | |
| tree | 64f0a504e6c2f48139faba6b7380a252774967f0 | |
| parent | d08f504e04904d936cd476443f89785ccd832c8d (diff) | |
| parent | 79c96eaf1012c1ab4af6dfda4f637a225bf2d7fc (diff) | |
Merge "Fix underlay DG delete testing issue"
Former-commit-id: 76837bb60dfacf172e6ef8c09552bbb0bc7c4396
2 files changed, 2 insertions, 2 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json index 5d46c148..3c8257f1 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json @@ -257,7 +257,7 @@ "id": "a7f93024.722988", "type": "switchNode", "name": "switch service-type", - "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n", + "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`\">\n", "comments": "", "outputs": 1, "x": 1341, diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml index 87deaa5d..3e2ff578 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml @@ -44,7 +44,7 @@ </set>
</outcome>
</switch>
- <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+ <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`">
<outcome value="true">
<set>
<parameter name="prop.l3vpn.service-type" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
|