From ada219fdb734f69ee23bb10ae4929eaf587f111f Mon Sep 17 00:00:00 2001
From: gaurav <gaurav.agrawal@huawei.com>
Date: Tue, 24 Jul 2018 16:54:22 +0530
Subject: Adding connectivity attachment Resource DGs

Addition includes:
1. Templates for RestapiCallNode
2. DGs for activate, deactivate and delete

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

Former-commit-id: 295a37952f7e6209ab9dc8b7bd98a71d99325a01
---
 ...sotn-attachment-topology-operation-activate.xml | 521 +++++++++++++++++++++
 ...tn-attachment-topology-operation-deactivate.xml | 338 +++++++++++++
 ...I_sotn-attachment-topology-operation-delete.xml | 175 +++++++
 3 files changed, 1034 insertions(+)
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml

(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
new file mode 100644
index 00000000..a8935d83
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -0,0 +1,521 @@
+<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/'
+ + $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
+		     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
+		     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/'
+ + $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
+			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
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
new file mode 100644
index 00000000..5df10857
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -0,0 +1,338 @@
+<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/'
+ + $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
+		     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
+		     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/'
+ + $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
+			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
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
new file mode 100644
index 00000000..1dd02a90
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
@@ -0,0 +1,175 @@
+<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-delete' 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>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <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='Delete' />
+                <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>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <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'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.cidx' value='`$cidx`' />
+                                        </set>
+                                        <break></break>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.cidx`">
+                            <outcome value=''>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx]." value="" />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length - 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>
+            <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>
+            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Resource to be deleted doesn't exist in MDSAL." />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <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 atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                        </set>
+                                        <break></break>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.pidx`">
+                            <outcome value=''>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="resource to be deleted is not available in mdsal" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="service-data.provided-allotted-resources.consumed-allotted-resource[$pidx]." value="" />
+                <parameter name='service-data.provided-allotted-resources.consumed-allotted-resource_length' value='`$service-data.provided-allotted-resources.consumed-allotted-resource_length - 1`' />
+            </set>
+            <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>
+            <delete 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">
+                <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>
+            </delete>
+            <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
-- 
cgit 1.2.3-korg