1 files changed, 138 insertions, 92 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml b/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml
index 4eff2d0f..1654a839 100755
--- a/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml
@@ -1,92 +1,138 @@
-<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='SUBNET-API' version='${project.version}'><method rpc='managed-network-notification' mode='sync'>
-<block><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="managed-network-notification"/>
-<parameter name="field3" value="`$managed-network-notification-input.request-id`"/>
-<parameter name="field4" value="`$managed-network-notification-input.managed-network-status.status.code`"/>
-<parameter name="field5" value="`$managed-network-notification-input.managed-network-status.status.description`"/>
-<parameter name="field6" value="`$managed-network-notification-input.managed-network-status.final-notification-indicator`"/>
-
-</record><switch test="`$managed-network-notification-input.managed-network-status.status.code`">
-
-<outcome value="Success"><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="activateSubnet">
-
-<outcome value="success"><block><save plugin="com.att.sdnctl.sli.resource.gamma.GammaResource" resource="eipam-ip-subnets"
-	key="entity-id = $eipam-ip-block.entity-id" force="true">
-        <parameter name="status" value="ACTIVE" />
-       
-</save><set>
-	<parameter name="eipam-ip-block.status" value="ACTIVE" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
-	<parameter name="eipam-ip-block.status" value="ACTIVE" /></save><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
-<parameter name="key1" value="SUCCESS: eipam-ip-block.status is ACTIVE."/></execute><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="vpe" key="vnf-id = $data-change-notification-input.key-data[0].key-value" pfx="vpe-after">
-	<parameter name="operational-state" value="SDNC_COMPLETED" />
-	<parameter name="summary-status" value="`$aai-summary-status-message`" />
-</update> <return status="success">
- 
-</return></block></outcome><outcome value="Other"> 
-
-<block><save plugin="com.att.sdnctl.sli.resource.gamma.GammaResource" resource="eipam-ip-subnets"
-	key="entity-id = $eipam-ip-block.entity-id" force="true">
-        <parameter name="status" value="ERROR" />
-       
-</save><set>
-	<parameter name="eipam-ip-block.status" value="ERROR" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
-	<parameter name="eipam-ip-block.status" value="ERROR" /></save><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
-<parameter name="key1" value="ActivateSubnet failure, need to manually activate in EIPAM."/></execute><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="vpe" 
-		key="vnf-id = $data-change-notification-input.key-data[0].key-value" pfx="vpe-after">
-	<parameter name="operational-state" value="EIPAM_ERROR" />
-	<parameter name="summary-status" value="`$aai-summary-status-message`" />
-	<parameter name="prov-status" value="PREPROV" />
-	</update> <return status="failure">
-               <parameter name="error-code" value="3000" />
-              <parameter name="error-message" value="ActivateSubnet failure, need to manually activate in EIPAM" />
-</return></block></outcome></execute></outcome><outcome value="Other"><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="deallocateSubnet">
-
-<outcome value="success"><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="deletePool">
-
-<outcome value="success"><block><set>
-	<parameter name="eipam-ip-block.status" value="DELETED" /></set><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
-<parameter name="key1" value="Failure from NCS and deleted pool/subnet in EIPAM."/></execute><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="vpe" key="vnf-id = $data-change-notification-input.key-data[0].key-value" pfx="vpe-after">
-	<parameter name="operational-state" value="SDN_C_BACKOUT_ERROR" />
-	<parameter name="summary-status" value="`$aai-summary-status-message`" />
-	<parameter name="prov-status" value="PREPROV" />
-</update> <return status="failure">
-              <parameter name="error-code" value="2000" />
-              <parameter name="error-message" value="Failure from NCS and deleted pool/subnet in EIPAM"/>
- 
-</return></block></outcome><outcome value="Other"> 
-
-<block><save plugin="com.att.sdnctl.sli.resource.gamma.GammaResource" resource="eipam-ip-subnets"
-	key="entity-id = $eipam-ip-block.entity-id" force="true">
-        <parameter name="status" value="DEALLOCATED" />
-       
-</save><set>
-	<parameter name="eipam-ip-block.status" value="ERROR" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
-	<parameter name="eipam-ip-block.status" value="ERROR" /></save><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
-<parameter name="key1" value="Failure from NCS and deletePool failed in EIPAM, need to manually delete."/></execute><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="vpe" 
-		key="vnf-id = $data-change-notification-input.key-data[0].key-value" pfx="vpe-after">
-	<parameter name="operational-state" value="SDN_C_BACKOUT_ERROR" />
-	<parameter name="summary-status" value="`$aai-summary-status-message`" />
-	<parameter name="prov-status" value="PREPROV" />
-	</update>  <return status="failure">
-              <parameter name="error-code" value="1000" />
-              <parameter name="error-message" value="Failure from NCS and deletePool failed in EIPAM, need to manually delete." />
-</return></block></outcome></execute></outcome><outcome value="Other"> 
-
-<block><save plugin="com.att.sdnctl.sli.resource.gamma.GammaResource" resource="eipam-ip-subnets"
-	key="entity-id = $eipam-ip-block.entity-id" force="true">
-        <parameter name="status" value="ERROR" />
-       
-</save><set>
-	<parameter name="eipam-ip-block.status" value="ERROR" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
-	<parameter name="eipam-ip-block.status" value="ERROR" /></save><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
-<parameter name="key1" value="Failure from NCS and deletePool failed in EIPAM, need to manually delete."/></execute><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="vpe" 
-		key="vnf-id = $data-change-notification-input.key-data[0].key-value" pfx="vpe-after">
-	<parameter name="operational-state" value="SDN_C_BACKOUT_ERROR" />
-	<parameter name="summary-status" value="`$aai-summary-status-message`" />
-	<parameter name="prov-status" value="PREPROV" />
-	</update>  <return status="failure">
-              <parameter name="error-code" value="1000" />
-              <parameter name="error-message" value="Failure from NCS and deletePool failed in EIPAM, need to manually delete." />
-</return></block></outcome></execute></outcome></switch></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='SUBNET-API' version='${project.version}'>
+    <method rpc='managed-network-notification' mode='sync'>
+        <block>
+            <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="managed-network-notification"/>
+                <parameter name="field3" value="`$managed-network-notification-input.request-id`"/>
+                <parameter name="field4" value="`$managed-network-notification-input.managed-network-status.status.code`"/>
+                <parameter name="field5" value="`$managed-network-notification-input.managed-network-status.status.description`"/>
+                <parameter name="field6" value="`$managed-network-notification-input.managed-network-status.final-notification-indicator`"/>
+            </record>
+            <switch test="`$managed-network-notification-input.managed-network-status.status.code`">
+                <outcome value="Success">
+                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="activateSubnet">
+                        <outcome value="success">
+                            <block>
+                                <get-resource
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+        resource='SQL'
+        key="SELECT * FROM VPE_POOL where vpe_name = $eipam-ip-block.ptnii-name ;"
+        pfx='tmp.vpe-pool-row'></get-resource>
+                                <save 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+	resource='SQL'
+	key="UPDATE EIPAM_IP_SUBNETS
+             SET status = 'ACTIVE' 
+             WHERE entity_id = $eipam-ip-block.entity-id ; "
+    force='true'
+        pfx='pfx.eipam-subnet-row'></save>
+                                <set>
+                                    <parameter name="eipam-ip-block.status" value="ACTIVE" />
+                                </set>
+                                <save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+                                    <parameter name="eipam-ip-block.status" value="ACTIVE" />
+                                </save>
+                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $tmp.vpe-pool-row.vpe-id" pfx="vpe-after">
+                                    <parameter name="orchestration-status" value="Activated" />
+                                    <parameter name="prov-status" value="NVTPROV" />
+                                </update>
+                                <return status="success"></return>
+                            </block>
+                        </outcome>
+                        <outcome value="Other">
+                            <block>
+                                <save 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+	resource='SQL'
+	key="UPDATE EIPAM_IP_SUBNETS
+             SET status = 'ACTIVATE_ERROR' 
+             WHERE entity_id = $eipam-ip-block.entity-id ; "
+    force='true'
+        pfx='pfx.eipam-subnet-row'></save>
+                                <set>
+                                    <parameter name="eipam-ip-block.status" value="ERROR" />
+                                </set>
+                                <save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+                                    <parameter name="eipam-ip-block.status" value="EIPAM_ACTIVATESUBNET_ERROR" />
+                                </save>
+                                <return status="failure">
+                                    <parameter name="error-code" value="3000" />
+                                    <parameter name="error-message" value="ActivateSubnet failure, need to manually activate in EIPAM" />
+                                </return>
+                            </block>
+                        </outcome>
+                    </execute>
+                </outcome>
+                <outcome value="Other">
+                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="deallocateSubnet">
+                        <outcome value="success">
+                            <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                            <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="deletePool">
+                                <outcome value="success">
+                                    <block>
+                                        <set>
+                                            <parameter name="eipam-ip-block.status" value="DELETED" />
+                                        </set>
+                                        <return status="failure">
+                                            <parameter name="error-code" value="2000" />
+                                            <parameter name="error-message" value="Failure from NCS and deleted pool/subnet in EIPAM"/>
+                                        </return>
+                                    </block>
+                                </outcome>
+                                <outcome value="Other">
+                                    <block>
+                                        <save 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+	resource='SQL'
+	key="UPDATE EIPAM_IP_SUBNETS
+             SET status = 'DEALLOCATED' 
+             WHERE entity_id = $eipam-ip-block.entity-id ; "
+    force='true'
+        pfx='pfx.eipam-subnet-row'></save>
+                                        <set>
+                                            <parameter name="eipam-ip-block.status" value="ERROR" />
+                                        </set>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+                                            <parameter name="eipam-ip-block.status" value="SDN_C_BACKOUT_ERROR" />
+                                        </save>
+                                        <return status="failure">
+                                            <parameter name="error-code" value="1000" />
+                                            <parameter name="error-message" value="Failure from NCS and deletePool failed in EIPAM, need to manually delete." />
+                                        </return>
+                                    </block>
+                                </outcome>
+                            </execute>
+                        </outcome>
+                        <outcome value="Other">
+                            <block>
+                                <save 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+	resource='SQL'
+	key="UPDATE EIPAM_IP_SUBNETS
+             SET status = 'DEALLOCSUBNET_ERROR' 
+             WHERE entity_id = $eipam-ip-block.entity-id ; "
+    force='true'
+        pfx='pfx.eipam-subnet-row'></save>
+                                <set>
+                                    <parameter name="eipam-ip-block.status" value="ERROR" />
+                                </set>
+                                <save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+                                    <parameter name="eipam-ip-block.status" value="SDN_C_BACKOUT_ERROR" />
+                                </save>
+                                <return status="failure">
+                                    <parameter name="error-code" value="1000" />
+                                    <parameter name="error-message" value="Failure from NCS and deletePool failed in EIPAM, need to manually delete." />
+                                </return>
+                            </block>
+                        </outcome>
+                    </execute>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file