X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=inline;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fsdwan%2FGENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml;h=7d8950adc5f94d1d785fcffae72328755e346a50;hb=9d188efd67fe81b7e9b190afd8858eb042b813ac;hp=3e5e8d906f465a25c29dd1c3a93ad489fe5b6391;hpb=da9bacaddbf914220d80ef412fb8ec4aa7a724e7;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
index 3e5e8d90..7d8950ad 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml
@@ -4,24 +4,6 @@
     <method rpc='sdwan-vf-operation-vpn-create' mode='sync'>
         <block atomic="true">
             <call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' ></call>
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="There are no VNFs in MD-SAL" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">
-                    <outcome value='true'>
-                        <set>
-                            <parameter name='vnf-index' value='`$idx`' />
-                        </set>
-                    </outcome>
-                </switch>
-            </for>
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
                 <outcome value=''>
                     <set>
@@ -98,7 +80,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />
             </set>
             <set>
-                <parameter name='vf-module-id' value='`$prop.site-vf-index`' />
+                <parameter name='vf-module-id' value='`$prop.vpn-vf-index`' />
                 <parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $vf-module-topology-operation-input.service-information.service-instance-id
  + '/service-data/vnfs/vnf/'
@@ -128,7 +110,9 @@
                 <parameter name='sdwan-vpn-name' value='`$prop.name`' />
                 <parameter name='topology' value='`$prop.topology`' />
                 <parameter name='operational-status' value='Created' />
-                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' /><parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' /><parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' >
+                <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />
+                <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />
+                <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vpn-vf-index + '/vf-module-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 
@@ -146,4 +130,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file