diff options
| author |   shashikanth.vh <shashikanth.vh@huawei.com> | 2017-11-13 19:32:20 +0530 |
|---|---|---|
| committer | shashikanth.vh <shashikanth.vh@huawei.com> | 2017-11-13 19:32:29 +0530 |
| commit | 65870ccb13d9e0f9d9f78604dea45abc014f56be (patch) | |
| tree | c78b27ae2eabe42f010841bb1bca248ab659ef81 /platform-logic/generic-resource-api/src/main/xml | |
| parent | 923760e351b66e980cef9547cd8cb2934265e0cc (diff) | |
Fix Overlay DG testing issue
After executing DeActivateDCINetworkInstance, DeleteNetworkInstance
node is executed as atomic block is not present, added new block,
also fixed required parameter issue where value is not passed.
https://jira.onap.org/browse/SDNC-191
Issue-Id: SDNC-191
Change-Id: Ia3009882fd7c2320a333ba04f726d57079f2d509
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 6b6ccfc2d1702eaae39a7e4877e51d274e17b07f
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 4 insertions, 2 deletions
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 19e61710..0987a773 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 @@ -247,7 +247,7 @@ <outcome value="DeActivateDCINetworkInstance">
<block atomic="true">
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
- <parameter name="$network-topology-operation-input.network-information.network-id" value="" />
+ <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id" />
</execute>
<switch test="`$network-topology-operation-input.network-information.network-id`">
<outcome value="">
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml index 1f70a4b7..c0dc8f14 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml @@ -370,7 +370,9 @@ <outcome value="deactivate">
<block atomic="true">
<switch test="`$network-topology-operation-input.request-information.request-action`">
- <outcome value="DeActivateDCINetworkInstance" />
+ <outcome value="DeActivateDCINetworkInstance">
+ <block atomic="true" />
+ </outcome>
<outcome value="DeleteNetworkInstance">
<block atomic="true">
<switch test="`$network-topology-operation-input.network-information.network-id`">
|