SDWAN Device vf create not handled for invalid vnf id

1.vnf id validation not handled while device vf creation
2.device instance in AAI can be created be SO or SDNC
  if SO create then SDNC has to update otherwise create
  device instance in AAI, this scenario handled.

Change-Id: Ia7591f6dbeffcac6041237e3822e68a9bd005684
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: ea0bc09eba2eeb36f99d32d42b94a5a84801eab4

1 files changed, 103 insertions, 37 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
index 9b3109d3..80df2aad 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml
@@ -3,6 +3,9 @@
     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}'>

     <method rpc='sdwan-vf-operation-device-create' mode='sync'>

         <block atomic="true">

+            <set>

+                <parameter name='prop.sdncCreate' value='false' />

+            </set>

             <switch test='`$service-data.vnfs.vnf_length`'>

                 <outcome value=''>

                     <return status='failure'>

@@ -21,28 +24,77 @@
                     </outcome>

                 </switch>

             </for>

-            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>

+            <switch test='`$vnf-index`'>

                 <outcome value=''>

-                    <set>

-                        <parameter name='vf-index' value='0' />

-                    </set>

+                    <return status='failure'>

+                        <parameter name='ack-final' value='Y'/>

+                        <parameter name="error-code" value="500" />

+                        <parameter name="error-message" value="vnf id not found in service-data" />

+                    </return>

                 </outcome>

-                <outcome value='Other'>

-                    <block>

+            </switch>

+            <switch test="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`">

+                <outcome value=''>

+                    <block atomic="true">

                         <set>

-                            <parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />

+                            <parameter name='prop.sdncCreate' value='true' />

                         </set>

+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >

+                            <parameter name="ctx-destination" value="prop.vf-id"/>

+                        </execute>

+                        <block atomic="true">

+                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>

+                                <outcome value=''>

+                                    <set>

+                                        <parameter name='vf-index' value='0' />

+                                    </set>

+                                </outcome>

+                                <outcome value='Other'>

+                                    <set>

+                                        <parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />

+                                    </set>

+                                </outcome>

+                            </switch>

+                            <set>

+                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />

+                            </set>

+                        </block>

+                    </block>

+                </outcome>

+                <outcome value='Other'>

+                    <block atomic="true">

+                        <block atomic="true">

+                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>

+                                <outcome value=''>

+                                    <set>

+                                        <parameter name='vf-index' value='0' />

+                                    </set>

+                                </outcome>

+                                <outcome value='Other'>

+                                    <set>

+                                        <parameter name='vf-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />

+                                    </set>

+                                </outcome>

+                            </switch>

+                            <set>

+                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />

+                            </set>

+                        </block>

                         <for index='idx' start='0' end='`$vf-index`' >

                             <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`">

                                 <outcome value='true'>

                                     <return status='failure'>

                                         <parameter name='ack-final' value='Y'/>

                                         <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id already found in service-data" />

+                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id

+      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`" />

                                     </return>

                                 </outcome>

                             </switch>

                         </for>

+                        <set>

+                            <parameter name='prop.vf-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />

+                        </set>

                     </block>

                 </outcome>

             </switch>

@@ -63,29 +115,22 @@
             </set>

             <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-device-param' mode='sync' ></call>

             <set>

-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index + 1`' />

-            </set>

-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >

-                <parameter name="ctx-destination" value="prop.device-vf-index"/>

-            </execute>

-            <set>

-                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.device-vf-index`' />

+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-id' value='`$prop.vf-id`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vnf-information.' value='`$vf-module-topology-operation-input.vnf-information.`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />

-                <!--parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' /-->

-                <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.vf-id`'/>

                 <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/'

  + $service-data.vnfs.vnf[$vnf-index].vnf-id

  + '/vnf-data/vf-modules/vf-module/'

- + $prop.device-vf-index

+ + $prop.vf-id

  + '/vf-module-data/vf-module-topology/'`"/>

                 <parameter name='vnf-object-path'

  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

@@ -103,30 +148,51 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />

             </set>

-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

-      key='device.device-id = $prop.device-vf-index' >

-                <parameter name='device-id' value='`$prop.device-vf-index`' />

-                <parameter name='esn' value='`$prop.device.esn`' />

-                <parameter name='device-name' value='`$prop.device.name`' />

-                <parameter name='description' value='`$prop.device.description`' />

-                <parameter name='vendor' value='`$prop.device.vendor`' />

-                <parameter name='class' value='`$prop.device.class`' />

-                <parameter name='type' value='`$prop.device.deviceModel`' />

-                <parameter name='version' value='`$prop.device.version`' />

-                <parameter name='system-ip' value='`$prop.device.systemIp`' />

-                <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='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.device-vf-index + '/vf-module-data/'` " />

-            </save>

+            <switch test='`$prop.sdncCreate`'>

+                <outcome value='true'>

+                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

+      key='device.device-id = $prop.vf-id' >

+                        <parameter name='device-id' value='`$prop.vf-id`' />

+                        <parameter name='esn' value='`$prop.device.esn`' />

+                        <parameter name='device-name' value='`$prop.device.name`' />

+                        <parameter name='description' value='`$prop.device.description`' />

+                        <parameter name='vendor' value='`$prop.device.vendor`' />

+                        <parameter name='class' value='`$prop.device.class`' />

+                        <parameter name='type' value='`$prop.device.deviceModel`' />

+                        <parameter name='version' value='`$prop.device.version`' />

+                        <parameter name='system-ip' value='`$prop.device.systemIp`' />

+                        <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='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.vf-id + '/vf-module-data/'` " />

+                    </save>

+                </outcome>

+                <outcome value='false'>

+                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

+      key='device.device-id = $prop.vf-id' >

+                        <parameter name='device-id' value='`$prop.vf-id`' />

+                        <parameter name='esn' value='`$prop.device.esn`' />

+                        <parameter name='device-name' value='`$prop.device.name`' />

+                        <parameter name='description' value='`$prop.device.description`' />

+                        <parameter name='vendor' value='`$prop.device.vendor`' />

+                        <parameter name='class' value='`$prop.device.class`' />

+                        <parameter name='type' value='`$prop.device.deviceModel`' />

+                        <parameter name='version' value='`$prop.device.version`' />

+                        <parameter name='system-ip' value='`$prop.device.systemIp`' />

+                        <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='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.vf-id + '/vf-module-data/'` " />

+                    </update>

+                </outcome>

+            </switch>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' 

       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' 

       force="true" pfx="tmp.AnAI-data">

                 <parameter name="relationship-list.relationship[0].related-to" value="device" />

-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $prop.device-vf-index`" />

+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/devices/device/' + $prop.vf-id`" />

                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="device.device-id" />

-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.device-vf-index`" />

+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />

             </save>

             <return status='success'>

                 <parameter name="ack-final-indicator" value="Y" />