From f21328db474fe984d15ddbd5eaa09a0fb2694e0d Mon Sep 17 00:00:00 2001
From: "Brandon, Bruce (bb2697)" <bb2697@att.com>
Date: Fri, 27 Jul 2018 14:19:20 +0000
Subject: Fixes to getpathsegment composite and VNF assign

Catch up with fixes to getpathsegment composite and VNF assign

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

Former-commit-id: 5f5240ddb91e0507f9845a96708a4c97a907fe2c
---
 ...pi-contrail-route-topology-operation-delete.xml |   8 +-
 ...CE-API_getpathsegment-create-composite-path.xml |   2 +-
 ...-RESOURCE-API_vnf-topology-operation-assign.xml | 387 +++++++++++----------
 3 files changed, 202 insertions(+), 195 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml
index f0dacbed..d1ef588f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml
@@ -80,7 +80,7 @@
                 </outcome>
             </get-resource>
             <for silentFailure='true' index='ridx' start='0' end="`$aai.ar.relationship-list.relationship_length`" >
-                <for silentFailure='false' index='rdidx' start='0' end="`$aai.cloud-region.relationship-list.relationship[$ridx].relationship-data_length`" >
+                <for silentFailure='false' index='rdidx' start='0' end="`$aai.ar.relationship-list.relationship[$ridx].relationship-data_length`" >
                     <switch test='`$aai.ar.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>
                         <outcome value='configuration.configuration-id'>
                             <block atomic="true">
@@ -197,7 +197,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Failed to create policy in Contrail" />
+                        <parameter name="error-message" value="Failed to delete policy in Contrail" />
                     </return>
                 </outcome>
             </execute>
@@ -208,14 +208,14 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Failed to save network policy in AAI" />
+                        <parameter name="error-message" value="Failed to delete network policy in AAI" />
                     </return>
                 </outcome>
                 <outcome value='not-found'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Failed to save network policy in AAI" />
+                        <parameter name="error-message" value="Failed to delete network policy in AAI" />
                     </return>
                 </outcome>
             </delete>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml
index a09b03cb..76b8df45 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml
@@ -55,7 +55,7 @@
                             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='select sm.invariant_uuid
     from SERVICE_PROXY sp, SERVICE_MODEL sm
-    where sp.parent_service_uuid = sm.service_uuid
+    where sp.source_service_uuid = sm.service_uuid
     and sp.customization_uuid = $serv-cust[$serv-index].id'
   pfx='db'>
                                 <outcome value='failure'>
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 232d0c51..9f60d4bf 100755
--- 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' />
                                     </set>
                                     <for index='role-index' start='0' end='`$db.vf-network-role-mapping_length`'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name='aai.l3-network.' value='' />
-                                            </set>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                                        <switch test='`$db.vf-network-role-mapping[$role-index].network-role`'>
+                                            <outcome value=''>
+                                                <block></block>
+                                            </outcome>
+                                            <outcome value='Other'>
+                                                <block atomic="true">
+                                                    <set>
+                                                        <parameter name='aai.l3-network.' value='' />
+                                                    </set>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="l3-networks" 
 		key="l3-network.network-role = $db.vf-network-role-mapping[$role-index].network-role"
         pfx='aai.l3-network' local-only='false'
 >
-                                                <outcome value='not-found'>
-                                                    <block>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                                                <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                                            </set>
-                                                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        </block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '
+                                                        <outcome value='not-found'>
+                                                            <block>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
+                                                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                                                                        <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                                                                    </set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                </block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '
           + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '
           + $db.vf-network-role-mapping[$network-index].network-role`" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='failure'>
+                                                                </return>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <block>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
+                                                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                                                                        <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                                                                    </set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                </block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Error retrieving l3-network from AAI" />
+                                                                </return>
+                                                            </block>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <set>
+                                                        <parameter name='l3-network-id' value='-1' />
+                                                    </set>
                                                     <block>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                                                <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                                            </set>
-                                                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        </block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error retrieving l3-network from AAI" />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                            </get-resource>
-                                            <set>
-                                                <parameter name='l3-network-id' value='-1' />
-                                            </set>
-                                            <block>
-                                                <set>
-                                                    <parameter name='found-network' value='false' />
-                                                </set>
-                                                <for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >
-                                                    <block atomic="true">
-                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>
-                                                            <outcome value='PendingCreate'>
-                                                                <block></block>
-                                                            </outcome>
-                                                            <outcome value='Pending Create'>
-                                                                <block></block>
-                                                            </outcome>
-                                                            <outcome value='PendingDelete'>
-                                                                <block></block>
-                                                            </outcome>
-                                                            <outcome value='Pending Delete'>
-                                                                <block></block>
-                                                            </outcome>
-                                                            <outcome value='Other'>
-                                                                <for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >
-                                                                    <block atomic="true">
-                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>
-                                                                            <outcome value='cloud-region'>
-                                                                                <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`' >
-                                                                                    <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>
-                                                                                        <outcome value='cloud-region.cloud-region-id'>
-                                                                                            <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`'>
-                                                                                                <outcome value='true'>
-                                                                                                    <block atomic="true">
-                                                                                                        <set>
-                                                                                                            <parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />
-                                                                                                        </set>
-                                                                                                        <set>
-                                                                                                            <parameter name='found-network' value='true' />
-                                                                                                        </set>
-                                                                                                        <break/>
-                                                                                                    </block>
+                                                        <set>
+                                                            <parameter name='found-network' value='false' />
+                                                        </set>
+                                                        <for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >
+                                                            <block atomic="true">
+                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>
+                                                                    <outcome value='PendingCreate'>
+                                                                        <block></block>
+                                                                    </outcome>
+                                                                    <outcome value='Pending Create'>
+                                                                        <block></block>
+                                                                    </outcome>
+                                                                    <outcome value='PendingDelete'>
+                                                                        <block></block>
+                                                                    </outcome>
+                                                                    <outcome value='Pending Delete'>
+                                                                        <block></block>
+                                                                    </outcome>
+                                                                    <outcome value='Other'>
+                                                                        <for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >
+                                                                            <block atomic="true">
+                                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>
+                                                                                    <outcome value='cloud-region'>
+                                                                                        <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`' >
+                                                                                            <switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>
+                                                                                                <outcome value='cloud-region.cloud-region-id'>
+                                                                                                    <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`'>
+                                                                                                        <outcome value='true'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />
+                                                                                                                </set>
+                                                                                                                <set>
+                                                                                                                    <parameter name='found-network' value='true' />
+                                                                                                                </set>
+                                                                                                                <break/>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </switch>
                                                                                                 </outcome>
                                                                                             </switch>
-                                                                                        </outcome>
-                                                                                    </switch>
-                                                                                </for>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                        <switch test='`$found-network`'>
-                                                                            <outcome value='true'>
-                                                                                <break/>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </block>
-                                                                </for>
-                                                            </outcome>
-                                                        </switch>
-                                                        <switch test='`$found-network`'>
-                                                            <outcome value='true'>
-                                                                <break/>
-                                                            </outcome>
-                                                        </switch>
-                                                    </block>
-                                                </for>
-                                            </block>
-                                            <switch test='`$l3-network-id`'>
-                                                <outcome value='-1'>
-                                                    <block>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                                                <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                                            </set>
-                                                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        </block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
-                                                        </return>
+                                                                                        </for>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                                <switch test='`$found-network`'>
+                                                                                    <outcome value='true'>
+                                                                                        <break/>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </block>
+                                                                        </for>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <switch test='`$found-network`'>
+                                                                    <outcome value='true'>
+                                                                        <break/>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </for>
                                                     </block>
-                                                </outcome>
-                                            </switch>
-                                            <set>
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'
+                                                    <switch test='`$l3-network-id`'>
+                                                        <outcome value='-1'>
+                                                            <block>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
+                                                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                                                                        <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                                                                    </set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                                </block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
+                                                                </return>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                    <set>
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'
     value='`$db.vf-network-role-mapping[$role-index].network-role`' />
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'
     value='`$aai.l3-network.l3-network[$db-network-index].network-name`' />
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'
     value='`$aai.l3-network.l3-network[$db-network-index].neutron-network-id`' />
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'
     value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />
-                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'
+                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'
     value='`$aai.l3-network.l3-network[$db-network-index].contrail-network-fqdn`' />
-                                            </set>
-                                            <switch test='`$aai.l3-network.l3-network[0].subnets.subnet_length`'>
-                                                <outcome value=''>
-                                                    <set>
-                                                        <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'
-   value='0' />
                                                     </set>
-                                                </outcome>
-                                                <outcome value='0'>
-                                                    <set>
-                                                        <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'
+                                                    <switch test='`$aai.l3-network.l3-network[0].subnets.subnet_length`'>
+                                                        <outcome value=''>
+                                                            <set>
+                                                                <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'
    value='0' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <block>
-                                                        <for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[0].subnets.subnet_length`' >
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='0'>
+                                                            <set>
+                                                                <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'
+   value='0' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='Other'>
                                                             <block>
-                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>
-                                                                    <outcome value=''>
-                                                                        <set>
-                                                                            <parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </switch>
-                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>
-                                                                    <outcome value='4'>
-                                                                        <set>
-                                                                            <parameter name='tmp.ip-version' value='ipv4' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                    <outcome value='6'>
+                                                                <for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[0].subnets.subnet_length`' >
+                                                                    <block>
+                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>
+                                                                            <outcome value=''>
+                                                                                <set>
+                                                                                    <parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>
+                                                                            <outcome value='4'>
+                                                                                <set>
+                                                                                    <parameter name='tmp.ip-version' value='ipv4' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                            <outcome value='6'>
+                                                                                <set>
+                                                                                    <parameter name='tmp.ip-version' value='ipv6' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </switch>
                                                                         <set>
-                                                                            <parameter name='tmp.ip-version' value='ipv6' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </switch>
-                                                                <set>
-                                                                    <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'
+                                                                            <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'
    value='`$tmp.ip-version`' />
-                                                                    <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'
+                                                                            <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'
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].neutron-subnet-id`' />
-                                                                    <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'
+                                                                            <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'
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-id`' />
-                                                                    <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'
+                                                                            <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'
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`' />
-                                                                    <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'
+                                                                            <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'
    value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-name`' />
-                                                                </set>
-                                                                <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>
-                                                                    <outcome value='true'>
-                                                                        <set>
-                                                                            <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'
-   value='Y' />
                                                                         </set>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <set>
-                                                                            <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'
+                                                                        <switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>
+                                                                            <outcome value='true'>
+                                                                                <set>
+                                                                                    <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'
+   value='Y' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                            <outcome value='false'>
+                                                                                <set>
+                                                                                    <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'
    value='N' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </switch>
-                                                            </block>
-                                                        </for>
-                                                        <set>
-                                                            <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'
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </block>
+                                                                </for>
+                                                                <set>
+                                                                    <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'
    value='`$aai.l3-network.l3-network[0].subnets.subnet_length`' />
-                                                        </set>
-                                                    </block>
-                                                </outcome>
-                                            </switch>
-                                            <set>
-                                                <parameter name='network-index' value='`$network-index + 1`' />
-                                            </set>
-                                        </block>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                    <set>
+                                                        <parameter name='network-index' value='`$network-index + 1`' />
+                                                    </set>
+                                                </block>
+                                            </outcome>
+                                        </switch>
                                     </for>
                                     <set>
                                         <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length'
-- 
cgit 1.2.3-korg