diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-24 13:17:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-24 13:17:09 +0000 |
| commit | 8dd85b45ef44aa2be93d2826337a09d4938c3c9b (patch) | |
| tree | c99d8030c4c0dda274a6916cc57b716533407bd8 /platform-logic/generic-resource-api/src/main/xml | |
| parent | 98dc6ca82b047cf4358c1ba5580d205f6eb428d0 (diff) | |
| parent | a1eccf158f780c656bb397944d107f47fe6de599 (diff) | |
Merge "integration test issues fix for sdwan and sotn"
Former-commit-id: c2dff62218b88569dcf26ec9d43a0fe92e4c91d9
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 75 insertions, 69 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml index 77ad158c..0116dac2 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml @@ -285,20 +285,17 @@ <parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
<outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create wan port rest api" />
- </return>
+ <block atomic="true"></block>
</outcome>
<outcome value='success'>
- <block atomic="true"></block>
+ <block atomic="true">
+ <set>
+ <parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />
+ </set>
+ </block>
</outcome>
</execute>
<set>
- <parameter name='prop.wan.wanPortId' value='`$wanPortResp.success[0].id`' />
- </set>
- <set>
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value='devicePortId' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.wan.devicePortId`' />
<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml index 1c7f5cbd..290426ba 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml @@ -352,9 +352,33 @@ <block atomic="true">
<switch test="`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANPortInstance'`">
<outcome value='true'>
- <set>
- <parameter name='tmp.portvidx' value='`$arvidx`' />
- </set>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.portvidx' value='`$arvidx`' />
+ </set>
+ <for index="wportidx" start="0" end="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">
+ <block atomic="true">
+ <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`">
+ <outcome value='true'>
+ <block atomic="true">
+ <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value == $prop.spoke.transportNetworkName`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.wanportvidx' value='`$arvidx`' />
+ </set>
+ <set>
+ <parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </for>
+ </block>
</outcome>
</switch>
<switch test="`$mdsal-arsd.service-data.vnfs.vnf[$arvidx].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`">
@@ -374,7 +398,7 @@ </block>
</for>
<block atomic="true">
- <switch test="`$tmp.portvidx`">
+ <switch test="`$tmp.wanportvidx`">
<outcome value=''>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -402,44 +426,37 @@ </outcome>
</switch>
</block>
- <for index="wportidx" start="0" end="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">
- <block atomic="true">
- <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'transportNetworkName'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.hub.transportNetworkName' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
- </set>
- </outcome>
- </switch>
- <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`">
- <outcome value='true'>
- <set>
- <parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.portvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
- </set>
- </outcome>
- </switch>
- </block>
- </for>
<switch test="`$prop.hub.transportNetworkName == $prop.spoke.transportNetworkName`">
<outcome value='false'>
<block></block>
</outcome>
<outcome value='true'>
<block atomic="true">
+ <for index="wportidx" start="0" end="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length`">
+ <block atomic="true">
+ <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'wanPortId'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.hub.wanPortId' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'providerIpAddress'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.hub.providerIpAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].name == 'ipAddress'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='prop.hub.ipAddress' value='`$mdsal-arsd.service-data.vnfs.vnf[$tmp.wanportvidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$wportidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </block>
+ </for>
<set>
<parameter name='prop.hubTnpId' value='$prop.hub.wanPortId' />
</set>
@@ -501,13 +518,11 @@ <parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
<outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing sdwan hub route underlay rest api" />
- </return>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value='success'></outcome>
</execute>
<set>
<parameter name='prop.spoke.ipAddress' value="10.3.0.1" />
@@ -535,13 +550,11 @@ <parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
<outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing sdwan spoke route underlay rest api" />
- </return>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value='success'></outcome>
</execute>
<set>
<parameter name='prop.underlay.routeIds[$prop.underlay.routeIds_length].hubSiteId' value='`$prop.hub.siteId`' />
@@ -606,13 +619,11 @@ <parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
<outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing sdwan hub route underlay rest api" />
- </return>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value='success'></outcome>
</execute>
<set>
<parameter name='prop.spoke.ipAddress' value="10.3.0.1" />
@@ -641,13 +652,11 @@ <parameter name="keyStorePassword" value="adminadmin"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
<outcome value='failure'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing sdwan spoke route underlay rest api" />
- </return>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value='success'></outcome>
</execute>
</block>
</outcome>
|