SDWAN sdnc DGs aai resource changes

SDWAN configuration save in aai resource-name changes are updated in SDWAN DGs

Change-Id: I9097f205751af47b5db8f228142f27786e9d190d
Issue-ID: SDNC-357
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: fad8ff4f0b3660a5c1dd4b7abdb5ac5b95c8fec2

16 files changed, 152 insertions, 150 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index 30e20974..07cd7181 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
@@ -34,7 +34,7 @@
             </for>

             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="esr-thirdparty-sdnc" 

-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND 

+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND 

 		     depth = '1'"

         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >

                 <outcome value='success'>

@@ -179,9 +179,8 @@
                     <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                 </execute>

                 <set>

-                    <!--parameter name='prop.vpn-id' value='`$vpn-result.id`' /><parameter name='prop.vpn1Id' value='`$vpn-result.id`' /-->

-                    <parameter name='prop.vpn-id' value='10' />

-                    <parameter name='prop.vpn1Id' value='10' />

+                    <parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />

+                    <parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />

                 </set>

                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />

@@ -201,9 +200,12 @@
             <set>

                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />

                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].name' value='vpn-id' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].value' value='`$prop.vpn-id`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 2`' />

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />

+            </set>

+            <set>

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />

             </set>

             <set>

                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />

@@ -221,10 +223,10 @@
                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' 

-      key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id' >

-                <parameter name='id' value='`$network-topology-operation-input.network-information.network-id`' />

+      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >

+                <parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />

                 <parameter name='operational-status' value='Active' />

-                <parameter name='tenanatId' value='`$prop.tenant-id`' />

+                <parameter name='tenanat-id' value='`$prop.tenant-id`' />

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

             </update>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
index 73ba3bcf..70500ccf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
@@ -75,9 +75,9 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />

             </set>

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

-      key='sdwan-vpn.id = $prop.sdwan.network-id' >

-                <parameter name='id' value='`$prop.sdwan.network-id`' />

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

+      key='sdwan-vpn.sdwan-vpn-id = $prop.sdwan.network-id' >

+                <parameter name='sdwan-vpn-id' value='`$prop.sdwan.network-id`' />

+                <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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
index 19c027db..162385ab 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
@@ -48,7 +48,7 @@
             </for>

             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="esr-thirdparty-sdnc" 

-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND 

+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND 

 		     depth = '1'"

         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >

                 <outcome value='success'>

@@ -139,8 +139,8 @@
                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' 

-      key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id' >

-                <parameter name='id' value='`$network-topology-operation-input.network-information.network-id`' />

+      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >

+                <parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />

                 <parameter name='operational-status' value='PendingDelete' />

             </update>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
index 8363b688..afd579de 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
@@ -11,7 +11,7 @@
                 <parameter name="field3" value="SDWAN-Delete"/>

             </record>

             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='sdwan-vpn' 

-        key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id'></delete>

+        key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id'></delete>

             <set>

                 <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`"/>

             </set>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
index 5402ccdb..1f17ef4a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
@@ -133,9 +133,9 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />

             </set>

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

-      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

-                <parameter name='device-id' value='`$deviceResp.success[0].id`' />

+      key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+                <!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->

                 <parameter name='operational-status' value='Active' />

             </save>

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
index 648ca3a4..cba46ed5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
@@ -107,10 +107,10 @@
             <switch test='`$prop.sdncCreate`'>

                 <outcome value='true'>

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

-      key='device.id = $prop.vnf-id' >

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

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

-                        <parameter name='name' value="true" />

+      key='device.devcie-id = $prop.vnf-id' >

+                        <parameter name='devcie-id' value='`$prop.vnf-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`' />

@@ -126,10 +126,10 @@
                 </outcome>

                 <outcome value='false'>

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

-      key='device.id = $prop.vnf-id' >

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

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

-                        <parameter name='name' value="true" />

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

+                        <parameter name='device-id' value='`$prop.vnf-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`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
index 830cc46a..7e88cf90 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
@@ -127,8 +127,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

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

-      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+      key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

                 <parameter name='operational-status' value='PendingDelete' />

             </update>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
index 23cfb025..de29db48 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
@@ -104,7 +104,7 @@
             <switch test="`$prop.device.sdncCreate`">

                 <outcome value='true'>

                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='device' 

-        key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

+        key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

                 </outcome>

             </switch>

             <return status='success'>

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 3879fdc1..e6293ad4 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
@@ -323,8 +323,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' 

-      key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name="id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

+      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name="wan-port-config-id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

                 <parameter name='operational-status' value='Active' />

                 <parameter name='device-port-id' value='`$prop.wan.devicePortId`' />

                 <parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
index cf209c08..064236dc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
@@ -75,9 +75,9 @@
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` " />

             </set>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' 

-      key='wan-port-config.id = $prop.vnf-index' >

-                <parameter name="id" value="`$prop.vnf-index`" />

-                <parameter name="name" value="`$prop.wan.name`" />

+      key='wan-port-config.wan-port-config-id = $prop.vnf-index' >

+                <parameter name="wan-port-config-id" value="`$prop.vnf-index`" />

+                <parameter name="wan-port-config-name" value="`$prop.wan.name`" />

                 <parameter name="device-id" value="`$prop.wan.deviceName`" />

                 <parameter name='vlan-id' value="`$prop.wan.vlanId`" />

                 <parameter name="ip-address" value="`$prop.wan.ipAdddress`" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
index 7a7c22e3..ce57e786 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
@@ -169,8 +169,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' 

-      key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name="id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

+      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='wan-port-config-id' value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

                 <parameter name='operational-status' value='PendingDelete' />

                 <parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />

                 <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
index e6810860..9f9eb3b1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
@@ -92,7 +92,7 @@
  + '/service-data/service-topology/'` " />

             </set>

             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='wan-port-config' 

-        key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

+        key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

             <return status='success'>

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

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
index 90ce0e84..9e9759cc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
@@ -88,7 +88,7 @@
                                 </set>

                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="site-resource" 

-		key="site-resource.name = $prop.controlPtId AND 

+		key="site-resource.site-resource-name = $prop.controlPtId AND 

 		     depth = '1'"

         pfx='tmp.aai.controlPoints' local-only='false' >

                                     <outcome value='success'>

@@ -200,8 +200,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />

             </set>

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

-      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

                 <parameter name='generated-site-id' value='`$site-result.success[0].id`' />

                 <parameter name='operational-status' value='Active' />

             </save>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
index 137a148b..2b642df8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
@@ -69,9 +69,9 @@
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` " />

             </set>

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

-      key='site-resource.id = $prop.vnf-index' >

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

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

+      key='site-resource.site-resource-id = $prop.vnf-index' >

+                <parameter name='site-resource-id' value='`$prop.vnf-index`' />

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

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

                 <parameter name='type' value='prop.site.type' />

                 <parameter name='role' value='prop.site.role' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
index 7eac5d05..4599910e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
@@ -179,8 +179,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

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

-      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

                 <parameter name='operational-status' value='PendingDelete' />

             </save>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
index f5c08816..38f118fc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
@@ -1,103 +1,103 @@
-<service-logic

-    xmlns='http://www.onap.org/sdnc/svclogic'

-    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='site-vnf-topology-operation-delete' mode='sync'>

-        <block atomic="true">

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

-                <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>

-            </execute>

-            <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">

-                <outcome value=''>

-                    <return status='failure'>

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

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

-                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />

-                    </return>

-                </outcome>

-            </switch>

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

-                <outcome value=''>

-                    <return status='failure'>

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

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

-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />

-                    </return>

-                </outcome>

-                <outcome value='Other'>

-                    <block atomic="true">

-                        <for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >

-                            <switch test="`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">

-                                <outcome value='true'>

-                                    <set>

-                                        <parameter name='tmp.nidx' value='`$nidx`' />

-                                        <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />

-                                    </set>

-                                </outcome>

-                            </switch>

-                        </for>

-                        <switch test="`$tmp.nidx`">

-                            <outcome value=''>

-                                <return status='failure'>

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

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

-                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />

-                                </return>

-                            </outcome>

-                        </switch>

-                    </block>

-                </outcome>

-            </switch>

-            <switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>

-                <outcome value='PendingDelete'>

-                    <block atomic="true"></block>

-                </outcome>

-                <outcome value='Other'>

-                    <return status='failure'>

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

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

-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />

-                    </return>

-                </outcome>

-            </switch>

-            <set>

-                <parameter name='prop.vnfidxLen' value='`0`' />

-            </set>

-            <for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >

-                <block atomic="true">

-                    <switch test="`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">

-                        <outcome value='false'>

-                            <block atomic="true">

-                                <set>

-                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />

-                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />

-                                </set>

-                                <set>

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

-                                </set>

-                            </block>

-                        </outcome>

-                    </switch>

-                </block>

-            </for>

-            <set>

-                <parameter name="service-data.vnfs.vnf_length" value='`$prop.vnfidxLen`'/>

-            </set>

-            <set>

-                <parameter name="service-data.vnfs.vnf[$prop.vnfidxLen]." value=""/>

-            </set>

-            <set>

-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

-                <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

- + $vnf-topology-operation-input.service-information.service-instance-id

- + '/service-data/service-topology/'` " />

-            </set>

-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='site-resource' 

-        key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

-            <return status='success'>

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

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

-                <parameter name="error-message" value="`$error-message`" />

-            </return>

-        </block>

-    </method>

-</service-logic>

+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    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='site-vnf-topology-operation-delete' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
+                <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>
+            </execute>
+            <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$service-data.vnfs.vnf_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >
+                            <switch test="`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='tmp.nidx' value='`$nidx`' />
+                                        <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.nidx`">
+                            <outcome value=''>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>
+                <outcome value='PendingDelete'>
+                    <block atomic="true"></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='prop.vnfidxLen' value='`0`' />
+            </set>
+            <for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >
+                <block atomic="true">
+                    <switch test="`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
+                        <outcome value='false'>
+                            <block atomic="true">
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />
+                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />
+                                </set>
+                                <set>
+                                    <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <set>
+                <parameter name="service-data.vnfs.vnf_length" value='`$prop.vnfidxLen`'/>
+            </set>
+            <set>
+                <parameter name="service-data.vnfs.vnf[$prop.vnfidxLen]." value=""/>
+            </set>
+            <set>
+                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $vnf-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'` " />
+            </set>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='site-resource' 
+        key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file