Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Chore: Add gerrit maven verify GHA workflow
[sdnc/oam.git] / 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 fb62d6d..8fd6376 100755 (executable)
--- 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'>\r
-<block atomic='true'><set>\r
-       <parameter name="tmp.eipam-error" value="false" />\r
-       <parameter name="eipam-ip-block.ip-prefix" value='' />\r
-       <parameter name="eipam-ip-block.mask" value='' />\r
-       <parameter name="pfx.eipam-pool-row" value='' />\r
-       <parameter name="tmp.level1-key-name" value="CLLI:CLOUD_REGION" />\r
-       <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>\r
-       <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>\r
-       <parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>       \r
-       <parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>\r
-       <!-- Number of Pool Levels -->\r
-       <parameter name="eipam-ip-block.pools_length" value="1"/>\r
-\r
-       <!-- Level 1 -->\r
-       <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
-       <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">\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
-       </return></outcome></execute><get-resource\r
+<service-logic\r
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    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}'>\r
+    <method rpc='eipam-allocate-network-role-subnet' mode='sync'>\r
+        <block atomic='true'>\r
+            <set>\r
+                <parameter name="tmp.eipam-error" value="false" />\r
+                <parameter name="eipam-ip-block.ip-prefix" value='' />\r
+                <parameter name="eipam-ip-block.mask" value='' />\r
+                <parameter name="pfx.eipam-pool-row" value='' />\r
+                <parameter name="tmp.level1-key-name" value="LOCATION_CLLI8:CLOUD_REGION_ID" />\r
+                <parameter name="tmp.level2-key-name" value="NETWORK_ROLE:NETWORK_ID" />\r
+            </set>\r
+            <!--Need to know which ipv version to get the plan name from the network-model.-->\r
+            <switch test="`$eipam-ip-block.allocate-version`">\r
+                <outcome value='ipv4'>\r
+                    <block atomic='true'>\r
+                        <switch test="`$eipam-ip-block.level`">\r
+                            <outcome value='1'>\r
+                                <block atomic='true'>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <set>\r
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>\r
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>\r
+                                        <!-- Number of Pool Levels -->\r
+                                        <parameter name="eipam-ip-block.pools_length" value="1"/>\r
+                                        <!-- Level 1 -->\r
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>\r
+                                    </set>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                    <get-resource\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         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 ; "\r
         pfx='pfx.eipam-pool-row'>\r
-\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
-       </return></outcome><outcome value="not-found"><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
-       </return></outcome></get-resource><record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-<parameter name="logger" value="message-log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="network-topology-operation"/>\r
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
-<parameter name="field5" value="`$tmp.level1-key-value`"/>\r
-<parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>\r
-<parameter name="field7" value="Level 1 subnet saved to DB."/></record><save\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value="not-found">\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                        <parameter name="logger" value="message-log"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="network-topology-operation"/>\r
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>\r
+                                        <parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>\r
+                                        <parameter name="field7" value="Level 1 subnet saved to DB."/>\r
+                                    </record>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNETS\r
@@ -57,11 +85,15 @@
              network_id = $tmp.network-id ; "\r
     force='true'\r
         pfx='pfx.eipam-v4subnet-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><save\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNET_KEYS\r
@@ -72,56 +104,82 @@
              level = 1 ; "\r
     force='true'\r
         pfx='pfx.eipam-v4subnet-key-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save></block></outcome><outcome value='2'><block atomic='true'><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>\r
-       <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>\r
-       <parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>       \r
-       <parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>\r
-\r
-       <!-- Number of Pool Levels -->\r
-       <parameter name="eipam-ip-block.pools_length" value="2"/>\r
-\r
-       <!-- Level 1 -->\r
-       <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
-       <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>\r
-\r
-       <!-- Level 2 -->\r
-       <parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>\r
-       <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=''>\r
-<block atomic='true'><record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-<parameter name="logger" value="message-log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="network-topology-operation"/>\r
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
-<parameter name="field5" value="`$tmp.level2-key-value`"/>\r
-<parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>\r
-\r
-</record><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>\r
-       <parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv4-cidr-mask`" />\r
-</set></block></outcome></switch><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
-       </return></outcome></execute><get-resource\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='2'>\r
+                                <block atomic='true'>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <set>\r
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>\r
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>\r
+                                        <!-- Number of Pool Levels -->\r
+                                        <parameter name="eipam-ip-block.pools_length" value="2"/>\r
+                                        <!-- Level 1 -->\r
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>\r
+                                        <!-- Level 2 -->\r
+                                        <parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>\r
+                                        <parameter name="eipam-ip-block.pools[1].key-value" value="`$tmp.level2-key-value`"/>\r
+                                    </set>\r
+                                    <switch test="`$eipam-ip-block.subnet-size-override`">\r
+                                        <outcome value=''>\r
+                                            <block atomic='true'>\r
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                    <parameter name="logger" value="message-log"/>\r
+                                                    <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                                    <parameter name="field2" value="network-topology-operation"/>\r
+                                                    <parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
+                                                    <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                                    <parameter name="field5" value="`$tmp.level2-key-value`"/>\r
+                                                    <parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>\r
+                                                </record>\r
+                                                <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                                <set>\r
+                                                    <parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv4-cidr-mask`" />\r
+                                                </set>\r
+                                            </block>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                    <get-resource\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         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 ; "\r
         pfx='pfx.eipam-pool-row'>\r
-\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
-       </return></outcome><outcome value="not-found"><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
-       </return></outcome></get-resource><save\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value="not-found">\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNETS\r
@@ -137,11 +195,15 @@
              network_id = $tmp.network-id ; "\r
     force='true'\r
         pfx='pfx.eipam-subnet-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><save\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNET_KEYS\r
@@ -152,11 +214,15 @@
              level = 1 ; "\r
     force='true'\r
         pfx='pfx.eipam-v4subnet-key-row'>\r
-<outcome value='success'>\r
-</outcome><outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
-</return></outcome></save><save\r
+                                        <outcome value='success'></outcome>\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </save>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNET_KEYS\r
@@ -167,54 +233,89 @@
              level = 2 ; "\r
     force='true'\r
         pfx='pfx.eipam-v4subnet-key-row'>\r
-<outcome value='success'>\r
-</outcome><outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
-</return></outcome></save><record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-<parameter name="logger" value="message-log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="network-topology-operation"/>\r
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
-<parameter name="field5" value="`$tmp.level1-key-value`"/>\r
-\r
-<!-- Level 2 -->\r
-       <parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>\r
-       <parameter name="field7" value="`$tmp.level2-key-value`"/>\r
-<parameter name="field8" value="Level 2 subnet saved to DB."/></record></block></outcome><outcome value=''><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />\r
-       </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>\r
-       <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>\r
-       <parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>       \r
-       <parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>\r
-       <!-- Number of Pool Levels -->\r
-       <parameter name="eipam-ip-block.pools_length" value="1"/>\r
-\r
-       <!-- Level 1 -->\r
-       <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
-       <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">\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
-       </return></outcome></execute><get-resource\r
+                                        <outcome value='success'></outcome>\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </save>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <set>\r
+                                        <parameter name="eipam-ip-block.subnet-size-override" value='' />\r
+                                    </set>\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                        <parameter name="logger" value="message-log"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="network-topology-operation"/>\r
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>\r
+                                        <!-- Level 2 -->\r
+                                        <parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>\r
+                                        <parameter name="field7" value="`$tmp.level2-key-value`"/>\r
+                                        <parameter name="field8" value="Level 2 subnet saved to DB."/>\r
+                                    </record>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value=''>\r
+                                <return status="failure">\r
+                                    <parameter name="tmp.eipam-error" value="true" />\r
+                                    <parameter name="error-code" value="500"/>\r
+                                    <parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />\r
+                                </return>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
+                </outcome>\r
+                <outcome value='ipv6'>\r
+                    <block atomic='true'>\r
+                        <switch test="`$eipam-ip-block.level`">\r
+                            <outcome value='1'>\r
+                                <block atomic='true'>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <set>\r
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>\r
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="Y"/>\r
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="N"/>\r
+                                        <!-- Number of Pool Levels -->\r
+                                        <parameter name="eipam-ip-block.pools_length" value="1"/>\r
+                                        <!-- Level 1 -->\r
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>\r
+                                    </set>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                    <get-resource\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         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 ; "\r
         pfx='pfx.eipam-pool-row'>\r
-\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
-       </return></outcome><outcome value="not-found"><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
-       </return></outcome></get-resource><save\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value="not-found">\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNETS\r
@@ -230,11 +331,15 @@
              network_id = $tmp.network-id ; "\r
     force='true'\r
         pfx='pfx.eipam-v6subnet-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><save\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNET_KEYS\r
@@ -245,64 +350,92 @@
              level = 1 ; "\r
     force='true'\r
         pfx='pfx.eipam-v6subnet-key-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-<parameter name="logger" value="message-log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="network-topology-operation"/>\r
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
-<parameter name="field5" value="`$tmp.level1-key-value`"/>\r
-<parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>\r
-<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>\r
-       <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>\r
-       <parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>       \r
-       <parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>\r
-       \r
-       <!-- Number of Pool Levels -->\r
-       <parameter name="eipam-ip-block.pools_length" value="2"/>\r
-\r
-       <!-- Level 1 -->\r
-       <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
-       <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>\r
-\r
-       <!-- Level 2 -->\r
-       <parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>\r
-       <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=''>\r
-<block atomic='true'><record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-<parameter name="logger" value="message-log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="network-topology-operation"/>\r
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
-<parameter name="field4" value="`$network-model.eipam-v6-address-plan`"/>\r
-<parameter name="field5" value="`$tmp.level2-key-value`"/>\r
-<parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>\r
-\r
-</record><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><set>\r
-       <parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv6-cidr-mask`" />\r
-</set></block></outcome></switch><!--subnet and subnet_keys are deleted in the EIPAMPlugin--><execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
-       </return></outcome></execute><get-resource\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                        <parameter name="logger" value="message-log"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="network-topology-operation"/>\r
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>\r
+                                        <parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>\r
+                                        <parameter name="field7" value="Level 1 subnet saved to DB."/>\r
+                                    </record>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='2'>\r
+                                <block atomic='true'>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <set>\r
+                                        <parameter name="eipam-ip-block.plan-name" value="`$network-model.eipam-v6-address-plan`"/>\r
+                                        <parameter name="eipam-ip-block.activate-subnet-flag" value="N"/>\r
+                                        <parameter name="eipam-ip-block.leaf-level-indicator" value="Y"/>\r
+                                        <!-- Number of Pool Levels -->\r
+                                        <parameter name="eipam-ip-block.pools_length" value="2"/>\r
+                                        <!-- Level 1 -->\r
+                                        <parameter name="eipam-ip-block.pools[0].key-name" value="`$tmp.level1-key-name`"/>\r
+                                        <parameter name="eipam-ip-block.pools[0].key-value" value="`$tmp.level1-key-value`"/>\r
+                                        <!-- Level 2 -->\r
+                                        <parameter name="eipam-ip-block.pools[1].key-name" value="`$tmp.level2-key-name`"/>\r
+                                        <parameter name="eipam-ip-block.pools[1].key-value" value="`$tmp.level2-key-value`"/>\r
+                                    </set>\r
+                                    <switch test="`$eipam-ip-block.subnet-size-override`">\r
+                                        <outcome value=''>\r
+                                            <block atomic='true'>\r
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                                    <parameter name="logger" value="message-log"/>\r
+                                                    <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                                    <parameter name="field2" value="network-topology-operation"/>\r
+                                                    <parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
+                                                    <parameter name="field4" value="`$network-model.eipam-v6-address-plan`"/>\r
+                                                    <parameter name="field5" value="`$tmp.level2-key-value`"/>\r
+                                                    <parameter name="field6" value="Level 2 subnet override not set, default to network model value."/>\r
+                                                </record>\r
+                                                <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                                <set>\r
+                                                    <parameter name="eipam-ip-block.subnet-size-override" value="`$network-model.ipv6-cidr-mask`" />\r
+                                                </set>\r
+                                            </block>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                    <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->\r
+                                    <execute plugin="com.att.sdnctl.sli.plugin.eipam.EIPAMPlugin" method="allocateSubnet">\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                    <get-resource\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         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 ; "\r
         pfx='pfx.eipam-pool-row'>\r
-\r
-<outcome value='failure'><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
-       </return></outcome><outcome value="not-found"><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
-       </return></outcome></get-resource><save\r
+                                        <outcome value='failure'>\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value="not-found">\r
+                                            <return status="failure">\r
+                                                <parameter name="tmp.eipam-error" value="true" />\r
+                                                <parameter name="error-code" value="500"/>\r
+                                                <parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNETS\r
@@ -318,11 +451,15 @@
              network_id = $tmp.network-id ; "\r
     force='true'\r
         pfx='pfx.eipam-v6subnet-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><save\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNET_KEYS\r
@@ -333,11 +470,15 @@
              level = 1 ; "\r
     force='true'\r
         pfx='pfx.eipam-v6subnet-key-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><save\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <save\r
         plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
         resource='SQL'\r
         key="INSERT EIPAM_IP_SUBNET_KEYS\r
@@ -348,29 +489,49 @@
              level = 2 ; "\r
     force='true'\r
         pfx='pfx.eipam-v6subnet-key-row'>\r
-<outcome value='failure'><return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
-</return></outcome><outcome value='success'>\r
-</outcome></save><record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
-<parameter name="logger" value="message-log"/>\r
-<parameter name="field1" value="__TIMESTAMP__"/>\r
-<parameter name="field2" value="network-topology-operation"/>\r
-<parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
-<parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
-<parameter name="field5" value="`$tmp.level1-key-value`"/>\r
-\r
-<!-- Level 2 -->\r
-       <parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>\r
-       <parameter name="field7" value="`$tmp.level2-key-value`"/>\r
-<parameter name="field8" value="Level 2 subnet saved to DB."/></record></block></outcome><outcome value=''><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />\r
-       </return></outcome></switch></block></outcome><outcome value=''><return status="failure">\r
-       <parameter name="tmp.eipam-error" value="true" />\r
-       <parameter name="error-code" value="500"/>\r
-       <parameter name="error-message" value="Please set the eipam-ip-block.allocate-version for appropriate EIPAM request." />\r
-       </return></outcome></switch><return status='success'>\r
-       <parameter name="error-code" value="200" />\r
-</return></block></method></service-logic>
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />\r
+                                            </return>\r
+                                        </outcome>\r
+                                        <outcome value='success'></outcome>\r
+                                    </save>\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
+                                        <parameter name="logger" value="message-log"/>\r
+                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
+                                        <parameter name="field2" value="network-topology-operation"/>\r
+                                        <parameter name="field3" value="eipam-allocate-network-role-subnet"/>\r
+                                        <parameter name="field4" value="`$network-model.eipam-v4-address-plan`"/>\r
+                                        <parameter name="field5" value="`$tmp.level1-key-value`"/>\r
+                                        <!-- Level 2 -->\r
+                                        <parameter name="field6" value="NETWORK_ROLE_NETWORK_ID"/>\r
+                                        <parameter name="field7" value="`$tmp.level2-key-value`"/>\r
+                                        <parameter name="field8" value="Level 2 subnet saved to DB."/>\r
+                                    </record>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value=''>\r
+                                <return status="failure">\r
+                                    <parameter name="tmp.eipam-error" value="true" />\r
+                                    <parameter name="error-code" value="500"/>\r
+                                    <parameter name="error-message" value="Please set the eipam-ip-block.level for appropriate EIPAM request." />\r
+                                </return>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
+                </outcome>\r
+                <outcome value=''>\r
+                    <return status="failure">\r
+                        <parameter name="tmp.eipam-error" value="true" />\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="Please set the eipam-ip-block.allocate-version for appropriate EIPAM request." />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
+            <return status='success'>\r
+                <parameter name="error-code" value="200" />\r
+            </return>\r
+        </block>\r
+    </method>\r
+</service-logic>
\ No newline at end of file
SDNC OA&M tools