Merge "Update plugin references"

Former-commit-id: 3446c1d0ae16ec1c7aac1c3195ed58604afc568f

1 files changed, 94 insertions, 92 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index d9c3fbb3..3a9e57dc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -1,95 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-    <method rpc="network-topology-operation-deactivate" mode="sync">
-        <block atomic="true">
-            <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
-            <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
-                    <outcome value="true">
-                        <set>
-                            <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                        </set>
-                    </outcome>
-                </switch>
-            </for>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="dci-connects" key="dci-connects.id AND depth = '1'" pfx="tmp.aai.dci-connects" local-only="false">
-                <outcome value="success">
-                    <set>
-                        <parameter name="prop.dci-connects.tunnelType" value="`$tmp.aai.dci-connects.dci-connects.serviceType`" />
-                    </set>
-                </outcome>
-                <outcome value="not-found">
-                    <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                    </return>
-                </outcome>
-                <outcome value="Other">
-                    <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                    </return>
-                </outcome>
+<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="dci-connects-network-topology-operation-deactivate" mode="sync">
+      <block atomic="true">
+         <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
+         <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
+               <outcome value="true">
+                  <set>
+                     <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                  </set>
+               </outcome>
+            </switch>
+         </for>
+         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="dci-connects" key="dci-connects.id AND depth = '1'" pfx="tmp.aai.dci-connects" local-only="false">
+            <outcome value="success">
+               <set>
+                  <parameter name="prop.dci-connects.tunnelType" value="`$tmp.aai.dci-connects.dci-connects.serviceType`" />
+               </set>
+            </outcome>
+            <outcome value="not-found">
+               <return status="failure">
+                  <parameter name="error-code" value="" />
+                  <parameter name="error-message" value="" />
+               </return>
+            </outcome>
+            <outcome value="Other">
+               <return status="failure">
+                  <parameter name="error-code" value="" />
+                  <parameter name="error-message" value="" />
+               </return>
+            </outcome>
+         </get-resource>
+         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+            <parameter name="logger" value="message-log" />
+            <parameter name="field1" value="__TIMESTAMP__" />
+            <parameter name="field2" value="network-topology-operation-deactivate" />
+            <parameter name="field3" value="dci-connects.id" />
+            <parameter name="field4" value="`$prop.dci-connects.id`" />
+            <parameter name="field5" value="dci-connects.tunnelType" />
+            <parameter name="field6" value="`$prop.dci-connects.tunnelType`" />
+         </record>
+         <block atomic="true">
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+               <outcome value="success">
+                  <block atomic="true" />
+               </outcome>
+               <outcome value="not-found">
+                  <return status="failure">
+                     <parameter name="error-code" value="" />
+                     <parameter name="error-message" value="" />
+                  </return>
+               </outcome>
+               <outcome value="Other">
+                  <return status="failure">
+                     <parameter name="error-code" value="" />
+                     <parameter name="error-message" value="" />
+                  </return>
+               </outcome>
             </get-resource>
-            <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
-                <parameter name="Time" value="__TIMESTAMP__" />
-                <parameter name="Method" value="network-topology-operation-deactivate" />
-                <parameter name="SubMethod" value="l3-dci-connects" />
-                <parameter name="L3DciConnectsId" value="`$l3-dci-connects.id`" />
-            </record>
-            <block atomic="true">
-                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
-                    <outcome value="success">
-                        <block atomic="true" />
-                    </outcome>
-                    <outcome value="not-found">
-                        <return status="failure">
-                            <parameter name="error-code" value="" />
-                            <parameter name="error-message" value="" />
-                        </return>
-                    </outcome>
-                    <outcome value="Other">
-                        <return status="failure">
-                            <parameter name="error-code" value="" />
-                            <parameter name="error-message" value="" />
-                        </return>
-                    </outcome>
-                </get-resource>
-                <set>
-                    <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                    <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
-                    <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-                    <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-                </set>
-                <switch test="`$prop.dci-connects.tunnelType`">
-                    <outcome value="L3-DCI">
-                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.l3-dci-connects.id" />
-                            <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                            <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
-                            <parameter name="format" value="json" />
-                            <parameter name="httpMethod" value="delete" />
-                            <parameter name="responsePrefix" value="restapi-result" />
-                        </execute>
-                    </outcome>
-                    <outcome value="L2-DCI">
-                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.l2-dci-connects.id" />
-                            <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                            <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
-                            <parameter name="format" value="json" />
-                            <parameter name="httpMethod" value="delete" />
-                            <parameter name="responsePrefix" value="restapi-result" />
-                        </execute>
-                    </outcome>
-                </switch>
-            </block>
-            <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>
+            <set>
+               <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
+               <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+               <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
+               <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
+            </set>
+            <switch test="`$prop.dci-connects.tunnelType`">
+               <outcome value="L3-DCI">
+                  <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                     <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" />
+                     <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                     <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                     <parameter name="format" value="json" />
+                     <parameter name="httpMethod" value="delete" />
+                     <parameter name="responsePrefix" value="restapi-result" />
+                  </execute>
+               </outcome>
+               <outcome value="L2-DCI">
+                  <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                     <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" />
+                     <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                     <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                     <parameter name="format" value="json" />
+                     <parameter name="httpMethod" value="delete" />
+                     <parameter name="responsePrefix" value="restapi-result" />
+                  </execute>
+               </outcome>
+            </switch>
+         </block>
+         <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