From 5a41e5c15bdbfba0e84e89e13bb06d9930988e77 Mon Sep 17 00:00:00 2001
From: "Brandon, Bruce (bb2697)" <bb2697@att.com>
Date: Thu, 26 Jul 2018 18:10:42 +0000
Subject: Generic resource API DG catch up

Generic resource API DG catch up with several new capabilities

Change-Id: I6ba4a1716693a2fb0ba5314f60038277a50249a3
Issue-ID: SDNC-403
Signed-off-by: Brandon, Bruce (bb2697) <bb2697@att.com>

Former-commit-id: dd97cf829ce1c0b3bbb0e98e93a2e6619d945beb
---
 ...URCE-API_eipam-allocate-network-role-subnet.xml | 641 +++++++++++++--------
 1 file changed, 401 insertions(+), 240 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml
index fb62d6d5..8fd63766 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml
@@ -1,47 +1,75 @@
-<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='eipam-allocate-network-role-subnet' mode='sync'>
-<block atomic='true'><set>
-	<parameter name="tmp.eipam-error" value="false" />
-	<parameter name="eipam-ip-block.ip-prefix" value='' />
-	<parameter name="eipam-ip-block.mask" value='' />
-	<parameter name="pfx.eipam-pool-row" value='' />
-	<parameter name="tmp.level1-key-name" value="CLLI:CLOUD_REGION" />
-	<parameter name="tmp.level2-key-name" value="NETWORK_ROLE:NETWORK_ID" /></set><!--Need to know which ipv version to get the plan name from the network-model.--><switch test="`$eipam-ip-block.allocate-version`"><outcome value='ipv4'><block atomic='true'><switch test="`$eipam-ip-block.level`"><outcome value='1'><block atomic='true'><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>
-	<parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>
-	<parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>	
-	<parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>
-	<!-- Number of Pool Levels -->
-	<parameter name="eipam-ip-block.pools_length" value="1"/>
-
-	<!-- Level 1 -->
-	<parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
-	<parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/></set><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
-	</return></outcome></execute><get-resource
+<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='eipam-allocate-network-role-subnet' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name="tmp.eipam-error" value="false" />
+                <parameter name="eipam-ip-block.ip-prefix" value='' />
+                <parameter name="eipam-ip-block.mask" value='' />
+                <parameter name="pfx.eipam-pool-row" value='' />
+                <parameter name="tmp.level1-key-name" value="LOCATION_CLLI8:CLOUD_REGION_ID" />
+                <parameter name="tmp.level2-key-name" value="NETWORK_ROLE:NETWORK_ID" />
+            </set>
+            <!--Need to know which ipv version to get the plan name from the network-model.-->
+            <switch test="`$eipam-ip-block.allocate-version`">
+                <outcome value='ipv4'>
+                    <block atomic='true'>
+                        <switch test="`$eipam-ip-block.level`">
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <set>
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>
+                                        <!-- Number of Pool Levels -->
+                                        <parameter name="eipam-ip-block.pools_length" value="1"/>
+                                        <!-- Level 1 -->
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>
+                                    </set>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <get-resource
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * from EIPAM_IP_POOLS WHERE plan_name = $network-model.eipam-v4-address-plan and level = 1 and key_value = $tmp.level1-key-value ; "
         pfx='pfx.eipam-pool-row'>
-
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
-	</return></outcome><outcome value="not-found"><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
-	</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"/>
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
-<parameter name="field5" value="`$tmp.level1-key-value`"/>
-<parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>
-<parameter name="field7" value="Level 1 subnet saved to DB."/></record><save
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                        <outcome value="not-found">
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
+                                            </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"/>
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>
+                                        <parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>
+                                        <parameter name="field7" value="Level 1 subnet saved to DB."/>
+                                    </record>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNETS
@@ -57,11 +85,15 @@
              network_id = $tmp.network-id ; "
     force='true'
         pfx='pfx.eipam-v4subnet-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><save
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
@@ -72,56 +104,82 @@
              level = 1 ; "
     force='true'
         pfx='pfx.eipam-v4subnet-key-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save></block></outcome><outcome value='2'><block atomic='true'><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>
-	<parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>
-	<parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>	
-	<parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>
-
-	<!-- Number of Pool Levels -->
-	<parameter name="eipam-ip-block.pools_length" value="2"/>
-
-	<!-- Level 1 -->
-	<parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
-	<parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>
-
-	<!-- Level 2 -->
-	<parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>
-	<parameter name="eipam-ip-block.pools[1].key-value" value="`$tmp.level2-key-value`"/></set><switch test="`$eipam-ip-block.subnet-size-override`"><outcome value=''>
-<block atomic='true'><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"/>
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
-<parameter name="field5" value="`$tmp.level2-key-value`"/>
-<parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>
-
-</record><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>
-	<parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv4-cidr-mask`" />
-</set></block></outcome></switch><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
-	</return></outcome></execute><get-resource
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                </block>
+                            </outcome>
+                            <outcome value='2'>
+                                <block atomic='true'>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <set>
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>
+                                        <!-- Number of Pool Levels -->
+                                        <parameter name="eipam-ip-block.pools_length" value="2"/>
+                                        <!-- Level 1 -->
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>
+                                        <!-- Level 2 -->
+                                        <parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>
+                                        <parameter name="eipam-ip-block.pools[1].key-value" value="`$tmp.level2-key-value`"/>
+                                    </set>
+                                    <switch test="`$eipam-ip-block.subnet-size-override`">
+                                        <outcome value=''>
+                                            <block atomic='true'>
+                                                <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"/>
+                                                    <parameter name="field3" value="eipam-allocate-network-role-subnet"/>
+                                                    <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
+                                                    <parameter name="field5" value="`$tmp.level2-key-value`"/>
+                                                    <parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>
+                                                </record>
+                                                <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                                <set>
+                                                    <parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv4-cidr-mask`" />
+                                                </set>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <get-resource
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * from EIPAM_IP_POOLS WHERE plan_name = $network-model.eipam-v4-address-plan and level = 2 and parent_pool = $tmp.level1-key-value AND key_value = $tmp.level2-key-value ; "
         pfx='pfx.eipam-pool-row'>
-
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
-	</return></outcome><outcome value="not-found"><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
-	</return></outcome></get-resource><save
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                        <outcome value="not-found">
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNETS
@@ -137,11 +195,15 @@
              network_id = $tmp.network-id ; "
     force='true'
         pfx='pfx.eipam-subnet-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><save
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
@@ -152,11 +214,15 @@
              level = 1 ; "
     force='true'
         pfx='pfx.eipam-v4subnet-key-row'>
-<outcome value='success'>
-</outcome><outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
-</return></outcome></save><save
+                                        <outcome value='success'></outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
+                                            </return>
+                                        </outcome>
+                                    </save>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
@@ -167,54 +233,89 @@
              level = 2 ; "
     force='true'
         pfx='pfx.eipam-v4subnet-key-row'>
-<outcome value='success'>
-</outcome><outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
-</return></outcome></save><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"/>
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
-<parameter name="field5" value="`$tmp.level1-key-value`"/>
-
-<!-- Level 2 -->
-	<parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>
-	<parameter name="field7" value="`$tmp.level2-key-value`"/>
-<parameter name="field8" value="Level 2 subnet saved to DB."/></record></block></outcome><outcome value=''><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />
-	</return></outcome></switch></block></outcome><outcome value='ipv6'><block atomic='true'><switch test="`$eipam-ip-block.level`"><outcome value='1'><block atomic='true'><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>
-	<parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>
-	<parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>	
-	<parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>
-	<!-- Number of Pool Levels -->
-	<parameter name="eipam-ip-block.pools_length" value="1"/>
-
-	<!-- Level 1 -->
-	<parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
-	<parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/></set><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
-	</return></outcome></execute><get-resource
+                                        <outcome value='success'></outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
+                                            </return>
+                                        </outcome>
+                                    </save>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <set>
+                                        <parameter name="eipam-ip-block.subnet-size-override" value='' />
+                                    </set>
+                                    <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"/>
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>
+                                        <!-- Level 2 -->
+                                        <parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>
+                                        <parameter name="field7" value="`$tmp.level2-key-value`"/>
+                                        <parameter name="field8" value="Level 2 subnet saved to DB."/>
+                                    </record>
+                                </block>
+                            </outcome>
+                            <outcome value=''>
+                                <return status="failure">
+                                    <parameter name="tmp.eipam-error" value="true" />
+                                    <parameter name="error-code" value="500"/>
+                                    <parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='ipv6'>
+                    <block atomic='true'>
+                        <switch test="`$eipam-ip-block.level`">
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <set>
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>
+                                        <!-- Number of Pool Levels -->
+                                        <parameter name="eipam-ip-block.pools_length" value="1"/>
+                                        <!-- Level 1 -->
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>
+                                    </set>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <get-resource
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * from EIPAM_IP_POOLS WHERE plan_name = $network-model.eipam-v6-address-plan and level = 1 and key_value = $tmp.level1-key-value ; "
         pfx='pfx.eipam-pool-row'>
-
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
-	</return></outcome><outcome value="not-found"><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
-	</return></outcome></get-resource><save
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                        <outcome value="not-found">
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNETS
@@ -230,11 +331,15 @@
              network_id = $tmp.network-id ; "
     force='true'
         pfx='pfx.eipam-v6subnet-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><save
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
@@ -245,64 +350,92 @@
              level = 1 ; "
     force='true'
         pfx='pfx.eipam-v6subnet-key-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><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"/>
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
-<parameter name="field5" value="`$tmp.level1-key-value`"/>
-<parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>
-<parameter name="field7" value="Level 1 subnet saved to DB."/></record></block></outcome><outcome value='2'><block atomic='true'><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>
-	<parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>
-	<parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>	
-	<parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>
-	
-	<!-- Number of Pool Levels -->
-	<parameter name="eipam-ip-block.pools_length" value="2"/>
-
-	<!-- Level 1 -->
-	<parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
-	<parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>
-
-	<!-- Level 2 -->
-	<parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>
-	<parameter name="eipam-ip-block.pools[1].key-value" value="`$tmp.level2-key-value`"/></set><switch test="`$eipam-ip-block.subnet-size-override`"><outcome value=''>
-<block atomic='true'><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"/>
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>
-<parameter name="field4" value="`$network-model.eipam-v6-address-plan`"/>
-<parameter name="field5" value="`$tmp.level2-key-value`"/>
-<parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>
-
-</record><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>
-	<parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv6-cidr-mask`" />
-</set></block></outcome></switch><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
-	</return></outcome></execute><get-resource
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <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"/>
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>
+                                        <parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>
+                                        <parameter name="field7" value="Level 1 subnet saved to DB."/>
+                                    </record>
+                                </block>
+                            </outcome>
+                            <outcome value='2'>
+                                <block atomic='true'>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <set>
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>
+                                        <!-- Number of Pool Levels -->
+                                        <parameter name="eipam-ip-block.pools_length" value="2"/>
+                                        <!-- Level 1 -->
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>
+                                        <!-- Level 2 -->
+                                        <parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>
+                                        <parameter name="eipam-ip-block.pools[1].key-value" value="`$tmp.level2-key-value`"/>
+                                    </set>
+                                    <switch test="`$eipam-ip-block.subnet-size-override`">
+                                        <outcome value=''>
+                                            <block atomic='true'>
+                                                <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"/>
+                                                    <parameter name="field3" value="eipam-allocate-network-role-subnet"/>
+                                                    <parameter name="field4" value="`$network-model.eipam-v6-address-plan`"/>
+                                                    <parameter name="field5" value="`$tmp.level2-key-value`"/>
+                                                    <parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>
+                                                </record>
+                                                <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                                <set>
+                                                    <parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv6-cidr-mask`" />
+                                                </set>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <get-resource
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * from EIPAM_IP_POOLS WHERE plan_name = $network-model.eipam-v6-address-plan and level = 2 and parent_pool = $tmp.level1-key-value AND key_value = $tmp.level2-key-value ; "
         pfx='pfx.eipam-pool-row'>
-
-<outcome value='failure'><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
-	</return></outcome><outcome value="not-found"><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
-	</return></outcome></get-resource><save
+                                        <outcome value='failure'>
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                        <outcome value="not-found">
+                                            <return status="failure">
+                                                <parameter name="tmp.eipam-error" value="true" />
+                                                <parameter name="error-code" value="500"/>
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNETS
@@ -318,11 +451,15 @@
              network_id = $tmp.network-id ; "
     force='true'
         pfx='pfx.eipam-v6subnet-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><save
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
@@ -333,11 +470,15 @@
              level = 1 ; "
     force='true'
         pfx='pfx.eipam-v6subnet-key-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><save
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <save
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
@@ -348,29 +489,49 @@
              level = 2 ; "
     force='true'
         pfx='pfx.eipam-v6subnet-key-row'>
-<outcome value='failure'><return status='failure'>
-<parameter name='error-code' value='500' />
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
-</return></outcome><outcome value='success'>
-</outcome></save><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"/>
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
-<parameter name="field5" value="`$tmp.level1-key-value`"/>
-
-<!-- Level 2 -->
-	<parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>
-	<parameter name="field7" value="`$tmp.level2-key-value`"/>
-<parameter name="field8" value="Level 2 subnet saved to DB."/></record></block></outcome><outcome value=''><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />
-	</return></outcome></switch></block></outcome><outcome value=''><return status="failure">
-	<parameter name="tmp.eipam-error" value="true" />
-	<parameter name="error-code" value="500"/>
-	<parameter name="error-message" value="Please set the eipam-ip-block.allocate-version for appropriate EIPAM request." />
-	</return></outcome></switch><return status='success'>
-	<parameter name="error-code" value="200" />
-</return></block></method></service-logic>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'></outcome>
+                                    </save>
+                                    <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"/>
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>
+                                        <!-- Level 2 -->
+                                        <parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>
+                                        <parameter name="field7" value="`$tmp.level2-key-value`"/>
+                                        <parameter name="field8" value="Level 2 subnet saved to DB."/>
+                                    </record>
+                                </block>
+                            </outcome>
+                            <outcome value=''>
+                                <return status="failure">
+                                    <parameter name="tmp.eipam-error" value="true" />
+                                    <parameter name="error-code" value="500"/>
+                                    <parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value=''>
+                    <return status="failure">
+                        <parameter name="tmp.eipam-error" value="true" />
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="Please set the eipam-ip-block.allocate-version for appropriate EIPAM request." />
+                    </return>
+                </outcome>
+            </switch>
+            <return status='success'>
+                <parameter name="error-code" value="200" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg