Fixes to getpathsegment composite and VNF assign

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 232d0c5..9f60d4b 100755 (executable)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
@@ -532,223 +532,230 @@
                                         <parameter name='network-index' value='0' />\r
                                     </set>\r
                                     <for index='role-index' start='0' end='`$db.vf-network-role-mapping_length`'>\r
-                                        <block atomic="true">\r
-                                            <set>\r
-                                                <parameter name='aai.l3-network.' value='' />\r
-                                            </set>\r
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                                        <switch test='`$db.vf-network-role-mapping[$role-index].network-role`'>\r
+                                            <outcome value=''>\r
+                                                <block></block>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <block atomic="true">\r
+                                                    <set>\r
+                                                        <parameter name='aai.l3-network.' value='' />\r
+                                                    </set>\r
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="l3-networks" \r
                key="l3-network.network-role = $db.vf-network-role-mapping[$role-index].network-role"\r
         pfx='aai.l3-network' local-only='false'\r
 >\r
-                                                <outcome value='not-found'>\r
-                                                    <block>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
-                                                                <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                                                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
-                                                            </set>\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
-                                                        </block>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='ack-final' value='Y'/>\r
-                                                            <parameter name="error-code" value="500" />\r
-                                                            <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '\r
+                                                        <outcome value='not-found'>\r
+                                                            <block>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
+                                                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                                                                        <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
+                                                                    </set>\r
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                </block>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '\r
           + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '\r
           + $db.vf-network-role-mapping[$network-index].network-role`" />\r
-                                                        </return>\r
-                                                    </block>\r
-                                                </outcome>\r
-                                                <outcome value='failure'>\r
+                                                                </return>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                        <outcome value='failure'>\r
+                                                            <block>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
+                                                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                                                                        <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
+                                                                    </set>\r
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                </block>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="Error retrieving l3-network from AAI" />\r
+                                                                </return>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </get-resource>\r
+                                                    <set>\r
+                                                        <parameter name='l3-network-id' value='-1' />\r
+                                                    </set>\r
                                                     <block>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
-                                                                <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                                                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
-                                                            </set>\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
-                                                        </block>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='ack-final' value='Y'/>\r
-                                                            <parameter name="error-code" value="500" />\r
-                                                            <parameter name="error-message" value="Error retrieving l3-network from AAI" />\r
-                                                        </return>\r
-                                                    </block>\r
-                                                </outcome>\r
-                                            </get-resource>\r
-                                            <set>\r
-                                                <parameter name='l3-network-id' value='-1' />\r
-                                            </set>\r
-                                            <block>\r
-                                                <set>\r
-                                                    <parameter name='found-network' value='false' />\r
-                                                </set>\r
-                                                <for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\r
-                                                    <block atomic="true">\r
-                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\r
-                                                            <outcome value='PendingCreate'>\r
-                                                                <block></block>\r
-                                                            </outcome>\r
-                                                            <outcome value='Pending Create'>\r
-                                                                <block></block>\r
-                                                            </outcome>\r
-                                                            <outcome value='PendingDelete'>\r
-                                                                <block></block>\r
-                                                            </outcome>\r
-                                                            <outcome value='Pending Delete'>\r
-                                                                <block></block>\r
-                                                            </outcome>\r
-                                                            <outcome value='Other'>\r
-                                                                <for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\r
-                                                                    <block atomic="true">\r
-                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\r
-                                                                            <outcome value='cloud-region'>\r
-                                                                                <for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\r
-                                                                                    <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\r
-                                                                                        <outcome value='cloud-region.cloud-region-id'>\r
-                                                                                            <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\r
-                                                                                                <outcome value='true'>\r
-                                                                                                    <block atomic="true">\r
-                                                                                                        <set>\r
-                                                                                                            <parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\r
-                                                                                                        </set>\r
-                                                                                                        <set>\r
-                                                                                                            <parameter name='found-network' value='true' />\r
-                                                                                                        </set>\r
-                                                                                                        <break/>\r
-                                                                                                    </block>\r
+                                                        <set>\r
+                                                            <parameter name='found-network' value='false' />\r
+                                                        </set>\r
+                                                        <for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\r
+                                                            <block atomic="true">\r
+                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\r
+                                                                    <outcome value='PendingCreate'>\r
+                                                                        <block></block>\r
+                                                                    </outcome>\r
+                                                                    <outcome value='Pending Create'>\r
+                                                                        <block></block>\r
+                                                                    </outcome>\r
+                                                                    <outcome value='PendingDelete'>\r
+                                                                        <block></block>\r
+                                                                    </outcome>\r
+                                                                    <outcome value='Pending Delete'>\r
+                                                                        <block></block>\r
+                                                                    </outcome>\r
+                                                                    <outcome value='Other'>\r
+                                                                        <for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\r
+                                                                            <block atomic="true">\r
+                                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\r
+                                                                                    <outcome value='cloud-region'>\r
+                                                                                        <for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\r
+                                                                                            <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\r
+                                                                                                <outcome value='cloud-region.cloud-region-id'>\r
+                                                                                                    <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\r
+                                                                                                        <outcome value='true'>\r
+                                                                                                            <block atomic="true">\r
+                                                                                                                <set>\r
+                                                                                                                    <parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\r
+                                                                                                                </set>\r
+                                                                                                                <set>\r
+                                                                                                                    <parameter name='found-network' value='true' />\r
+                                                                                                                </set>\r
+                                                                                                                <break/>\r
+                                                                                                            </block>\r
+                                                                                                        </outcome>\r
+                                                                                                    </switch>\r
                                                                                                 </outcome>\r
                                                                                             </switch>\r
-                                                                                        </outcome>\r
-                                                                                    </switch>\r
-                                                                                </for>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                        <switch test='`$found-network`'>\r
-                                                                            <outcome value='true'>\r
-                                                                                <break/>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                    </block>\r
-                                                                </for>\r
-                                                            </outcome>\r
-                                                        </switch>\r
-                                                        <switch test='`$found-network`'>\r
-                                                            <outcome value='true'>\r
-                                                                <break/>\r
-                                                            </outcome>\r
-                                                        </switch>\r
-                                                    </block>\r
-                                                </for>\r
-                                            </block>\r
-                                            <switch test='`$l3-network-id`'>\r
-                                                <outcome value='-1'>\r
-                                                    <block>\r
-                                                        <block atomic="true">\r
-                                                            <set>\r
-                                                                <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
-                                                                <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                                                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
-                                                            </set>\r
-                                                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
-                                                        </block>\r
-                                                        <return status='failure'>\r
-                                                            <parameter name='ack-final' value='Y'/>\r
-                                                            <parameter name="error-code" value="500" />\r
-                                                            <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />\r
-                                                        </return>\r
+                                                                                        </for>\r
+                                                                                    </outcome>\r
+                                                                                </switch>\r
+                                                                                <switch test='`$found-network`'>\r
+                                                                                    <outcome value='true'>\r
+                                                                                        <break/>\r
+                                                                                    </outcome>\r
+                                                                                </switch>\r
+                                                                            </block>\r
+                                                                        </for>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
+                                                                <switch test='`$found-network`'>\r
+                                                                    <outcome value='true'>\r
+                                                                        <break/>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
+                                                            </block>\r
+                                                        </for>\r
                                                     </block>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                            <set>\r
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'\r
+                                                    <switch test='`$l3-network-id`'>\r
+                                                        <outcome value='-1'>\r
+                                                            <block>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
+                                                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
+                                                                        <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
+                                                                    </set>\r
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
+                                                                </block>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />\r
+                                                                </return>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                    <set>\r
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'\r
     value='`$db.vf-network-role-mapping[$role-index].network-role`' />\r
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'\r
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'\r
     value='`$aai.l3-network.l3-network[$db-network-index].network-name`' />\r
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'\r
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'\r
     value='`$aai.l3-network.l3-network[$db-network-index].neutron-network-id`' />\r
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'\r
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'\r
     value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\r
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'\r
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'\r
     value='`$aai.l3-network.l3-network[$db-network-index].contrail-network-fqdn`' />\r
-                                            </set>\r
-                                            <switch test='`$aai.l3-network.l3-network[0].subnets.subnet_length`'>\r
-                                                <outcome value=''>\r
-                                                    <set>\r
-                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\r
-   value='0' />\r
                                                     </set>\r
-                                                </outcome>\r
-                                                <outcome value='0'>\r
-                                                    <set>\r
-                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\r
+                                                    <switch test='`$aai.l3-network.l3-network[0].subnets.subnet_length`'>\r
+                                                        <outcome value=''>\r
+                                                            <set>\r
+                                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\r
    value='0' />\r
-                                                    </set>\r
-                                                </outcome>\r
-                                                <outcome value='Other'>\r
-                                                    <block>\r
-                                                        <for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[0].subnets.subnet_length`' >\r
+                                                            </set>\r
+                                                        </outcome>\r
+                                                        <outcome value='0'>\r
+                                                            <set>\r
+                                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\r
+   value='0' />\r
+                                                            </set>\r
+                                                        </outcome>\r
+                                                        <outcome value='Other'>\r
                                                             <block>\r
-                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>\r
-                                                                    <outcome value=''>\r
-                                                                        <set>\r
-                                                                            <parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />\r
-                                                                        </set>\r
-                                                                    </outcome>\r
-                                                                </switch>\r
-                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>\r
-                                                                    <outcome value='4'>\r
-                                                                        <set>\r
-                                                                            <parameter name='tmp.ip-version' value='ipv4' />\r
-                                                                        </set>\r
-                                                                    </outcome>\r
-                                                                    <outcome value='6'>\r
+                                                                <for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[0].subnets.subnet_length`' >\r
+                                                                    <block>\r
+                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>\r
+                                                                            <outcome value=''>\r
+                                                                                <set>\r
+                                                                                    <parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />\r
+                                                                                </set>\r
+                                                                            </outcome>\r
+                                                                        </switch>\r
+                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>\r
+                                                                            <outcome value='4'>\r
+                                                                                <set>\r
+                                                                                    <parameter name='tmp.ip-version' value='ipv4' />\r
+                                                                                </set>\r
+                                                                            </outcome>\r
+                                                                            <outcome value='6'>\r
+                                                                                <set>\r
+                                                                                    <parameter name='tmp.ip-version' value='ipv6' />\r
+                                                                                </set>\r
+                                                                            </outcome>\r
+                                                                        </switch>\r
                                                                         <set>\r
-                                                                            <parameter name='tmp.ip-version' value='ipv6' />\r
-                                                                        </set>\r
-                                                                    </outcome>\r
-                                                                </switch>\r
-                                                                <set>\r
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].ip-version'\r
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].ip-version'\r
    value='`$tmp.ip-version`' />\r
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-id'\r
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-id'\r
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].neutron-subnet-id`' />\r
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].sdnc-subnet-id'\r
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].sdnc-subnet-id'\r
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-id`' />\r
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-role'\r
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-role'\r
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`' />\r
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-name'\r
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-name'\r
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-name`' />\r
-                                                                </set>\r
-                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>\r
-                                                                    <outcome value='true'>\r
-                                                                        <set>\r
-                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\r
-   value='Y' />\r
                                                                         </set>\r
-                                                                    </outcome>\r
-                                                                    <outcome value='false'>\r
-                                                                        <set>\r
-                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\r
+                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>\r
+                                                                            <outcome value='true'>\r
+                                                                                <set>\r
+                                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\r
+   value='Y' />\r
+                                                                                </set>\r
+                                                                            </outcome>\r
+                                                                            <outcome value='false'>\r
+                                                                                <set>\r
+                                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\r
    value='N' />\r
-                                                                        </set>\r
-                                                                    </outcome>\r
-                                                                </switch>\r
-                                                            </block>\r
-                                                        </for>\r
-                                                        <set>\r
-                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\r
+                                                                                </set>\r
+                                                                            </outcome>\r
+                                                                        </switch>\r
+                                                                    </block>\r
+                                                                </for>\r
+                                                                <set>\r
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\r
    value='`$aai.l3-network.l3-network[0].subnets.subnet_length`' />\r
-                                                        </set>\r
-                                                    </block>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                            <set>\r
-                                                <parameter name='network-index' value='`$network-index + 1`' />\r
-                                            </set>\r
-                                        </block>\r
+                                                                </set>\r
+                                                            </block>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                    <set>\r
+                                                        <parameter name='network-index' value='`$network-index + 1`' />\r
+                                                    </set>\r
+                                                </block>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </for>\r
                                     <set>\r
                                         <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length'\r