X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml;h=2d55463505c9beaf2e2a7f74ef15090649797fb7;hb=c681b93fba0db2aa43b81b904050eb37c749dbc2;hp=ea5afbaded861a869d53af90d2dcbc6ead2ff29b;hpb=80bf0e3b814aa3a9cef81825c1b2da0925241d09;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
index ea5afbad..2d554635 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
@@ -2,7 +2,7 @@
         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='777'>
     <method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>
-        <block atomic="true">
+        <block>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log" />
                 <parameter name="level" value="info" />
@@ -13,59 +13,67 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
-            <set>
-                <!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->
-                <parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />
-                <parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />
-                <parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />
-                <parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />
-            </set>
-            <!--<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"-->
-            <!-- key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->
-            <!--	AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->
-            <!--	  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->
-            <!--	  AND service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">-->
-            <!--<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"-->
-            <!-- key="service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">-->
-            <!--    <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />-->
-            <!--    <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />-->
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
-                  key="service-instance.service-instance-id =  $rcvd-service-instance-id
- AND customer.global-customer-id = '5GCustomer'
- AND service-subscription.service-type = '5G'"  force="true" pfx="tmp.AnAI-data">
-                <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
-                <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />
-            </save>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="eventId-uuid"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="eventName-uuid"/>
-            </execute>
-            <set>
-                <parameter name='eventIdUuid' value="`'BandwidthChanged_' + $eventId-uuid`" />
-                <parameter name='eventNameUuid' value='`$eventName-uuid`' />
-                <parameter name='cclId' value='`$rcvd-service-instance-id`' />
-                <parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />
-                <parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`" />
-                <!--<parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />-->
-                <parameter name="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
-                <parameter name="restapiUser" value="sample1" />
-                <parameter name="restapiPassword" value="sample1" />
-                <parameter name="format" value="json"/>
-                <parameter name="httpMethod" value="post"/>
-                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                <parameter name="responsePrefix" value="ves-result"/>
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                <parameter name="trustStorePassword" value="adminadmin"/>
-                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                <parameter name="disableHostVerification" value="true"/>
-                <parameter name="ssl" value="false"/>
-            </execute>
+            <switch test="`$push-change-update.datastore-changes.type == 'update' `">
+                <outcome value='true'>
+                    <block atomic="true">
+                        <set>
+                            <!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->
+                            <parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />
+                            <parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />
+                            <parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />
+                            <parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />
+                        </set>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance:metadata"
+                              key="service-instance.service-instance-id =  $rcvd-service-instance-id
+ AND customer.global-customer-id = 'IBNCustomer'
+ AND service-subscription.service-type = 'IBN'"  force="true" pfx="tmp.AnAI-data">
+                            <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
+                            <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />
+                        </save>
+                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance"
+                                key="service-instance.service-instance-id =  $rcvd-service-instance-id
+ AND customer.global-customer-id = 'IBNCustomer'
+ AND service-subscription.service-type = 'IBN'
+ AND metadatum.metaname = $rcvd-etht-svc-end-point"  force="true" pfx="tmp.AnAI-data">
+                            <parameter name="metaname" value="`$rcvd-etht-svc-end-point`" />
+                            <parameter name="metaval" value="`$rcvd-bandwidth-value`" />
+                            <!--AND metadatum.metaname = $rcvd-etht-svc-end-point-->
+                            <!--<parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />-->
+                            <!--    <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />-->
+                        </update>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                            <parameter name="ctx-destination" value="eventId-uuid"/>
+                        </execute>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                            <parameter name="ctx-destination" value="eventName-uuid"/>
+                        </execute>
+                        <set>
+                            <parameter name='eventIdUuid' value="`'BandwidthChanged_' + $eventId-uuid`" />
+                            <parameter name='eventNameUuid' value='`$eventName-uuid`' />
+                            <parameter name='cclId' value='`$rcvd-service-instance-id`' />
+                            <parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />
+                            <parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />
+                        </set>
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`" />
+                            <!--<parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />-->
+                            <parameter name="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
+                            <parameter name="restapiUser" value="sample1" />
+                            <parameter name="restapiPassword" value="sample1" />
+                            <parameter name="format" value="json"/>
+                            <parameter name="httpMethod" value="post"/>
+                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                            <parameter name="responsePrefix" value="ves-result"/>
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                            <parameter name="trustStorePassword" value="adminadmin"/>
+                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                            <parameter name="disableHostVerification" value="true"/>
+                            <parameter name="ssl" value="false"/>
+                        </execute>
+                    </block>
+                </outcome>
+            </switch>
         </block>
     </method>
 </service-logic>
\ No newline at end of file