<service-logic\r
- xmlns='http://www.onap.org/sdnc/svclogic'\r
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
+ xmlns='http://www.onap.org/sdnc/svclogic'\r
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\r
<block atomic="true">\r
<switch test='`$service-data.vnfs.vnf_length`'>\r
</outcome>\r
</switch>\r
</for>\r
+ <switch test='`$vnf-index`'>\r
+ <outcome value=''>\r
+ <return status='failure'>\r
+ <parameter name='ack-final' value='Y'/>\r
+ <parameter name="error-code" value="500" />\r
+ <parameter name="error-message" value="vnf id not found in service-data" />\r
+ </return>\r
+ </outcome>\r
+ </switch>\r
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
<outcome value='0'>\r
<return status='failure'>\r
<set>\r
<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\r
</set>\r
- <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' ></call>\r
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
</block>\r
</outcome>\r
</switch>\r
<outcome value='false'>\r
<block atomic="true">\r
<set>\r
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\r
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\r
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-id`' />\r
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />\r
</set>\r
<set>\r
<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\r
+ $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
+ '/vf-module-data/vf-module-topology/'`"/>\r
<parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ $vf-module-topology-operation-input.service-information.service-instance-id\r
+ '/service-data/vnfs/vnf/'\r
+ $service-data.vnfs.vnf[$vnf-index].vnf-id\r
+ '/vnf-data/vnf-topology/'`"/>\r
<parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+ $vf-module-topology-operation-input.service-information.service-instance-id\r
+ '/service-data/service-topology/'`"/>\r
</set>\r
- <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' \r
- key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
+ <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'\r
+ key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
<return status='success'>\r
<parameter name="ack-final-indicator" value="Y" />\r
<parameter name="error-code" value="200" />\r