diff options
| author |   ramu.n <ramu.n@huawei.com> | 2017-10-16 20:53:50 +0530 |
|---|---|---|
| committer | ramu.n <ramu.n@huawei.com> | 2017-10-16 20:53:50 +0530 |
| commit | 55df8be379e56ebf9a23f3406791386b3ff075ca (patch) | |
| tree | 1abe810e6d69a1f0b9a37db6c42692cf7e3bab97 /platform-logic/generic-resource-api/src/main/xml | |
| parent | b9e83935cbb19d62730d855cf0e1efbff3ee664d (diff) | |
Fix underlay DG testing issues
*Use "network-topology-operation-input.sdnc-request-header.svc-action" instead of service-topology-operation-input.sdnc-request-header.svc-action
*Fix indexing of network-topology-operation-input.network-request-input.network-input-parameters
*Fix sdnc-request-header.svc-action switch case order
Change-Id: Icc91131cfc6dca0baacd1df312bfff653c65cb11
Issue-Id: SDNC-131
Signed-off-by: Ramu N <ramu.n@huawei.com>
Former-commit-id: e38045ecf304cb65f348c019ffc859c649e030e8
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 14 insertions, 14 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml index 0753281e..bc167e8f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml @@ -232,14 +232,14 @@ <return status="failure">
<parameter name="ack-final" value="Y" />
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+ <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
</return>
</outcome>
<outcome value="Other">
<return status="failure">
<parameter name="ack-final" value="Y" />
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+ <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
</return>
</outcome>
</get-resource>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml index 435ecf00..930e2773 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml @@ -11,21 +11,21 @@ </return>
</outcome>
</switch>
- <switch test="`$service-topology-operation-input.sdnc-request-header.svc-action`">
+ <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
<outcome value="create">
<block atomic="true">
<switch test="`$network-topology-operation-input.request-information.request-action`">
<outcome value="CreateNetworkInstance">
<block atomic="true">
- <for index="i" start="0" end="`$network-topology-information.network-request-input.network-input-parameters.param_length`">
+ <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
<block>
<set>
<parameter name="tmp.name" value="" />
<parameter name="tmp.value" value="" />
</set>
<set>
- <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name`" />
- <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value`" />
+ <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`" />
+ <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`" />
</set>
<switch test="`$tmp.name`">
<outcome value="name">
@@ -208,7 +208,7 @@ <return status="failure">
<parameter name="ack-final" value="Y" />
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+ <parameter name="error-message" value="`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`" />
</return>
</outcome>
</switch>
@@ -269,13 +269,6 @@ </outcome>
</switch>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y" />
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
- </return>
- </outcome>
<outcome value="delete">
<block atomic="true">
<switch test="`$network-topology-operation-input.request-information.request-action`">
@@ -305,6 +298,13 @@ </switch>
</block>
</outcome>
+ <outcome value="Other">
+ <return status="failure">
+ <parameter name="ack-final" value="Y" />
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+ </return>
+ </outcome>
</switch>
</block>
</method>
|