From 38cd81d0c603227a14b1f5b57470015c998fe9e4 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav.agrawal@huawei.com>
Date: Thu, 2 Aug 2018 10:50:02 +0530
Subject: Updates to SOTN DG

Updates include:
- Changes to support inter-domain.
- Changes wrt. AAI nodes and fields.

Change-Id: I50ed3553e792a382c534c72475afc666629320cc
Issue-ID: SDNC-356
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 62b4fd6b216ec03288cd216b50803ba8c64a3c3b
---
 ...sotn-attachment-topology-operation-activate.xml | 1071 ++++++++++----------
 ...I_sotn-attachment-topology-operation-create.xml |  486 ++++-----
 ...tn-attachment-topology-operation-deactivate.xml |  689 +++++++------
 ...PI_sotn-network-topology-operation-activate.xml |    6 +-
 ...-API_sotn-network-topology-operation-create.xml |   35 +-
 ..._sotn-network-topology-operation-deactivate.xml |    6 +-
 ...-API_sotn-network-topology-operation-delete.xml |    4 +-
 7 files changed, 1195 insertions(+), 1102 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_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index a8935d83..8d9c12e4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -1,521 +1,570 @@
 <service-logic
-	xmlns='http://www.onap.org/sdnc/svclogic'
-	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-	<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
-		<block atomic="true">
-			<set>
-				<parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-				<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-			</set>
-			<set>
-				<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
  + $tmp.ar.allotted-resource-id
  + '/allotted-resource-data/connection-attachment-topology/'` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-				<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-				<parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-				<parameter name="outputPath" value="tmp.ar-url"/>
-				<parameter name="target" value="{allotted-resource-id}"/>
-				<parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-			</execute>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-				<outcome value='success'>
-					<block atomic="true">
-						<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-							<outcome value='1'>
-								<block atomic='true'>
-									<set>
-										<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-									</set>
-									<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-										<outcome value='Created'>
-											<block></block>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message"
-													value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-											</return>
-										</outcome>
-									</switch>
-									<set>
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-									</set>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: SOTN resource not found" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<block atomic="true">
-						<return status='failure'>
-							<parameter name='ack-final' value='Y'/>
-							<parameter name="error-code" value="404" />
-							<parameter name="error-message" value="Error: SOTN resource not found" />
-						</return>
-					</block>
-				</outcome>
-			</get-resource>
-			<block atomic="true">
-				<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-			</block>
-			<set>
-				<parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-			</set>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</get-resource>
-			<set>
-				<parameter name='tmp.found-in-ar' value='false' />
-				<parameter name='tmp.found-in-network' value='false' />
-				<parameter name='tmp.ep-available' value='false' />
-			</set>
-			<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-				<outcome value='2'>
-					<block atomic="true">
-						<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-							<switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-								<outcome value='true'>
-									<block></block>
-								</outcome>
-								<outcome value='false'>
-									<block atomic="true">
-										<set>
-											<parameter name='tmp.pidx' value='`$pidx`' />
-											<parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-											<parameter name='tmp.found-in-ar' value='true' />
-											<parameter name='tmp.ep-available' value='true' />
-										</set>
-										<break></break>
-									</block>
-								</outcome>
-							</switch>
-						</for>
-						<switch test='`$tmp.found-in-ar`'>
-							<outcome value='true'>
-								<block atomic="true">
-									<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >
-										<outcome value='success'>
-											<block></block>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="404" />
-												<parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
-											</return>
-										</outcome>
-									</get-resource>
-								</block>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='1'>
-					<block atomic="true">
-						<switch test='`$mdsal-psd.networks.network_length`'>
-							<outcome value='1'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
-									</set>
-									<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-										<block>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='tmp.found-in-network' value='true' />
-														<parameter name='tmp.ep-available' value='true' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-														<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<return status='success'>
-												<parameter name="ack-final-indicator" value="Y" />
-												<parameter name="error-code" value="200" />
-												<parameter name="error-message" value="`$error-message`" />
-											</return>
-										</block>
-									</for>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</switch>
-			<switch test='`$tmp.ep-available`'>
-				<outcome value='false'>
-					<block></block>
-				</outcome>
-				<outcome value='true'>
-					<block atomic="true">
-						<switch test='`$tmp.found-in-ar`'>
-							<outcome value='true'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-parameters`' />
-									</set>
-								</block>
-							</outcome>
-							<outcome value='false'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.ep.parameters' value='`$tmp.network.network-data.network-request-input.network-input-parameters`' />
-									</set>
-								</block>
-							</outcome>
-						</switch>
-						<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >
-							<block>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<return status='success'>
-									<parameter name="ack-final-indicator" value="Y" />
-									<parameter name="error-code" value="200" />
-									<parameter name="error-message" value="`$error-message`" />
-								</return>
-							</block>
-						</for>
-						<block atomic="true">
-							<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-								<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-								<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url'`" />
-								<parameter name="restapiUser" value="`$prop.oof.user`" />
-								<parameter name="restapiPassword" value="`$prop.oof.password`" />
-								<parameter name="format" value="json"/>
-								<parameter name="httpMethod" value="post"/>
-								<parameter name="responsePrefix" value="oof"/>
-								<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-								<parameter name="trustStorePassword" value="adminadmin"/>
-								<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-								<parameter name="keyStorePassword" value="adminadmin"/>
-								<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-								<outcome value='failure'>
-									<return status='failure'>
-										<parameter name='ack-final' value='Y'/>
-										<parameter name="error-code" value="500" />
-										<parameter name="error-message" value="Error executing Create vpn rest api" />
-									</return>
-								</outcome>
-								<outcome value='success'>
-									<block atomic="true"></block>
-								</outcome>
-							</execute>
-							<for index='vidx' start='0' end='`$oof.vpns_length`' >
-								<block atomic="true">
-									<set>
-										<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
-									</set>
-									<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-										resource="pnf"
-										key="pnf.pnf-name = $oof.vpn.access-node-id AND
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Created'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: SOTN resource not found" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: SOTN resource not found" />
+                        </return>
+                    </block>
+                </outcome>
+            </get-resource>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </get-resource>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                        <break></break>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >
+                                        <outcome value='success'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="404" />
+                                                <parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-parameters`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters' value='`$tmp.network.network-data.network-request-input.network-input-parameters`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                        <for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >
+                            <block>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                    <parameter name="error-message" value="`$error-message`" />
+                                </return>
+                            </block>
+                        </for>
+                        <block atomic="true">
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+                                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url'`" />
+                                <parameter name="restapiUser" value="`$prop.oof.user`" />
+                                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="post"/>
+                                <parameter name="responsePrefix" value="oof"/>
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block atomic="true"></block>
+                                </outcome>
+                            </execute>
+                            <for index='vidx' start='0' end='`$oof.vpns_length`' >
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
+                                    </set>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $oof.vpn.access-node-id AND 
 		     depth = '0'"
-										pfx='tmp.aai.pnf' local-only='false' >
-										<outcome value='success'>
-											<set>
-												<parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-											</set>
-										</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="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-											</return>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-											</return>
-										</outcome>
-									</get-resource>
-									<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-										resource="esr-thirdparty-sdnc"
-										key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND
+        pfx='tmp.aai.pnf' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                            </set>
+                                        </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="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
 		     depth = '1'"
-										pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-										<outcome value='success'>
-											<set>
-												<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-												<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-												<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-											</set>
-										</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="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-											</return>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-											</return>
-										</outcome>
-									</get-resource>
-									<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-										<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-										<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" />
-										<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-										<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-										<parameter name="format" value="json"/>
-										<parameter name="httpMethod" value="patch"/>
-										<parameter name="responsePrefix" value="vpn-result"/>
-										<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-										<parameter name="trustStorePassword" value="adminadmin"/>
-										<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-										<parameter name="keyStorePassword" value="adminadmin"/>
-										<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-										<outcome value='failure'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="Error executing Create vpn rest api" />
-											</return>
-										</outcome>
-										<outcome value='success'>
-											<block atomic="true"></block>
-										</outcome>
-									</execute>
-								</block>
-							</for>
-						</block>
-					</block>
-				</outcome>
-			</switch>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-			</set>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-				<parameter name="outputPath" value="tmp.current-time" />
-			</execute>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-				<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-				<parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-				<parameter name='restapiUser' value='`$prop.controller.user`' />
-				<parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-				<parameter name='format' value='json' />
-				<parameter name='httpMethod' value='PUT' />
-				<parameter name="responsePrefix" value="mdsal-ar" />
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-					</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="Error updating md-sal for connection-attachment-allotted-resource" />
-					</return>
-				</outcome>
-			</execute>
-			<set>
-				<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-				<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-				<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                            </set>
+                                        </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="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                        <parameter name="format" value="json"/>
+                                        <parameter name="httpMethod" value="patch"/>
+                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true"></block>
+                                        </outcome>
+                                    </execute>
+                                    <set>
+                                        <parameter name='tmp.vpnName' value='`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`' />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' >
+                                        <parameter name='vpn-id' value='`$tmp.vpnName`' />
+                                        <parameter name='vpn-name' value='`$tmp.vpnName`' />
+                                        <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
+                                        <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
+                                        <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
+                                        <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
+                                        <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
+                                        <parameter name='cvlan-tag-entry' value='`$prop.connection-attachment.cVLAN`' />
+                                        <parameter name='operational-status' value='Created' />
+                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                        <parameter name='configuration-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.networks.network[0].network-id`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.networks.network[0].network-id`" />
+                                    </save>
+                                    <set>
+                                        <parameter name='src-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`" />
+                                        <parameter name='dst-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`" />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/p-interfaces/p-interface/' + $src-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/p-interfaces/p-interface/' + $dst-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
+                                    </save>
+                                </block>
+                            </for>
+                        </block>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </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="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $connection-attachment-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-			</set>
-			<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-				resource="allotted-resource"
-				key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-				pfx='pfx' local-only='false' force='false'>
-				<parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-				<parameter name="selflink" value="`$tmp.ar.self-link`" />
-				<parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-				<parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-				<parameter name="operational-status" value="Active" />
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="AAI failed" />
-					</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="AAI failed" />
-					</return>
-				</outcome>
-			</update>
-			<return status='success'>
-				<parameter name="ack-final-indicator" value="Y" />
-				<parameter name="error-code" value="200" />
-				<parameter name="error-message" value="`$error-message`" />
-			</return>
-		</block>
-	</method>
-</service-logic>
\ No newline at end of file
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Active" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </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="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index 50ab2493..727246a3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -1,250 +1,256 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-   <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
-      <block atomic="true">
-         <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-            <outcome value=''>
-               <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                  <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
-                  <outcome value='failure'>
-                     <return status='failure'>
-                        <parameter name='error-code' value='' />
-                        <parameter name='error-message' value="An error occured while generation allotted resource ID" />
-                     </return>
-                  </outcome>
-               </execute>
-            </outcome>
-            <outcome value='Other'>
-               <set>
-                  <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-               </set>
-            </outcome>
-         </switch>
-         <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
-            <outcome value=''>
-               <set>
-                  <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
-               </set>
-            </outcome>
-            <outcome value='Other'>
-               <set>
-                  <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
-               </set>
-            </outcome>
-         </switch>
-         <set>
-            <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
+        <block atomic="true">
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+                        <outcome value='failure'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='' />
+                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+                            </return>
+                        </outcome>
+                    </execute>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                    </set>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+                    </set>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
  + $tmp.ar.allotted-resource-id
  + '/allotted-resource-data/connection-attachment-topology/'` " />
-         </set>
-         <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-            <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-            <parameter name='contextPrefix' value='prop' />
-         </execute>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-            <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-            <parameter name="outputPath" value="tmp.ar-url"/>
-            <parameter name="target" value="{allotted-resource-id}"/>
-            <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-         </execute>
-         <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >
-            <outcome value='success'>
-               <block atomic="true">
-                  <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                     <outcome value='1'>
-                        <return status='failure'>
-                           <parameter name='ack-final' value='Y'/>
-                           <parameter name="error-code" value="500" />
-                           <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
-                        </return>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-         </get-resource>
-         <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-            <outcome value=''>
-               <set>
-                  <parameter name='tmp.cidx' value="`0`" />
-                  <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-               </set>
-            </outcome>
-            <outcome value='Other'>
-               <block atomic="true">
-                  <set>
-                     <parameter name='tmp.found-cidx' value="`false`" />
-                  </set>
-                  <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                     <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                        <outcome value='true'>
-                           <return status='failure'>
-                              <parameter name='ack-final' value='Y'/>
-                              <parameter name="error-code" value="500" />
-                              <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
-                           </return>
-                        </outcome>
-                     </switch>
-                  </for>
-                  <switch test='`$tmp.found-cidx`'>
-                     <outcome value='false'>
-                        <block atomic="true">
-                           <set>
-                              <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-                           </set>
-                        </block>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-         </switch>
-         <set>
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-         </set>
-         <set>
-            <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-         </set>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-            <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
-            <parameter name="outputPath" value="tmp.parent-ar-url"/>
-            <parameter name="target" value="{service-instance-id}"/>
-            <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
-         </execute>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-            <parameter name="source" value="`$tmp.parent-ar-url`"/>
-            <parameter name="outputPath" value="tmp.parent-ar-url"/>
-            <parameter name="target" value="{allotted-resource-id}"/>
-            <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-         </execute>
-         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-            <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-            <parameter name='restapiUser' value='`$prop.controller.user`' />
-            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-            <parameter name='format' value='json' />
-            <parameter name='httpMethod' value='PUT' />
-            <parameter name="responsePrefix" value="parent" />
-            <outcome value='success'>
-               <block></block>
-            </outcome>
-            <outcome value='failure'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-               </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="Error updating md-sal for connection-attachment-allotted-resource" />
-               </return>
-            </outcome>
-         </execute>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-            <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-            <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
-         </set>
-         <set>
-            <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
-            <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-            <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-         </set>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.'
-                value="`$connection-attachment-ar-identifiers.`" />
-         </set>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
-         </set>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-            <parameter name="outputPath" value="tmp.current-time" />
-         </execute>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-         </set>
-         <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-            <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-            <parameter name='restapiUser' value='`$prop.controller.user`' />
-            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-            <parameter name='format' value='json' />
-            <parameter name='httpMethod' value='PUT' />
-            <parameter name="responsePrefix" value="mdsal-ar" />
-            <outcome value='success'>
-               <block></block>
-            </outcome>
-            <outcome value='failure'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-               </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="Error updating md-sal for connection-attachment-allotted-resource" />
-               </return>
-            </outcome>
-         </execute>
-         <set>
-            <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-            <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-            <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </get-resource>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.cidx' value="`0`" />
+                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='tmp.found-cidx' value="`false`" />
+                        </set>
+                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-cidx`'>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.parent-ar-url`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="parent" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </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="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
+value="`$connection-attachment-ar-identifiers.`" />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </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="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $connection-attachment-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-         </set>
-         <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-             resource="allotted-resource"
-             key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-             pfx='pfx' local-only='false' force='false'>
-            <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-            <parameter name="selflink" value="`$tmp.ar.self-link`" />
-            <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-            <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-            <parameter name="operational-status" value="Created" />
-            <outcome value='failure'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="AAI failed" />
-               </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="AAI failed" />
-               </return>
-            </outcome>
-         </update>
-         <return status='success'>
-            <parameter name="ack-final-indicator" value="Y" />
-            <parameter name="error-code" value="200" />
-            <parameter name="error-message" value="`$error-message`" />
-         </return>
-      </block>
-   </method>
-</service-logic>
\ No newline at end of file
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+                <parameter name="cvlan-tag-entry" value="`$prop.connection-attachment.cVLAN`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Created" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </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="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 5df10857..e11ef2fb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -1,338 +1,371 @@
 <service-logic
-	xmlns='http://www.onap.org/sdnc/svclogic'
-	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-	<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
-		<block atomic="true">
-			<set>
-				<parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-				<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-			</set>
-			<set>
-				<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
  + $tmp.ar.allotted-resource-id
  + '/allotted-resource-data/connection-attachment-topology/'` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-				<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-				<parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-				<parameter name="outputPath" value="tmp.ar-url"/>
-				<parameter name="target" value="{allotted-resource-id}"/>
-				<parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-			</execute>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-				<outcome value='success'>
-					<block atomic="true">
-						<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-							<outcome value='1'>
-								<block atomic='true'>
-									<set>
-										<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-									</set>
-									<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-										<outcome value='Active'>
-											<block></block>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message"
-													value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-											</return>
-										</outcome>
-									</switch>
-									<set>
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-									</set>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: SOTN resource not found" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<block atomic="true">
-						<return status='failure'>
-							<parameter name='ack-final' value='Y'/>
-							<parameter name="error-code" value="404" />
-							<parameter name="error-message" value="Error: SOTN resource not found" />
-						</return>
-					</block>
-				</outcome>
-			</get-resource>
-			<block atomic="true">
-				<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-			</block>
-			<set>
-				<parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-			</set>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</get-resource>
-			<set>
-				<parameter name='tmp.found-in-ar' value='false' />
-				<parameter name='tmp.found-in-network' value='false' />
-				<parameter name='tmp.ep-available' value='false' />
-			</set>
-			<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-				<outcome value='2'>
-					<block atomic="true">
-						<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-							<switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-								<outcome value='true'>
-									<block></block>
-								</outcome>
-								<outcome value='false'>
-									<block atomic="true">
-										<set>
-											<parameter name='tmp.pidx' value='`$pidx`' />
-											<parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-											<parameter name='tmp.found-in-ar' value='true' />
-											<parameter name='tmp.ep-available' value='true' />
-										</set>
-										<break></break>
-									</block>
-								</outcome>
-							</switch>
-						</for>
-					</block>
-				</outcome>
-				<outcome value='1'>
-					<block atomic="true">
-						<switch test='`$mdsal-psd.networks.network_length`'>
-							<outcome value='1'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
-									</set>
-									<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-										<block>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='tmp.found-in-network' value='true' />
-														<parameter name='tmp.ep-available' value='true' />
-													</set>
-												</outcome>
-											</switch>
-											<return status='success'>
-												<parameter name="ack-final-indicator" value="Y" />
-												<parameter name="error-code" value="200" />
-												<parameter name="error-message" value="`$error-message`" />
-											</return>
-										</block>
-									</for>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</switch>
-			<switch test='`$tmp.ep-available`'>
-				<outcome value='false'>
-					<block></block>
-				</outcome>
-				<outcome value='true'>
-					<block atomic="true">
-						<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-							resource="pnf"
-							key="pnf.pnf-name = $prop.connection-attachement.access-node-id AND
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Active'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: SOTN resource not found" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: SOTN resource not found" />
+                        </return>
+                    </block>
+                </outcome>
+            </get-resource>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </get-resource>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                        <break></break>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="connectivity" 
+		key="connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND 
+		     depth = '1'"
+        pfx='tmp.connectivity' local-only='false' >
+                            <for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >
+                                <switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>
+                                    <outcome value='vpn-binding'>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name='tmp.vpn-name' value="`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` " />
+                                            </set>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                <parameter name="original_string" value='`$tmp.vpn-name`'/>
+                                                <parameter name="regex" value="-"/>
+                                                <parameter name="ctx_memory_result_key" value="route1"/>
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='tmp.node-id' value='`$route1[0]`' />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='' />
+                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                    </return>
+                                                </outcome>
+                                            </execute>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $tmp.node-id AND 
 		     depth = '0'"
-							pfx='tmp.aai.pnf' local-only='false' >
-							<outcome value='success'>
-								<set>
-									<parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-								</set>
-							</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="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-								</return>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-								</return>
-							</outcome>
-						</get-resource>
-						<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-							resource="esr-thirdparty-sdnc"
-							key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND
+        pfx='tmp.aai.pnf' local-only='false' >
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                                    </set>
+                                                </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="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
 		     depth = '1'"
-							pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-							<outcome value='success'>
-								<set>
-									<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-									<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-									<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-								</set>
-							</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="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-								</return>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-								</return>
-							</outcome>
-						</get-resource>
-						<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-							<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $prop.connection-attachment.sotnVpnName`" />
-							<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-							<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-							<parameter name="format" value="json"/>
-							<parameter name="httpMethod" value="delete"/>
-							<parameter name="responsePrefix" value="vpn-result"/>
-							<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-							<parameter name="trustStorePassword" value="adminadmin"/>
-							<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-							<parameter name="keyStorePassword" value="adminadmin"/>
-							<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-							<outcome value='failure'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="Error executing Create vpn rest api" />
-								</return>
-							</outcome>
-							<outcome value='success'>
-								<block atomic="true"></block>
-							</outcome>
-						</execute>
-					</block>
-				</outcome>
-			</switch>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-			</set>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-				<parameter name="outputPath" value="tmp.current-time" />
-			</execute>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-				<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-				<parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-				<parameter name='restapiUser' value='`$prop.controller.user`' />
-				<parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-				<parameter name='format' value='json' />
-				<parameter name='httpMethod' value='PUT' />
-				<parameter name="responsePrefix" value="mdsal-ar" />
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-					</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="Error updating md-sal for connection-attachment-allotted-resource" />
-					</return>
-				</outcome>
-			</execute>
-			<set>
-				<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-				<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-				<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                    </set>
+                                                </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="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.vpn-name`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="delete"/>
+                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true"></block>
+                                                </outcome>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </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="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $connection-attachment-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-			</set>
-			<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-				resource="allotted-resource"
-				key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-				pfx='pfx' local-only='false' force='false'>
-				<parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-				<parameter name="selflink" value="`$tmp.ar.self-link`" />
-				<parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-				<parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-				<parameter name="operational-status" value="PendingDelete" />
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="AAI failed" />
-					</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="AAI failed" />
-					</return>
-				</outcome>
-			</update>
-			<return status='success'>
-				<parameter name="ack-final-indicator" value="Y" />
-				<parameter name="error-code" value="200" />
-				<parameter name="error-message" value="`$error-message`" />
-			</return>
-		</block>
-	</method>
-</service-logic>
\ No newline at end of file
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="PendingDelete" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </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="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
index 93de3abb..7e3fca53 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
@@ -29,9 +29,9 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' 
-      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >
-                <parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
+                <parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />
                 <parameter name='operational-status' value='Active' />
             </update>
             <return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index fa2547d3..446d8a19 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
@@ -172,33 +172,38 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' 
-      key='configuration.configuration-id = $prop.sotn.network-id' >
-                <parameter name='configuration-id' value='`$prop.sotn.network-id`' />
-                <parameter name='configuration-name' value='`$prop.sotn.client-svc-name`' />
-                <parameter name='configuration-type' value='`$prop.sotn.client-svc-descr`' />
-                <parameter name='configuration-sub-type' value='`$prop.sotn.tenantId`' />
-                <parameter name='orchestration-status' value='`$prop.sotn.vpnType`' />
-                <parameter name='management-option' value='`$prop.sotn.cir`' />
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $prop.sotn.network-id' >
+                <parameter name='connectivity-id' value='`$prop.sotn.network-id`' />
+                <parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />
+                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                <parameter name='color-aware' value='`$prop.sotn.colorAware`' />
+                <parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />
+                <parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />
+                <parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />
+                <parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />
+                <parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />
+                <parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />
+                <parameter name='cvlan-tag-entry' value='`$prop.sotn.cVLAN`' />
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
                 <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                <parameter name='configuration-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
       key='service-instance.service-instance-id = $service-data.service-information.service-instance-id 
          AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id 
          AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' 
       force="true" pfx="tmp.AnAI-data">
-                <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.sotn.network-id`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
+                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />
             </save>
-            <set>
-                <parameter name='unique-src-ltpId' value="`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`" />
-            </set>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
index 27d27388..ac891e34 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
@@ -29,9 +29,9 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' 
-      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >
-                <parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
+                <parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />
                 <parameter name='operational-status' value='PendingDelete' />
             </update>
             <return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
index c2d0c9ab..2eb6e767 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
@@ -10,8 +10,8 @@
                 <parameter name="field2" value="sotn-network-topology-operation-delete"/>
                 <parameter name="field3" value="SOTN-Delete"/>
             </record>
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='configuration' 
-        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'></delete>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='connectivity' 
+        key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id'></delete>
             <set>
                 <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`"/>
             </set>
-- 
cgit 1.2.3-korg