summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshashikanth.vh <shashikanth.vh@huawei.com>2017-11-10 11:29:10 +0530
committerShashikanth VH <shashikanth.vh@huawei.com>2017-11-10 06:03:28 +0000
commit79c96eaf1012c1ab4af6dfda4f637a225bf2d7fc (patch)
tree1ea83d71ae286f53f51674a580d2c4b5dd7098f7
parentc0682b82e7579a29e3fc3f942bb0582213f9468b (diff)
Fix underlay DG delete testing issue
Fixed issue comparing network-input-parameter serviceType with service-type https://jira.onap.org/browse/SDNC-186 Issue-Id: SDNC-186 Change-Id: Ia70f6c80e7ac04eb111b72753483a74915209aa4 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com> Former-commit-id: 25a1cca7cd218378aac254e2d87ae2ec89fbca49
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml2
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`" />