From: Dan Timoney <dtimoney@att.com>
Date: Wed, 4 Mar 2020 14:57:26 +0000 (+0000)
Subject: Merge "Adding support for multi-layer and multi-domain topology discovery for CCVPN"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=92555a71ca2c208d33cbbb043c755f0175c6decc;hp=e5d3e8b2548f4cfe234e7d35733964e803cc0594;p=sdnc%2Foam.git

Merge "Adding support for multi-layer and multi-domain topology discovery for CCVPN"
---

diff --git a/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties b/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties
new file mode 100644
index 00000000..aae34a26
--- /dev/null
+++ b/installation/dmaap-listener/src/main/properties/dmaap-consumer-CMNotify.properties
@@ -0,0 +1,35 @@
+TransportType=HTTPNOAUTH
+Latitude =50.000000
+Longitude =-100.000000
+Version =1.0
+ServiceName =message-router.onap:3904/events
+Environment =TEST
+Partner =
+routeOffer=MR1
+SubContextPath =/
+Protocol =http
+MethodType =GET
+username =admin
+password =admin
+contenttype =application/json
+authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs=
+authDate=2019-04-09T04:28:40-05:00
+host=message-router.onap:3904
+topic=CM-NOTIFICATION
+group=users
+id=sdnc1
+timeout=15000
+limit=1000
+filter=
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_REQ_TRACE_ON=true
+AFT_ENVIRONMENT=AFTUAT
+AFT_DME2_EP_CONN_TIMEOUT=15000
+AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
+AFT_DME2_EP_READ_TIMEOUT_MS=50000
+sessionstickinessrequired=NO
+DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt
+sdnc.odl.user=admin
+sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations
diff --git a/installation/dmaap-listener/src/main/properties/dmaap-listener.properties b/installation/dmaap-listener/src/main/properties/dmaap-listener.properties
index ce8e337a..5101c275 100755
--- a/installation/dmaap-listener/src/main/properties/dmaap-listener.properties
+++ b/installation/dmaap-listener/src/main/properties/dmaap-listener.properties
@@ -1 +1 @@
-subscriptions=org.onap.ccsdk.sli.northbound.dmaapclient.SdncDhcpEventConsumer:dhcpalert.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncLcmDmaapConsumer:lcm.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncAaiDmaapConsumer:aai.properties;org.onap.ccsdk.sli.northbound.dmaapclient.OofPciPocDmaapConsumers:dmaap-consumer-oofpcipoc.properties;org.onap.ccsdk.sli.northbound.dmaapclient.A1AdapterPolicyDmaapConsumer:dmaap-consumer-a1Adapter-policy.properties
+subscriptions=org.onap.ccsdk.sli.northbound.dmaapclient.SdncDhcpEventConsumer:dhcpalert.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncLcmDmaapConsumer:lcm.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncAaiDmaapConsumer:aai.properties;org.onap.ccsdk.sli.northbound.dmaapclient.OofPciPocDmaapConsumers:dmaap-consumer-oofpcipoc.properties;org.onap.ccsdk.sli.northbound.dmaapclient.A1AdapterPolicyDmaapConsumer:dmaap-consumer-a1Adapter-policy.properties;org.onap.ccsdk.sli.northbound.dmaapclient.CMNotifyDmaapConsumer:dmaap-consumer-CMNotify.properties
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 1ae66ab6..45aa9dba 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -153,7 +153,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- connectApp -->
 								<artifactItem>
@@ -163,7 +163,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- eventLogApp -->
 								<artifactItem>
@@ -173,7 +173,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- helpApp -->
 								<artifactItem>
@@ -183,7 +183,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- maintenanceApp -->
 								<artifactItem>
@@ -193,7 +193,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- minimumApp -->
 								<artifactItem>
@@ -203,7 +203,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- configurationApp -->
 								<artifactItem>
@@ -213,7 +213,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- demoApp -->
 								<artifactItem>
@@ -223,7 +223,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- faultApp -->
 								<artifactItem>
@@ -243,7 +243,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- mediatorApp -->
 								<artifactItem>
@@ -253,7 +253,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- performanceHistoryApp -->
 								<artifactItem>
@@ -263,7 +263,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- helpserver resources -->
 								<artifactItem>
@@ -273,7 +273,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>help/*</includes>
+									<includes>help/**</includes>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json
new file mode 100644
index 00000000..daa8d21f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json
@@ -0,0 +1 @@
+[{"id":"79a754d7.03267c","type":"dgstart","name":"DGSTART","outputs":1,"x":138.57142639160156,"y":61.42857360839844,"z":"1823fdbd.4322b2","wires":[["5f07514.3329cb"]]},{"id":"5f07514.3329cb","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<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}'>","outputs":1,"x":414.57142639160156,"y":62.42857360839844,"z":"1823fdbd.4322b2","wires":[["ab2e4dba.2286e"]]},{"id":"ab2e4dba.2286e","type":"method","name":"self-serve-process-vfmodule-mapping-ra-response","xml":"<method rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":304.0714416503906,"y":116.17857551574707,"z":"1823fdbd.4322b2","wires":[["553fad5c.980e24"]]},{"id":"553fad5c.980e24","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":197.83727264404297,"y":187.04762268066406,"z":"1823fdbd.4322b2","wires":[["fe513761.0453c8","46e20dec.d3b074","41663779.ca9db8","269dfcc8.a905a4"]]},{"id":"fe513761.0453c8","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":489.6229705810547,"y":230.41666984558105,"z":"1823fdbd.4322b2","wires":[["2b5ec4f9.cbde6c"]]},{"id":"2b5ec4f9.cbde6c","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":798.1943817138672,"y":229.84525871276855,"z":"1823fdbd.4322b2","wires":[["9b918b20.342278"]]},{"id":"9b918b20.342278","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"resolution-summary_length is null\" />\n","comments":"","x":969.1944198608398,"y":230.41666793823242,"z":"1823fdbd.4322b2","wires":[]},{"id":"46e20dec.d3b074","type":"for","name":"for resolution-summary[]","xml":"<for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\n","comments":"","outputs":1,"x":455.8333282470703,"y":440.4166946411133,"z":"1823fdbd.4322b2","wires":[["954f452d.486a28"]]},{"id":"938b4d93.409c3","type":"set","name":" ADD resolution-summary[].name/value to param[]","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>","comments":"","x":1687.3333129882812,"y":522.666711807251,"z":"1823fdbd.4322b2","wires":[]},{"id":"3ef76de7.5dfde2","type":"for","name":"for vf-module-parameters.param[]","xml":"<for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n","comments":"","outputs":1,"x":1359.0833358764648,"y":439.41670989990234,"z":"1823fdbd.4322b2","wires":[["f75c0cc1.c0d76"]]},{"id":"954f452d.486a28","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":683.833309173584,"y":440.16671085357666,"z":"1823fdbd.4322b2","wires":[["94a79fec.a4fc6","636f16f7.c04838","267a31a7.235fee"]]},{"id":"f75c0cc1.c0d76","type":"switchNode","name":"switch param[].name == resolution-summary[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>","comments":"","outputs":1,"x":1755.0833358764648,"y":439.41670989990234,"z":"1823fdbd.4322b2","wires":[["fca48735.1564f8"]]},{"id":"fca48735.1564f8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2075.083335876465,"y":439.41670989990234,"z":"1823fdbd.4322b2","wires":[["57f68d23.7bf1d4"]]},{"id":"b76edb5a.1c05a8","type":"set","name":"set param[].value = resolution-summary[].value","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\n","comments":"","x":2500.08345413208,"y":407.66670989990234,"z":"1823fdbd.4322b2","wires":[]},{"id":"267a31a7.235fee","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":929.8333129882812,"y":522.166711807251,"z":"1823fdbd.4322b2","wires":[["bdf7df62.8888c"]]},{"id":"bdf7df62.8888c","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1157.3333129882812,"y":521.666711807251,"z":"1823fdbd.4322b2","wires":[["50cf521c.43565c"]]},{"id":"94a79fec.a4fc6","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":945.8332977294922,"y":362.4167232513428,"z":"1823fdbd.4322b2","wires":[]},{"id":"636f16f7.c04838","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":910.333309173584,"y":440.16671085357666,"z":"1823fdbd.4322b2","wires":[["c66e2a0d.6fd948"]]},{"id":"c66e2a0d.6fd948","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1124.8689613342285,"y":439.9881534576416,"z":"1823fdbd.4322b2","wires":[["3ef76de7.5dfde2"]]},{"id":"50cf521c.43565c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1334.3333129882812,"y":521.666711807251,"z":"1823fdbd.4322b2","wires":[["938b4d93.409c3","5e3df1a4.6ec2c","17be5cec.c2a0e3","f55a1ca5.c81d9","c092e803.425f58","b53942f9.6835c"]]},{"id":"5e3df1a4.6ec2c","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1547.158576965332,"y":846.9484558105469,"z":"1823fdbd.4322b2","wires":[]},{"id":"17fdac5b.a35a14","type":"comment","name":"vdns-index","info":"","comments":"","x":487.5595016479492,"y":399.65477752685547,"z":"1823fdbd.4322b2","wires":[]},{"id":"36736ef5.d25a72","type":"comment","name":"param-index","info":"","comments":"","x":1396.3095245361328,"y":398.65477657318115,"z":"1823fdbd.4322b2","wires":[]},{"id":"b59f84a4.fbb0f8","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2441.309524536133,"y":471.90478134155273,"z":"1823fdbd.4322b2","wires":[]},{"id":"57f68d23.7bf1d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2213.309524536133,"y":438.9047794342041,"z":"1823fdbd.4322b2","wires":[["b76edb5a.1c05a8","b59f84a4.fbb0f8"]]},{"id":"17be5cec.c2a0e3","type":"switchNode","name":"switch dictionary-source","xml":"<switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>\n","comments":"","outputs":1,"x":1587.559497833252,"y":605.9047651290894,"z":"1823fdbd.4322b2","wires":[["4a257f5c.6e8cc"]]},{"id":"4a257f5c.6e8cc","type":"other","name":"sdnc","xml":"<outcome value='sdnc'>\n","comments":"","outputs":1,"x":1800.0595054626465,"y":605.904764175415,"z":"1823fdbd.4322b2","wires":[["c6b4f5b9.5551d8"]]},{"id":"f3cd0176.72782","type":"comment","name":"capability","info":"","comments":"","x":1818.8095092773438,"y":569.6547622680664,"z":"1823fdbd.4322b2","wires":[]},{"id":"c6b4f5b9.5551d8","type":"for","name":"for key-identifiers[]","xml":"<for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\n","comments":"","outputs":1,"x":1991.3094787597656,"y":605.9047546386719,"z":"1823fdbd.4322b2","wires":[["6e3cdabe.e05b74"]]},{"id":"6e3cdabe.e05b74","type":"set","name":"set resource-key[] to key-identifiers[] ","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\n","comments":"","x":2289.0595092773438,"y":606.154764175415,"z":"1823fdbd.4322b2","wires":[]},{"id":"f55a1ca5.c81d9","type":"set","name":"set request-payload","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.payload' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\n\n","comments":"","x":1574.420539855957,"y":733.7936515808105,"z":"1823fdbd.4322b2","wires":[]},{"id":"ba13b3a1.e2577","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2136.8095092773438,"y":379.6547603607178,"z":"1823fdbd.4322b2","wires":[]},{"id":"c092e803.425f58","type":"set","name":"set param[].status and capability-name","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name' \n\tvalue='RA Resolved'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>","comments":"","x":1642.6705474853516,"y":793.7936534881592,"z":"1823fdbd.4322b2","wires":[]},{"id":"f4090c21.3d36a","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1226.3094940185547,"y":488.4047622680664,"z":"1823fdbd.4322b2","wires":[]},{"id":"b53942f9.6835c","type":"set","name":"set resource-resolution-data.resource-key_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\n","comments":"","x":1675.5555267333984,"y":674.4444303512573,"z":"1823fdbd.4322b2","wires":[]},{"id":"269dfcc8.a905a4","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vfmodule-mapping-ra-response\"/>\n\n","comments":"","outputs":1,"x":384.08330154418945,"y":968.3610124588013,"z":"1823fdbd.4322b2","wires":[[]]},{"id":"41663779.ca9db8","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' \n\tvalue='`$highnum`'/>\n","comments":"","x":473.2975425720215,"y":915.2181148529053,"z":"1823fdbd.4322b2","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.json
new file mode 100644
index 00000000..e6945c0f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.json
@@ -0,0 +1 @@
+[{"id":"2e507f62.19bb6","type":"for","name":"for resource-accumulator-resolved-data loop","xml":"<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n","comments":"","outputs":1,"x":588.2539825439453,"y":410.1587429046631,"z":"6aa560e5.85c47","wires":[["5103e61.a16e518"]]},{"id":"93065c5b.0381d","type":"set","name":"set from resource-accumulator-resolved-data","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n\n","comments":"","x":1802.2539825439453,"y":461.1587429046631,"z":"6aa560e5.85c47","wires":[]},{"id":"d85544dd.7444d8","type":"for","name":"for capability-data","xml":"<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n","comments":"","outputs":1,"x":492.9683074951172,"y":735.0158672332764,"z":"6aa560e5.85c47","wires":[["d9aa7add.98f838"]]},{"id":"d9aa7add.98f838","type":"for","name":"for key-mapping","xml":"<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >","comments":"","outputs":1,"x":715.9683074951172,"y":735.0158672332764,"z":"6aa560e5.85c47","wires":[["f40c4e87.7662"]]},{"id":"5c20309b.4e988","type":"for","name":"for vnf-parameters-data.param","xml":"<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n","comments":"","outputs":1,"x":1561.2539825439453,"y":410.1587429046631,"z":"6aa560e5.85c47","wires":[["eddc2b7e.b25dd8"]]},{"id":"5103e61.a16e518","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":867.2539825439453,"y":411.1587429046631,"z":"6aa560e5.85c47","wires":[["4904006a.4a46c","9a71c833.c3ba38","b9f0e559.8a4478"]]},{"id":"eddc2b7e.b25dd8","type":"switchNode","name":"switch input vnf-name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n","comments":"","outputs":1,"x":1819.2539825439453,"y":410.1587429046631,"z":"6aa560e5.85c47","wires":[["6173dec6.c45a8"]]},{"id":"6173dec6.c45a8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1999.2539825439453,"y":410.1587429046631,"z":"6aa560e5.85c47","wires":[["42e3ef61.cd65c"]]},{"id":"42e3ef61.cd65c","type":"set","name":"set for existing param name","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' \n\tvalue='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2209.2539825439453,"y":411.1587429046631,"z":"6aa560e5.85c47","wires":[]},{"id":"b9f0e559.8a4478","type":"switchNode","name":"switch tmp.mso.param.not-found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":1109.2539825439453,"y":463.1587429046631,"z":"6aa560e5.85c47","wires":[["c5edd65c.570798"]]},{"id":"c5edd65c.570798","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1343.2539825439453,"y":462.1587429046631,"z":"6aa560e5.85c47","wires":[["a4895338.9624b"]]},{"id":"4904006a.4a46c","type":"set","name":"set for existing param name","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":1093.2539825439453,"y":352.1587429046631,"z":"6aa560e5.85c47","wires":[]},{"id":"9a71c833.c3ba38","type":"switchNode","name":"switch check length > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":1085.7539825439453,"y":411.1587429046631,"z":"6aa560e5.85c47","wires":[["461e05f4.4d39bc"]]},{"id":"461e05f4.4d39bc","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1332.7539825439453,"y":411.1587429046631,"z":"6aa560e5.85c47","wires":[["5c20309b.4e988"]]},{"id":"c8bb45ac.567628","type":"for","name":"for payload","xml":"<for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >","comments":"","outputs":1,"x":1790.6825561523438,"y":783.730185508728,"z":"6aa560e5.85c47","wires":[["9188cc48.86d4b"]]},{"id":"341ba0da.79e99","type":"set","name":"set resource-key","xml":"<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\t\n","comments":"","x":2189.6825561523438,"y":724.730185508728,"z":"6aa560e5.85c47","wires":[]},{"id":"eeff7929.acf308","type":"set","name":"set output-data ","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />","comments":"","x":1370.111068725586,"y":625.7302198410034,"z":"6aa560e5.85c47","wires":[]},{"id":"f40c4e87.7662","type":"for","name":"for output-key-mapping","xml":"<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >","comments":"","outputs":1,"x":950.9683074951172,"y":735.0158672332764,"z":"6aa560e5.85c47","wires":[["84304501.8a30b8"]]},{"id":"84304501.8a30b8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":1161.9683074951172,"y":735.0158672332764,"z":"6aa560e5.85c47","wires":[["eeff7929.acf308","b624cec6.6ca6d","e9299336.32d1"]]},{"id":"b624cec6.6ca6d","type":"switchNode","name":"switch payload_length","xml":"<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n","comments":"","outputs":1,"x":1397.6825561523438,"y":732.730185508728,"z":"6aa560e5.85c47","wires":[["a6e4d7a5.6d9358","1f7c362b.f32f5a"]]},{"id":"a6e4d7a5.6d9358","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":1612.6825561523438,"y":664.730185508728,"z":"6aa560e5.85c47","wires":[[]]},{"id":"1f7c362b.f32f5a","type":"other","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1621.6825561523438,"y":783.730185508728,"z":"6aa560e5.85c47","wires":[["c8bb45ac.567628"]]},{"id":"9188cc48.86d4b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1967.6825561523438,"y":782.730185508728,"z":"6aa560e5.85c47","wires":[["341ba0da.79e99","6287f81d.480b78","f718b5cf.321da8"]]},{"id":"6287f81d.480b78","type":"set","name":"set length","xml":"<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n","comments":"","x":2178.6825561523438,"y":782.730185508728,"z":"6aa560e5.85c47","wires":[]},{"id":"f718b5cf.321da8","type":"set","name":"increment length","xml":"<set>\n\t<parameter name='num' value='`$num + 1`' />\n","comments":"","x":2191.6825561523438,"y":848.730185508728,"z":"6aa560e5.85c47","wires":[]},{"id":"e9299336.32d1","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1360.8253784179688,"y":859.0159585475922,"z":"6aa560e5.85c47","wires":[]},{"id":"6bb79aed.6b8014","type":"set","name":"increment length","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1720.2539825439453,"y":521.1587429046631,"z":"6aa560e5.85c47","wires":[]},{"id":"a4895338.9624b","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1514.2539825439453,"y":461.1587429046631,"z":"6aa560e5.85c47","wires":[["93065c5b.0381d","6bb79aed.6b8014"]]},{"id":"db7d6742.60d0b8","type":"dgstart","name":"DGSTART","outputs":1,"x":151.42858123779297,"y":68.57148170471191,"z":"6aa560e5.85c47","wires":[["aac05aea.529ab8"]]},{"id":"aac05aea.529ab8","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<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}'>","outputs":1,"x":427.42858123779297,"y":69.57148170471191,"z":"6aa560e5.85c47","wires":[["c788dc3b.52169"]]},{"id":"c788dc3b.52169","type":"method","name":"self-serve-process-vfmodule-template-ra-response","xml":"<method rpc='self-serve-process-vfmodule-template-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":316.92859649658203,"y":123.32148361206055,"z":"6aa560e5.85c47","wires":[["3f7f456.82182ba"]]},{"id":"3f7f456.82182ba","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":247.20236206054688,"y":187.04766273498535,"z":"6aa560e5.85c47","wires":[["a8663f4c.6dc1","2e507f62.19bb6","d85544dd.7444d8","606e195c.551628","56d0bcfa.fdd634"]]},{"id":"a8663f4c.6dc1","type":"switchNode","name":"switch resource-accumulator-resolved-data_length","xml":"<switch test='`$jsonContextPrefix.resource-accumulator-resolved-data_length`'>\n","comments":"","outputs":1,"x":608.0356979370117,"y":260.8929042816162,"z":"6aa560e5.85c47","wires":[["f73172dd.87028"]]},{"id":"f73172dd.87028","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":916.6071090698242,"y":260.3214931488037,"z":"6aa560e5.85c47","wires":[["953e9372.9aa27"]]},{"id":"953e9372.9aa27","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"resource-accumulator-resolved-data_length is null\" />\n","comments":"","x":1087.6071472167969,"y":260.8929023742676,"z":"6aa560e5.85c47","wires":[]},{"id":"56d0bcfa.fdd634","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vfmodule-template-ra-response\"/>\n\n","comments":"","outputs":1,"x":424.89284896850586,"y":1053.3928203582764,"z":"6aa560e5.85c47","wires":[[]]},{"id":"606e195c.551628","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' \n\tvalue='`$highnum`'/>\n","comments":"","x":514.607177734375,"y":966.2499573230743,"z":"6aa560e5.85c47","wires":[]},{"id":"8b5eee54.80644","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":1922.857177734375,"y":365.71429443359375,"z":"6aa560e5.85c47","wires":[]},{"id":"d509dbb8.56c1b8","type":"comment","name":"index=i","info":"","comments":"","x":594.2857055664062,"y":361.4285888671875,"z":"6aa560e5.85c47","wires":[]},{"id":"54ef5d5c.c54284","type":"comment","name":"index=cnt","info":"","comments":"","x":1510.5357055664062,"y":366.4285888671875,"z":"6aa560e5.85c47","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json
new file mode 100644
index 00000000..9bd19cac
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json
@@ -0,0 +1 @@
+[{"id":"9b6d371e.c6a5b8","type":"dgstart","name":"DGSTART","outputs":1,"x":97.10714721679688,"y":35.357144355773926,"z":"cc8da33a.a3512","wires":[["7f9c939d.f0fa3c"]]},{"id":"7f9c939d.f0fa3c","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<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}'>","outputs":1,"x":373.1071472167969,"y":36.357144355773926,"z":"cc8da33a.a3512","wires":[["3727034d.b6c80c"]]},{"id":"3727034d.b6c80c","type":"method","name":"self-self-serve-process-vnf-mapping-ra-response","xml":"<method rpc='self-serve-process-vnf-mapping-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":270.107177734375,"y":101.35714912414551,"z":"cc8da33a.a3512","wires":[["e0df88c8.a19d48"]]},{"id":"e0df88c8.a19d48","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":208.5952033996582,"y":224.36906719207764,"z":"cc8da33a.a3512","wires":[["1a6fb0cb.d8582f","e44bd144.de106","54667cf1.053ed4","7110110c.690ce"]]},{"id":"1a6fb0cb.d8582f","type":"for","name":"for resolution-summary[]","xml":"<for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\n","comments":"","outputs":1,"x":490.5952606201172,"y":515.9405288696289,"z":"cc8da33a.a3512","wires":[["c84e9ab4.fb63b8"]]},{"id":"6216191d.a6c8b8","type":"set","name":" ADD resolution-summary[].name/value to param[]","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>","comments":"","x":1723.0952453613281,"y":598.1905460357666,"z":"cc8da33a.a3512","wires":[]},{"id":"f0431561.d17b88","type":"for","name":"for vnf-parameters-data.param","xml":"<for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n","comments":"","outputs":1,"x":1393.8452682495117,"y":514.940544128418,"z":"cc8da33a.a3512","wires":[["f790a097.1441e"]]},{"id":"c84e9ab4.fb63b8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":718.5952415466309,"y":515.6905450820923,"z":"cc8da33a.a3512","wires":[["1b143473.01604c","3e6e808e.4055b","25045112.d8e58e"]]},{"id":"f790a097.1441e","type":"switchNode","name":"switch param[].name == resolution-summary[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>\n","comments":"","outputs":1,"x":1797.8452682495117,"y":514.940544128418,"z":"cc8da33a.a3512","wires":[["e152f6a8.7c7ea8"]]},{"id":"e152f6a8.7c7ea8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2103.8452682495117,"y":514.940544128418,"z":"cc8da33a.a3512","wires":[["1a4f635d.5cf1ed"]]},{"id":"f2314be8.6e5f98","type":"set","name":"set param[].value = resolution-summary[].value","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\n","comments":"","x":2531.845386505127,"y":483.19054412841797,"z":"cc8da33a.a3512","wires":[]},{"id":"25045112.d8e58e","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":964.5952453613281,"y":597.6905460357666,"z":"cc8da33a.a3512","wires":[["94e253dc.b5579"]]},{"id":"94e253dc.b5579","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1192.0952453613281,"y":597.1905460357666,"z":"cc8da33a.a3512","wires":[["26faed4e.1937b2"]]},{"id":"1b143473.01604c","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":980.5952301025391,"y":437.9405574798584,"z":"cc8da33a.a3512","wires":[]},{"id":"3e6e808e.4055b","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":945.0952415466309,"y":515.6905450820923,"z":"cc8da33a.a3512","wires":[["dcd8c396.2a136"]]},{"id":"dcd8c396.2a136","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1159.6308937072754,"y":515.5119876861572,"z":"cc8da33a.a3512","wires":[["f0431561.d17b88"]]},{"id":"26faed4e.1937b2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1369.0952453613281,"y":597.1905460357666,"z":"cc8da33a.a3512","wires":[["6216191d.a6c8b8","7c581d08.c049e4","be14dceb.d566f","86226715.4e4188","ab22106f.33c1c","2368af4a.13c2e"]]},{"id":"7c581d08.c049e4","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1591.1427917480469,"y":903.9167537689209,"z":"cc8da33a.a3512","wires":[]},{"id":"e44bd144.de106","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vnf-mapping-ra-response\"/>\n\n","comments":"","outputs":1,"x":394.17859649658203,"y":1062.607195854187,"z":"cc8da33a.a3512","wires":[[]]},{"id":"54667cf1.053ed4","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":519.4285736083984,"y":274.2857322692871,"z":"cc8da33a.a3512","wires":[["36a8b4bd.a72a1c"]]},{"id":"36a8b4bd.a72a1c","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":762.2856903076172,"y":273.71431732177734,"z":"cc8da33a.a3512","wires":[["3a0dd12b.637d2e"]]},{"id":"3a0dd12b.637d2e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"resolution-summary is null\" />\n","comments":"","x":935.4285888671875,"y":273.85716247558594,"z":"cc8da33a.a3512","wires":[]},{"id":"45a63cd6.8d9584","type":"comment","name":"vdns-index","info":"","comments":"","x":522.3214340209961,"y":475.1786117553711,"z":"cc8da33a.a3512","wires":[]},{"id":"d89f51f0.383af","type":"comment","name":"param-index","info":"","comments":"","x":1431.0714569091797,"y":474.1786108016968,"z":"cc8da33a.a3512","wires":[]},{"id":"1d850d86.e6c312","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2473.0714569091797,"y":547.4286155700684,"z":"cc8da33a.a3512","wires":[]},{"id":"1a4f635d.5cf1ed","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2242.0714569091797,"y":514.4286136627197,"z":"cc8da33a.a3512","wires":[["f2314be8.6e5f98","1d850d86.e6c312"]]},{"id":"be14dceb.d566f","type":"switchNode","name":"switch dictionary-source","xml":"<switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>\n","comments":"","outputs":1,"x":1629.0714416503906,"y":683.9285984039307,"z":"cc8da33a.a3512","wires":[["3354f65c.fa1afa"]]},{"id":"3354f65c.fa1afa","type":"other","name":"sdnc","xml":"<outcome value='sdnc'>\n","comments":"","outputs":1,"x":1834.8214378356934,"y":681.4285984039307,"z":"cc8da33a.a3512","wires":[["4895fd88.d96874"]]},{"id":"55bbac42.e84034","type":"comment","name":"capability","info":"","comments":"","x":1853.5714416503906,"y":645.178596496582,"z":"cc8da33a.a3512","wires":[]},{"id":"4895fd88.d96874","type":"for","name":"for key-identifiers[]","xml":"<for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\n","comments":"","outputs":1,"x":2026.0714111328125,"y":681.4285888671875,"z":"cc8da33a.a3512","wires":[["7ef33d35.752214"]]},{"id":"7ef33d35.752214","type":"set","name":"set resource-key[] to key-identifiers[] ","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\n","comments":"","x":2323.8214416503906,"y":681.6785984039307,"z":"cc8da33a.a3512","wires":[]},{"id":"86226715.4e4188","type":"set","name":"set request-payload","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\n\n","comments":"","x":1614.4047546386719,"y":794.7619495391846,"z":"cc8da33a.a3512","wires":[]},{"id":"5ec89dda.1924b4","type":"comment","name":"from RA response","info":"","comments":"","x":553.5714111328125,"y":242.6785888671875,"z":"cc8da33a.a3512","wires":[]},{"id":"c0f71bea.1b3e78","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2043.5714416503906,"y":455.1785945892334,"z":"cc8da33a.a3512","wires":[]},{"id":"ab22106f.33c1c","type":"set","name":"set param[].status and capability-name","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' \n\tvalue='RA Resolved'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' \n\tvalue='`$jsonContextPrefix.payload.resolution-summary[$vdns-index].status`'/>","comments":"","x":1685.6547622680664,"y":849.7619514465332,"z":"cc8da33a.a3512","wires":[]},{"id":"7110110c.690ce","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' \n\tvalue='`$highnum`'/>\n","comments":"","x":483.39283752441406,"y":1009.464298248291,"z":"cc8da33a.a3512","wires":[]},{"id":"c8a2bad.7897e48","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1261.0714263916016,"y":563.928596496582,"z":"cc8da33a.a3512","wires":[]},{"id":"2368af4a.13c2e","type":"set","name":"set resource-resolution-data.resource-key_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\n","comments":"","x":1718.5712814331055,"y":742.5396614074707,"z":"cc8da33a.a3512","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.json
new file mode 100644
index 00000000..b8fb0aa1
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.json
@@ -0,0 +1 @@
+[{"id":"d6090c0a.e0753","type":"dgstart","name":"DGSTART","outputs":1,"x":121.25,"y":36.25,"z":"82762174.abe83","wires":[["f60513bf.6174"]]},{"id":"f60513bf.6174","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<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}'>","outputs":1,"x":397.25,"y":37.25,"z":"82762174.abe83","wires":[["4f2dd461.63980c"]]},{"id":"4f2dd461.63980c","type":"method","name":"self-serve-process-vnf-template-ra-response","xml":"<method rpc='self-serve-process-vnf-template-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":286.75001525878906,"y":91.00000190734863,"z":"82762174.abe83","wires":[["68932e17.3bb2a"]]},{"id":"68932e17.3bb2a","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":222.7380599975586,"y":171.86904335021973,"z":"82762174.abe83","wires":[["7eee3cd3.adf7b4","f5ede167.749ad","34309b70.de0e04","f9b3050f.731788","20f44d7b.af9632"]]},{"id":"7eee3cd3.adf7b4","type":"for","name":"for resource-accumulator-resolved-data","xml":"<for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n","comments":"","outputs":1,"x":537.488037109375,"y":385.1547260284424,"z":"82762174.abe83","wires":[["35fae5cb.4f646a"]]},{"id":"25d03886.9ab038","type":"set","name":"set from resource-accumulator-resolved-data","xml":"<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n","comments":"","x":1806.4880447387695,"y":450.583288192749,"z":"82762174.abe83","wires":[]},{"id":"f5ede167.749ad","type":"for","name":"for capability-data","xml":"<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n","comments":"","outputs":1,"x":450.3452835083008,"y":694.2975940704346,"z":"82762174.abe83","wires":[["efbc3e4e.04d3c"]]},{"id":"efbc3e4e.04d3c","type":"for","name":"for key-mapping","xml":"<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >","comments":"","outputs":1,"x":665.3452835083008,"y":694.2975940704346,"z":"82762174.abe83","wires":[["a57b105d.f7006"]]},{"id":"6175b27f.0affac","type":"for","name":"for vnf-parameters-data.param","xml":"<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n","comments":"","outputs":1,"x":1529.488037109375,"y":384.1547260284424,"z":"82762174.abe83","wires":[["93a274f.c066b88"]]},{"id":"35fae5cb.4f646a","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":816.488037109375,"y":385.1547260284424,"z":"82762174.abe83","wires":[["da5f0602.8b3b18","f02e2566.844538","a137b478.1330d8"]]},{"id":"93a274f.c066b88","type":"switchNode","name":"switch param[].name: service-data vs resolved-data","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n","comments":"","outputs":1,"x":1912.488037109375,"y":384.1547260284424,"z":"82762174.abe83","wires":[["40e6f212.e16f6c"]]},{"id":"40e6f212.e16f6c","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2222.488037109375,"y":384.1547260284424,"z":"82762174.abe83","wires":[["dac5b948.a12f38"]]},{"id":"a5493932.c14388","type":"set","name":"set param[].value = resolved-data","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2588.488067626953,"y":353.15473079681396,"z":"82762174.abe83","wires":[]},{"id":"a137b478.1330d8","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":1073.488037109375,"y":451.1547260284424,"z":"82762174.abe83","wires":[["809b62f4.2bf5c"]]},{"id":"809b62f4.2bf5c","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1311.488037109375,"y":451.1547260284424,"z":"82762174.abe83","wires":[["febe6260.562d4"]]},{"id":"da5f0602.8b3b18","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":1091.238052368164,"y":326.15472984313965,"z":"82762174.abe83","wires":[]},{"id":"f02e2566.844538","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":1053.988037109375,"y":385.1547260284424,"z":"82762174.abe83","wires":[["dbaaa27d.ae02d"]]},{"id":"dbaaa27d.ae02d","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1300.988037109375,"y":385.1547260284424,"z":"82762174.abe83","wires":[["6175b27f.0affac"]]},{"id":"e13da3f1.629a5","type":"for","name":"for payload","xml":"<for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >","comments":"","outputs":1,"x":1790.3452911376953,"y":719.8690757751465,"z":"82762174.abe83","wires":[["14559e90.eaf311"]]},{"id":"55ead4e7.384f7c","type":"set","name":"set resource-key","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\n","comments":"","x":2168.34521484375,"y":664.8691024780273,"z":"82762174.abe83","wires":[]},{"id":"4f1cdbf8.b5a114","type":"set","name":"set output-data ","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />","comments":"","x":1351.7737579345703,"y":622.7261741161346,"z":"82762174.abe83","wires":[]},{"id":"a57b105d.f7006","type":"for","name":"for output-key-mapping","xml":"<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >","comments":"","outputs":1,"x":899.3452835083008,"y":694.2975940704346,"z":"82762174.abe83","wires":[["7b366e85.7fe89"]]},{"id":"7b366e85.7fe89","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":1127.3452835083008,"y":694.2975940704346,"z":"82762174.abe83","wires":[["4f1cdbf8.b5a114","aac50216.6c755","f38e7b6a.1ddc28"]]},{"id":"aac50216.6c755","type":"switchNode","name":"switch payload_length = NULL","xml":"<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n","comments":"","outputs":1,"x":1398.7737579345703,"y":693.7261741161346,"z":"82762174.abe83","wires":[["318068dc.0cf5a8","ebfb92ca.67fc3"]]},{"id":"318068dc.0cf5a8","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":1632.7023811340332,"y":662.2262372970581,"z":"82762174.abe83","wires":[[]]},{"id":"ebfb92ca.67fc3","type":"other","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1634.3452911376953,"y":719.8690757751465,"z":"82762174.abe83","wires":[["e13da3f1.629a5"]]},{"id":"7c3030e1.6f6ac","type":"set","name":"set length","xml":"<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n","comments":"","x":2147.3452911376953,"y":718.8690757751465,"z":"82762174.abe83","wires":[]},{"id":"a2fb0d7f.3c324","type":"set","name":"increment length","xml":"<set>\n\t<parameter name='num' value='`$num + 1`' />\n","comments":"","x":2173.916675567627,"y":772.8691272735596,"z":"82762174.abe83","wires":[]},{"id":"f38e7b6a.1ddc28","type":"set","name":"increment length","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n\n","comments":"","x":1355.2023696899414,"y":773.4404754638672,"z":"82762174.abe83","wires":[]},{"id":"febe6260.562d4","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1488.488037109375,"y":450.1547260284424,"z":"82762174.abe83","wires":[["25d03886.9ab038","a94ea0de.f4e19"]]},{"id":"a94ea0de.f4e19","type":"set","name":"increment length","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1708.130844116211,"y":514.2618827819824,"z":"82762174.abe83","wires":[]},{"id":"14559e90.eaf311","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":1965.3452911376953,"y":719.8690757751465,"z":"82762174.abe83","wires":[["55ead4e7.384f7c","7c3030e1.6f6ac","a2fb0d7f.3c324"]]},{"id":"34309b70.de0e04","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vnf-template-ra-response\"/>\n\n","comments":"","outputs":1,"x":406.857120513916,"y":947.1428744792938,"z":"82762174.abe83","wires":[[]]},{"id":"f9b3050f.731788","type":"switchNode","name":"switch resource-accumulator-resolved-data_length","xml":"<switch test='`$jsonContextPrefix.resource-accumulator-resolved-data_length`'>\n","comments":"","outputs":1,"x":577.8571166992188,"y":228.5714225769043,"z":"82762174.abe83","wires":[["c36a3cd4.c9a8"]]},{"id":"c36a3cd4.c9a8","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":886.4285278320312,"y":228.0000114440918,"z":"82762174.abe83","wires":[["f4d1e67.c040818"]]},{"id":"f4d1e67.c040818","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"resource-accumulator-resolved-data_length is null\" />\n","comments":"","x":1057.428565979004,"y":228.57142066955566,"z":"82762174.abe83","wires":[]},{"id":"934348f8.f445e8","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2586.2500610351562,"y":410.2500162124634,"z":"82762174.abe83","wires":[]},{"id":"dac5b948.a12f38","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2362.500030517578,"y":384.00000762939453,"z":"82762174.abe83","wires":[["a5493932.c14388","934348f8.f445e8"]]},{"id":"b48e8695.9725b8","type":"comment","name":"index=cnt","info":"","comments":"","x":1526.25,"y":342.5,"z":"82762174.abe83","wires":[]},{"id":"42c2c025.4ab71","type":"comment","name":"index=i","info":"","comments":"","x":610,"y":337.5,"z":"82762174.abe83","wires":[]},{"id":"20f44d7b.af9632","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length' \n\tvalue='`$highnum`'/>\n","comments":"","x":496.57144927978516,"y":860.0000114440918,"z":"82762174.abe83","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
index efe8ee66..bd19efd7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
@@ -1,1185 +1 @@
-[
-    {
-        "id": "a497f564.a4f098",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 177,
-        "y": 84,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "86c9c962.7342a8"
-            ]
-        ]
-    },
-    {
-        "id": "86c9c962.7342a8",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<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}'>",
-        "outputs": 1,
-        "x": 453,
-        "y": 85,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "d7517e20.9dcd5"
-            ]
-        ]
-    },
-    {
-        "id": "d7517e20.9dcd5",
-        "type": "method",
-        "name": "self-serve-vfmodule-ra-assignment",
-        "xml": "<method rpc='self-serve-vfmodule-ra-assignment' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 804,
-        "y": 85,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "ed8eb912.b3b758"
-            ]
-        ]
-    },
-    {
-        "id": "ed8eb912.b3b758",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 189.5,
-        "y": 167,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "aa1b1c80.cc44a",
-                "ad94d45c.b42738",
-                "be3cc63c.1364a8",
-                "d22ed1cc.a3d2",
-                "3b2d4411.81821c",
-                "e9f32b69.e2f1b8",
-                "d975d3e7.41559",
-                "2129120f.4c214e",
-                "c3a30796.aceda8",
-                "9175398d.c04fa8",
-                "11b406c0.22da09",
-                "bbab380e.910a58",
-                "8e0f6b.25999098",
-                "873ccf3b.1d408",
-                "5989d23c.c4816c",
-                "f15b2532.ed6cd8"
-            ]
-        ]
-    },
-    {
-        "id": "ad94d45c.b42738",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>\n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n",
-        "comments": "",
-        "x": 370,
-        "y": 220,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "64e2173c.958b58",
-        "type": "outcome",
-        "name": "true",
-        "xml": "<outcome value='true'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 650.2142486572266,
-        "y": 565.4642963409424,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "545277b4.e0bb38"
-            ]
-        ]
-    },
-    {
-        "id": "d22ed1cc.a3d2",
-        "type": "for",
-        "name": "for vf-module-topology-operation-input",
-        "xml": "<for silentFailure='true' index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 473.71431732177734,
-        "y": 430.7143135070801,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "4bf3e8f8.745bd8"
-            ]
-        ]
-    },
-    {
-        "id": "70a829fa.30fea8",
-        "type": "set",
-        "name": "set tmp.sdnc-model-name",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n",
-        "comments": "",
-        "x": 1220.428565979004,
-        "y": 363.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "3153b11f.bf66de",
-        "type": "outcome",
-        "name": "sdnc_model_name",
-        "xml": "<outcome value='sdnc_model_name'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 966.4285659790039,
-        "y": 363.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "70a829fa.30fea8"
-            ]
-        ]
-    },
-    {
-        "id": "4bf3e8f8.745bd8",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 728.4285659790039,
-        "y": 430.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "3153b11f.bf66de",
-                "2f8525ae.fd272a",
-                "49db862e.217b58",
-                "ba2667e.2988e98"
-            ]
-        ]
-    },
-    {
-        "id": "2f8525ae.fd272a",
-        "type": "outcome",
-        "name": "sdnc_model_version",
-        "xml": "<outcome value='sdnc_model_version'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 969.4285659790039,
-        "y": 409.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "1585d1d8.a9e64e"
-            ]
-        ]
-    },
-    {
-        "id": "49db862e.217b58",
-        "type": "outcome",
-        "name": "vf_module_label",
-        "xml": "<outcome value='vf_module_label'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 954.4285659790039,
-        "y": 458.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "4fdf7f0e.99111"
-            ]
-        ]
-    },
-    {
-        "id": "1585d1d8.a9e64e",
-        "type": "set",
-        "name": "set tmp.sdnc-model-version",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n",
-        "comments": "",
-        "x": 1224.428565979004,
-        "y": 409.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "4fdf7f0e.99111",
-        "type": "set",
-        "name": "set tmp.vf-module-label",
-        "xml": "<set>\n<parameter name='tmp.vf-module-label' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n",
-        "comments": "",
-        "x": 1206.428565979004,
-        "y": 458.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "99a874b2.f5f858",
-        "type": "set",
-        "name": "set name-value other JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name + '&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n",
-        "comments": "",
-        "x": 1224.428565979004,
-        "y": 509.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "ba2667e.2988e98",
-        "type": "outcome",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 926.4285659790039,
-        "y": 509.1428813934326,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "99a874b2.f5f858"
-            ]
-        ]
-    },
-    {
-        "id": "3b2d4411.81821c",
-        "type": "set",
-        "name": "set configAssignment JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`\"/>",
-        "comments": "",
-        "x": 450,
-        "y": 660,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "e9f32b69.e2f1b8",
-        "type": "execute",
-        "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 459.33331298828125,
-        "y": 900,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "110f9145.d77fff",
-                "356e5968.733e76"
-            ]
-        ]
-    },
-    {
-        "id": "110f9145.d77fff",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 683.3333129882812,
-        "y": 866,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "48054045.e69da"
-            ]
-        ]
-    },
-    {
-        "id": "48054045.e69da",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from ConfigAssignmentNode\" />\n",
-        "comments": "",
-        "x": 881.3333129882812,
-        "y": 866,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "2129120f.4c214e",
-        "type": "for",
-        "name": "for resource-accumulator-resolved-data loop",
-        "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 492.00001525878906,
-        "y": 1168.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "cb710ae6.5a4038"
-            ]
-        ]
-    },
-    {
-        "id": "9c282888.202138",
-        "type": "set",
-        "name": "set from resource-accumulator-resolved-data",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n\n",
-        "comments": "",
-        "x": 1706.000015258789,
-        "y": 1219.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "c3a30796.aceda8",
-        "type": "for",
-        "name": "for capability-data",
-        "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 411.00001525878906,
-        "y": 1431.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "74b1206d.0fed1"
-            ]
-        ]
-    },
-    {
-        "id": "74b1206d.0fed1",
-        "type": "for",
-        "name": "for key-mapping",
-        "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 634.0000152587891,
-        "y": 1431.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "acaea466.cd4ab8"
-            ]
-        ]
-    },
-    {
-        "id": "d975d3e7.41559",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 436.00001525878906,
-        "y": 1089.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "aa1b1c80.cc44a",
-        "type": "execute",
-        "name": "execute generateUUID",
-        "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ",
-        "comments": "",
-        "outputs": 1,
-        "x": 419,
-        "y": 167,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "322955c2.67bfda"
-            ]
-        ]
-    },
-    {
-        "id": "322955c2.67bfda",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 624,
-        "y": 167,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "eedef31.1f0501"
-            ]
-        ]
-    },
-    {
-        "id": "eedef31.1f0501",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n",
-        "comments": "",
-        "x": 788,
-        "y": 166,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "ee67402d.5d28e",
-        "type": "for",
-        "name": "for vnf-parameters-data.param",
-        "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1465.000015258789,
-        "y": 1168.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "7f19057e.59cacc"
-            ]
-        ]
-    },
-    {
-        "id": "cb710ae6.5a4038",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 771.0000152587891,
-        "y": 1169.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "e2f0cba4.654da8",
-                "bd5d211c.f590f",
-                "69e4eac9.bfa664"
-            ]
-        ]
-    },
-    {
-        "id": "be3cc63c.1364a8",
-        "type": "switchNode",
-        "name": "switch vf-parameters-data.param_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 491,
-        "y": 268,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "dcf68c0.5595078",
-                "212315d0.254f0a"
-            ]
-        ]
-    },
-    {
-        "id": "dcf68c0.5595078",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 754.1428833007812,
-        "y": 235.85715293884277,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "2fd156a6.7f84aa"
-            ]
-        ]
-    },
-    {
-        "id": "212315d0.254f0a",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 753.1428833007812,
-        "y": 299.8571529388428,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "704076e8.db1178"
-            ]
-        ]
-    },
-    {
-        "id": "2fd156a6.7f84aa",
-        "type": "set",
-        "name": "set pre service param len as 0",
-        "xml": "<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n",
-        "comments": "",
-        "x": 967.1428833007812,
-        "y": 235.85715293884277,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "704076e8.db1178",
-        "type": "set",
-        "name": "set pre service param len",
-        "xml": "<set>\n   <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />",
-        "comments": "",
-        "x": 952.1428833007812,
-        "y": 299.8571529388428,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "7f19057e.59cacc",
-        "type": "switchNode",
-        "name": "switch input vnf-name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1723.000015258789,
-        "y": 1168.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "249e69e0.c58706"
-            ]
-        ]
-    },
-    {
-        "id": "249e69e0.c58706",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1903.000015258789,
-        "y": 1168.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "ed76b6f6.2b9568"
-            ]
-        ]
-    },
-    {
-        "id": "ed76b6f6.2b9568",
-        "type": "set",
-        "name": "set for existing param name",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n",
-        "comments": "",
-        "x": 2113.000015258789,
-        "y": 1169.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "69e4eac9.bfa664",
-        "type": "switchNode",
-        "name": "switch tmp.mso.param.not-found",
-        "xml": "<switch test='`$tmp.mso.param.found`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1013.0000152587891,
-        "y": 1221.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "9a1a87b5.132028"
-            ]
-        ]
-    },
-    {
-        "id": "9a1a87b5.132028",
-        "type": "not-found",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1247.000015258789,
-        "y": 1220.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "60cb391a.7088d8"
-            ]
-        ]
-    },
-    {
-        "id": "e2f0cba4.654da8",
-        "type": "set",
-        "name": "set for existing param name",
-        "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n",
-        "comments": "",
-        "x": 997.0000152587891,
-        "y": 1110.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "bd5d211c.f590f",
-        "type": "switchNode",
-        "name": "switch check length > 0",
-        "xml": "<switch test='`$prehighnum &gt; 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 989.5000152587891,
-        "y": 1169.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "a9041b72.5fd4e8"
-            ]
-        ]
-    },
-    {
-        "id": "a9041b72.5fd4e8",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1236.500015258789,
-        "y": 1169.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "ee67402d.5d28e"
-            ]
-        ]
-    },
-    {
-        "id": "a8fb4875.424878",
-        "type": "for",
-        "name": "for payload",
-        "xml": "<for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1683.000015258789,
-        "y": 1483.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "d1581b7a.307818"
-            ]
-        ]
-    },
-    {
-        "id": "c34d628a.5ba25",
-        "type": "set",
-        "name": "set resource-key",
-        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\t\n",
-        "comments": "",
-        "x": 2082.000015258789,
-        "y": 1424.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "8aa1345a.8ddd28",
-        "type": "set",
-        "name": "set output-data ",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />",
-        "comments": "",
-        "x": 1261.000015258789,
-        "y": 1385.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "acaea466.cd4ab8",
-        "type": "for",
-        "name": "for output-key-mapping",
-        "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 869.0000152587891,
-        "y": 1432.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "44eeef6b.763aa"
-            ]
-        ]
-    },
-    {
-        "id": "44eeef6b.763aa",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1064.000015258789,
-        "y": 1431.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "8aa1345a.8ddd28",
-                "859dcf36.75878",
-                "7a25862.9293b78",
-                "cf8679e9.4fafd8"
-            ]
-        ]
-    },
-    {
-        "id": "7a25862.9293b78",
-        "type": "set",
-        "name": "set length",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' value='`$highnum + 1`'/>\n\n",
-        "comments": "",
-        "x": 1260.000015258789,
-        "y": 1483.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "356e5968.733e76",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 688.3333129882812,
-        "y": 928,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "48054045.e69da"
-            ]
-        ]
-    },
-    {
-        "id": "859dcf36.75878",
-        "type": "switchNode",
-        "name": "switch payload_length",
-        "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1290.000015258789,
-        "y": 1432.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "4c86e71b.d68c88",
-                "24678540.a0541a"
-            ]
-        ]
-    },
-    {
-        "id": "4c86e71b.d68c88",
-        "type": "outcome",
-        "name": "true",
-        "xml": "<outcome value='true'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1505.000015258789,
-        "y": 1364.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "24678540.a0541a",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1514.000015258789,
-        "y": 1483.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "a8fb4875.424878"
-            ]
-        ]
-    },
-    {
-        "id": "9175398d.c04fa8",
-        "type": "switchNode",
-        "name": "switch: model info == NULL",
-        "xml": "<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.vf-module-label == ''`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 438.78570556640625,
-        "y": 565.6071863174438,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "64e2173c.958b58"
-            ]
-        ]
-    },
-    {
-        "id": "d294acc7.bd931",
-        "type": "get-resource",
-        "name": "get VF_MODEL.sdnc_model_name",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1116.9285354614258,
-        "y": 566.464297413826,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "10c023aa.5d4fbc",
-                "dedcf4a6.d6ca18",
-                "2f6f6c84.413364"
-            ]
-        ]
-    },
-    {
-        "id": "10c023aa.5d4fbc",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1360.1427536010742,
-        "y": 566.8451566696167,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "2b521b7.20a39e4"
-            ]
-        ]
-    },
-    {
-        "id": "2b521b7.20a39e4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",
-        "comments": "",
-        "x": 1541.142734527588,
-        "y": 566.9880638122559,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "64e226e0.1a2c48",
-        "type": "get-resource",
-        "name": "get VF_MODULE_MODEL.vf-module-label",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT vf_module_label from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid \n  \tAND vf_module_label is not null'\n  pfx='db1.vf-module-model'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1138.380874633789,
-        "y": 695.3095798492432,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "8ea00362.3b8f7",
-                "cf82827d.c0abe",
-                "78e0a6e.6498258"
-            ]
-        ]
-    },
-    {
-        "id": "8ea00362.3b8f7",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1417.1664581298828,
-        "y": 695.6904038190842,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "9c3a2915.d4bae8"
-            ]
-        ]
-    },
-    {
-        "id": "9c3a2915.d4bae8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
-        "comments": "",
-        "x": 1592.166389465332,
-        "y": 695.8333042860031,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "cf82827d.c0abe",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1427.3808822631836,
-        "y": 775.095287322998,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "726ff5db.17542c"
-            ]
-        ]
-    },
-    {
-        "id": "545277b4.e0bb38",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 825.7380294799805,
-        "y": 565.8452922105789,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "d294acc7.bd931",
-                "64e226e0.1a2c48"
-            ]
-        ]
-    },
-    {
-        "id": "7bffb405.6623ac",
-        "type": "set",
-        "name": "set sdnc-model-name, sdnc-model-version",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n\n\n\n",
-        "comments": "",
-        "x": 1639.42866897583,
-        "y": 646.964334487915,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "dedcf4a6.d6ca18",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1368.0001411437988,
-        "y": 647.2500095367432,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "7bffb405.6623ac"
-            ]
-        ]
-    },
-    {
-        "id": "726ff5db.17542c",
-        "type": "set",
-        "name": "set vf-module-label",
-        "xml": "<set>\n<parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />\n\n\n\n",
-        "comments": "",
-        "x": 1631.821434020996,
-        "y": 776.6786003112793,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "d1581b7a.307818",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1860.000015258789,
-        "y": 1482.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "c34d628a.5ba25",
-                "c56e214a.a3f38",
-                "57886653.e3ab98"
-            ]
-        ]
-    },
-    {
-        "id": "c56e214a.a3f38",
-        "type": "set",
-        "name": "set length",
-        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n",
-        "comments": "",
-        "x": 2071.000015258789,
-        "y": 1482.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "2f6f6c84.413364",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1370.7500190734863,
-        "y": 606.5000076293945,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "6ec44df1.26ebd4"
-            ]
-        ]
-    },
-    {
-        "id": "6ec44df1.26ebd4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No VF_MODEL found with customization_uuid = ' + $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />",
-        "comments": "",
-        "x": 1542.0000228881836,
-        "y": 605.2500085830688,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "78e0a6e.6498258",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1428.25,
-        "y": 736.5,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "b55099bd.544558"
-            ]
-        ]
-    },
-    {
-        "id": "b55099bd.544558",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'vf_module_label not found in VF_MODULE_MODEL WHERE customization_uuid = ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />",
-        "comments": "",
-        "x": 1599.5000038146973,
-        "y": 735.2500009536743,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "57886653.e3ab98",
-        "type": "set",
-        "name": "increment length",
-        "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n",
-        "comments": "",
-        "x": 2084.000015258789,
-        "y": 1548.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "cf8679e9.4fafd8",
-        "type": "set",
-        "name": "increment length",
-        "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
-        "comments": "",
-        "x": 1277.000015258789,
-        "y": 1554.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "a939f9eb.ae83b8",
-        "type": "set",
-        "name": "increment length",
-        "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
-        "comments": "",
-        "x": 1624.000015258789,
-        "y": 1279.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "60cb391a.7088d8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1418.000015258789,
-        "y": 1219.3333473205566,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            [
-                "9c282888.202138",
-                "a939f9eb.ae83b8"
-            ]
-        ]
-    },
-    {
-        "id": "11b406c0.22da09",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 370,
-        "y": 820,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bbab380e.910a58",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 380.3333282470703,
-        "y": 984.000018119812,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "873ccf3b.1d408",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 393.25,
-        "y": 1706.5000133514404,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8e0f6b.25999098",
-        "type": "set",
-        "name": "set pathname",
-        "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vfmodule-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`\" />\n",
-        "comments": "",
-        "x": 399.5,
-        "y": 1654.0000114440918,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    },
-    {
-        "id": "5989d23c.c4816c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: vfmodule-ra-assignment\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 378.00000381469727,
-        "y": 1605.2500190734863,
-        "z": "2e17456e.1fa78a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f15b2532.ed6cd8",
-        "type": "set",
-        "name": "set updateJsonPayload",
-        "xml": "<set>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n    <parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n    <parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n    <parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.vf-module-label`' />\n    <parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />",
-        "comments": "",
-        "x": 421,
-        "y": 740,
-        "z": "2e17456e.1fa78a",
-        "wires": []
-    }
-]
+[{"id":"4dffc60d.5bd808","type":"dgstart","name":"DGSTART","outputs":1,"x":141.42858123779297,"y":65.71432209014893,"z":"f6902f40.5e19","wires":[["91c8160.4dcc1e8"]]},{"id":"91c8160.4dcc1e8","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<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}'>","outputs":1,"x":417.42858123779297,"y":66.71432209014893,"z":"f6902f40.5e19","wires":[["14bf1d36.3d8cf3"]]},{"id":"14bf1d36.3d8cf3","type":"method","name":"self-serve-vfmodule-ra-assignment","xml":"<method rpc='self-serve-vfmodule-ra-assignment' mode='sync'>\n","comments":"","outputs":1,"x":768.428581237793,"y":66.71432209014893,"z":"f6902f40.5e19","wires":[["39968a5c.ccc976"]]},{"id":"39968a5c.ccc976","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":153.92858123779297,"y":148.71432209014893,"z":"f6902f40.5e19","wires":[["7254b5cc.b6e2cc","1459f827.386618","82877888.a7fc38","9a591dc8.409ea","91c376dc.43b9f8","6fdb941c.28348c","e0d9e606.a1f3b8","a7fb3dc8.82b7b","2433b69e.9dac5a","421c7868.35b668","5a748f0d.33a49","1ffabdff.2624f2","247751ca.46435e","ca7fe006.4ef63","d2ce5f51.17499"]]},{"id":"1459f827.386618","type":"set","name":"set","xml":"<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>\n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n","comments":"","x":348.7142639160156,"y":214.57146644592285,"z":"f6902f40.5e19","wires":[]},{"id":"d601ca0a.4083b8","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":643.2142333984375,"y":761.4642413854599,"z":"f6902f40.5e19","wires":[["427cc999.3bd468"]]},{"id":"9a591dc8.409ea","type":"for","name":"for vf-module-topology-operation-input","xml":"<for silentFailure='true' index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >","comments":"","outputs":1,"x":466.7143859863281,"y":458.14292430877686,"z":"f6902f40.5e19","wires":[["dfdf3542.d43a68"]]},{"id":"cf936a79.960488","type":"set","name":"set tmp.sdnc-model-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n","comments":"","x":1213.4286346435547,"y":390.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"163793cb.859cfc","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":959.4286346435547,"y":390.5714921951294,"z":"f6902f40.5e19","wires":[["cf936a79.960488"]]},{"id":"dfdf3542.d43a68","type":"switchNode","name":"switch","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n\n","comments":"","outputs":1,"x":721.4286346435547,"y":457.5714921951294,"z":"f6902f40.5e19","wires":[["163793cb.859cfc","b400f633.2e5378","da04e9fd.4674f8","177a5191.74c57e"]]},{"id":"b400f633.2e5378","type":"outcome","name":"sdnc_model_version","xml":"<outcome value='sdnc_model_version'>\n","comments":"","outputs":1,"x":962.4286346435547,"y":436.5714921951294,"z":"f6902f40.5e19","wires":[["7ebb83ae.d475ac"]]},{"id":"da04e9fd.4674f8","type":"outcome","name":"vf_module_label","xml":"<outcome value='vf_module_label'>\n","comments":"","outputs":1,"x":947.4286346435547,"y":485.5714921951294,"z":"f6902f40.5e19","wires":[["12118326.66feed"]]},{"id":"7ebb83ae.d475ac","type":"set","name":"set tmp.sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-version' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n","comments":"","x":1217.4286346435547,"y":436.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"12118326.66feed","type":"set","name":"set tmp.vf-module-label","xml":"<set>\n<parameter name='tmp.vf-module-label' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n","comments":"","x":1199.4286346435547,"y":485.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"efbc62cb.48e09","type":"set","name":"set name-value other JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name + '&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n","comments":"","x":1217.4286346435547,"y":536.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"177a5191.74c57e","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":919.4286346435547,"y":536.5714921951294,"z":"f6902f40.5e19","wires":[["efbc62cb.48e09"]]},{"id":"91c376dc.43b9f8","type":"set","name":"set configAssignment JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`\"/>","comments":"","x":443.00003814697266,"y":973.7143392562866,"z":"f6902f40.5e19","wires":[]},{"id":"6fdb941c.28348c","type":"execute","name":"execute BlueprintProcessingClient","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />","comments":"","outputs":1,"x":445.1904296875,"y":1143.7142820358276,"z":"f6902f40.5e19","wires":[["594be503.f419ac","3419422c.24830e"]]},{"id":"594be503.f419ac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":687.7618255615234,"y":1112.571475982666,"z":"f6902f40.5e19","wires":[["8edb7744.b6b238"]]},{"id":"8edb7744.b6b238","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from ConfigAssignmentNode\" />\n","comments":"","x":861.4760818481445,"y":1141.1429405212402,"z":"f6902f40.5e19","wires":[]},{"id":"e0d9e606.a1f3b8","type":"execute","name":"execute jsonStringToCtx","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n","comments":"","outputs":1,"x":406.1428985595703,"y":1297.3333320617676,"z":"f6902f40.5e19","wires":[[]]},{"id":"7254b5cc.b6e2cc","type":"execute","name":"execute generateUUID","xml":" <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ","comments":"","outputs":1,"x":403.4285659790039,"y":149.14289474487305,"z":"f6902f40.5e19","wires":[["e24c189a.46feb8"]]},{"id":"e24c189a.46feb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":608.4285659790039,"y":149.14289474487305,"z":"f6902f40.5e19","wires":[["39ad9c69.bcd344"]]},{"id":"39ad9c69.bcd344","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n","comments":"","x":772.4285659790039,"y":149.14289474487305,"z":"f6902f40.5e19","wires":[]},{"id":"82877888.a7fc38","type":"switchNode","name":"switch vf-parameters-data.param_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n","comments":"","outputs":1,"x":472.5714340209961,"y":294.00005435943604,"z":"f6902f40.5e19","wires":[["98f386c5.e8bba8","c4516b65.17aaa8"]]},{"id":"98f386c5.e8bba8","type":"outcome","name":"null","xml":"<outcome value=''>","comments":"","outputs":1,"x":735.7143173217773,"y":261.8572072982788,"z":"f6902f40.5e19","wires":[["e77b3d83.fde56"]]},{"id":"c4516b65.17aaa8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":734.7143173217773,"y":325.8572072982788,"z":"f6902f40.5e19","wires":[["3a943829.dea268"]]},{"id":"e77b3d83.fde56","type":"set","name":"set pre service param len as 0","xml":"<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n","comments":"","x":948.7143173217773,"y":261.8572072982788,"z":"f6902f40.5e19","wires":[]},{"id":"3a943829.dea268","type":"set","name":"set pre service param len","xml":"<set>\n   <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />","comments":"","x":933.7143173217773,"y":325.8572072982788,"z":"f6902f40.5e19","wires":[]},{"id":"3419422c.24830e","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":692.7618255615234,"y":1174.571475982666,"z":"f6902f40.5e19","wires":[["8edb7744.b6b238"]]},{"id":"a7fb3dc8.82b7b","type":"switchNode","name":"switch: model info == NULL","xml":"<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.vf-module-label == ''`\">\n","comments":"","outputs":1,"x":431.7856903076172,"y":761.6071313619614,"z":"f6902f40.5e19","wires":[["d601ca0a.4083b8"]]},{"id":"5ac8e4a2.4d4cdc","type":"get-resource","name":"get VF_MODEL.sdnc_model_name","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n\n","comments":"","outputs":1,"x":1115.6427459716797,"y":673.8927841186523,"z":"f6902f40.5e19","wires":[["ab0217f0.3c09f8","d436a8eb.310f58","54a1f6ba.ddb6e8"]]},{"id":"ab0217f0.3c09f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1357.999885559082,"y":623.416501045227,"z":"f6902f40.5e19","wires":[["8de303f.6eea6"]]},{"id":"8de303f.6eea6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n","comments":"","x":1538.9998664855957,"y":623.5594081878662,"z":"f6902f40.5e19","wires":[]},{"id":"3aadcdf.ea01932","type":"get-resource","name":"get VF_MODULE_MODEL.vf-module-label","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT vf_module_label from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid \n  \tAND vf_module_label is not null'\n  pfx='db1.vf-module-model'>\n\n","comments":"","outputs":1,"x":1137.0950012207031,"y":847.0239028334618,"z":"f6902f40.5e19","wires":[["2f50f1a3.c9e7be","226785b2.b6bb5a","bc50ef9a.ee4a9"]]},{"id":"2f50f1a3.c9e7be","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1418.7377166748047,"y":794.1189783215523,"z":"f6902f40.5e19","wires":[["999b5358.3c004"]]},{"id":"999b5358.3c004","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1593.737648010254,"y":794.2618787884712,"z":"f6902f40.5e19","wires":[]},{"id":"226785b2.b6bb5a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1428.9521751403809,"y":896.3810014128685,"z":"f6902f40.5e19","wires":[["596dce00.574df4"]]},{"id":"427cc999.3bd468","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":818.7380142211914,"y":761.8452372550964,"z":"f6902f40.5e19","wires":[["5ac8e4a2.4d4cdc","3aadcdf.ea01932"]]},{"id":"79398b4d.f2cf44","type":"set","name":"set sdnc-model-name, sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n\n\n\n","comments":"","x":1639.571548461914,"y":721.5356760025024,"z":"f6902f40.5e19","wires":[]},{"id":"d436a8eb.310f58","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.1430206298828,"y":721.8213510513306,"z":"f6902f40.5e19","wires":[["79398b4d.f2cf44"]]},{"id":"596dce00.574df4","type":"set","name":"set vf-module-label","xml":"<set>\n<parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />\n\n\n\n","comments":"","x":1622.3927268981934,"y":895.9643144011497,"z":"f6902f40.5e19","wires":[]},{"id":"54a1f6ba.ddb6e8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1370.8929252624512,"y":673.928524017334,"z":"f6902f40.5e19","wires":[["de68ea72.16eda8"]]},{"id":"de68ea72.16eda8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No VF_MODEL found with customization_uuid = ' + $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />","comments":"","x":1542.1429290771484,"y":673.6785249710083,"z":"f6902f40.5e19","wires":[]},{"id":"bc50ef9a.ee4a9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1429.8212661743164,"y":845.928583085537,"z":"f6902f40.5e19","wires":[["6713d4f5.791f4c"]]},{"id":"6713d4f5.791f4c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'vf_module_label not found in VF_MODULE_MODEL WHERE customization_uuid = ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />","comments":"","x":1601.0712699890137,"y":845.6785840392113,"z":"f6902f40.5e19","wires":[]},{"id":"2433b69e.9dac5a","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":351.5714530944824,"y":1077.999945640564,"z":"f6902f40.5e19","wires":[[]]},{"id":"421c7868.35b668","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":347.6190185546875,"y":1234.8571891784668,"z":"f6902f40.5e19","wires":[[]]},{"id":"1ffabdff.2624f2","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n","comments":"","outputs":1,"x":364.8214416503906,"y":1608.2144298553467,"z":"f6902f40.5e19","wires":[[]]},{"id":"5a748f0d.33a49","type":"set","name":"set pathname","xml":"<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vfmodule-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`\" />\n","comments":"","x":366.78575897216797,"y":1541.4286289215088,"z":"f6902f40.5e19","wires":[]},{"id":"247751ca.46435e","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: vfmodule-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":342.42859649658203,"y":1474.1070833206177,"z":"f6902f40.5e19","wires":[[]]},{"id":"ca7fe006.4ef63","type":"set","name":"set updateJsonPayload","xml":"<set>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n    <parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n    <parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n    <parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.vf-module-label`' />\n    <parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />","comments":"","x":409.7143096923828,"y":1029.4286937713623,"z":"f6902f40.5e19","wires":[]},{"id":"d2ce5f51.17499","type":"switchNode","name":"switch: jsonContextPrefix.resource-accumulator-resolved-data_length","xml":"<switch test=\"`$jsonContextPrefix.resource-accumulator-resolved-data_length`\">\n","comments":"","outputs":1,"x":564.2857055664062,"y":1372.8572034835815,"z":"f6902f40.5e19","wires":[["e5c38409.014558","6a1d4cbd.e5e004"]]},{"id":"e5c38409.014558","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":932.0634460449219,"y":1348.4127197265625,"z":"f6902f40.5e19","wires":[["1798f3ad.219efc"]]},{"id":"4a6d4db3.b62444","type":"call","name":"Call self-serve-process-vfmodule-template-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1241.063461303711,"y":1402.3015422821045,"z":"f6902f40.5e19","wires":[[]]},{"id":"1798f3ad.219efc","type":"call","name":"Call self-serve-process-vfmodule-mapping-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1241.3968353271484,"y":1348.4127445220947,"z":"f6902f40.5e19","wires":[[]]},{"id":"6a1d4cbd.e5e004","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":931.0634307861328,"y":1401.7461185455322,"z":"f6902f40.5e19","wires":[["4a6d4db3.b62444"]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
index 61c880f9..abca12da 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
@@ -1,1086 +1 @@
-[
-    {
-        "id": "1e918461.063a3c",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 125,
-        "y": 42,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "7b65fd49.93ba14"
-            ]
-        ]
-    },
-    {
-        "id": "7b65fd49.93ba14",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<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}'>",
-        "outputs": 1,
-        "x": 401,
-        "y": 43,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "96f203b4.cb4d1"
-            ]
-        ]
-    },
-    {
-        "id": "96f203b4.cb4d1",
-        "type": "method",
-        "name": "self-serve-vnf-ra-assignment",
-        "xml": "<method rpc='self-serve-vnf-ra-assignment' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 718,
-        "y": 43,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "38f3f9c9.28a466"
-            ]
-        ]
-    },
-    {
-        "id": "38f3f9c9.28a466",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 214.16664123535156,
-        "y": 123.33333396911621,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "5a42798d.9a03d8",
-                "94e52d4.07895d",
-                "f709c437.029758",
-                "ef8d7a.8b1ad288",
-                "bdb13e3c.e9de2",
-                "dd0c4879.786768",
-                "654c303d.bc966",
-                "41ae2337.afe27c",
-                "8e50b155.95aaa",
-                "4b3da748.094068",
-                "72e48172.d53ce",
-                "4471abbd.a27dc4",
-                "40bf0919.577208",
-                "fa837cb4.36bad",
-                "c9addd0a.302f8",
-                "d351ac36.10e8b"
-            ]
-        ]
-    },
-    {
-        "id": "94e52d4.07895d",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>\n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n",
-        "comments": "",
-        "x": 399.9166603088379,
-        "y": 168.08333015441895,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "1f52d973.dc6427",
-        "type": "get-resource",
-        "name": "get-resource VF_MODEL",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n  \n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 938.8094635009766,
-        "y": 559.6189861297607,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "ef8bd7bf.770928",
-                "785d91f7.04973",
-                "7c972f3e.f0f83"
-            ]
-        ]
-    },
-    {
-        "id": "ef8bd7bf.770928",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1183.8095626831055,
-        "y": 508.904709815979,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "a279ec52.aab4c"
-            ]
-        ]
-    },
-    {
-        "id": "a279ec52.aab4c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
-        "comments": "",
-        "x": 1356.8095626831055,
-        "y": 507.904709815979,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "a6be3be4.1bdc08",
-        "type": "set",
-        "name": "set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n<parameter name='tmp.sdnc-artifact-name' value='`$db1.vf-model.sdnc-artifact-name`' />\n\n\n\n\n",
-        "comments": "",
-        "x": 1559.2380638122559,
-        "y": 609.047513961792,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "46a2ef10.633e8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
-        "comments": "",
-        "x": 1358.8095626831055,
-        "y": 556.904709815979,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "bdb13e3c.e9de2",
-        "type": "switchNode",
-        "name": "switch: model info == NULL",
-        "xml": "<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.sdnc-artifact-name == ''`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 459.80946350097656,
-        "y": 560.6189861297607,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "25045ee0.e3d5c2"
-            ]
-        ]
-    },
-    {
-        "id": "785d91f7.04973",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1189.8095626831055,
-        "y": 557.904709815979,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "46a2ef10.633e8"
-            ]
-        ]
-    },
-    {
-        "id": "25045ee0.e3d5c2",
-        "type": "outcome",
-        "name": "true",
-        "xml": "<outcome value='true'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 708.8094635009766,
-        "y": 560.6189861297607,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "1f52d973.dc6427"
-            ]
-        ]
-    },
-    {
-        "id": "ef8d7a.8b1ad288",
-        "type": "for",
-        "name": "for vnf-topology-operation-input",
-        "xml": "<for silentFailure='true' index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 475.66664123535156,
-        "y": 360.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "51f6fdb.4dce504"
-            ]
-        ]
-    },
-    {
-        "id": "51f6fdb.4dce504",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 697.6666412353516,
-        "y": 359.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "58dbc6ed.e4fb78"
-            ]
-        ]
-    },
-    {
-        "id": "3eef3f7d.acf9e",
-        "type": "set",
-        "name": "set tmp.sdnc-model-name",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n",
-        "comments": "",
-        "x": 1348.6666412353516,
-        "y": 292.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "28936220.7676ce",
-        "type": "outcome",
-        "name": "sdnc_model_name",
-        "xml": "<outcome value='sdnc_model_name'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1094.6666412353516,
-        "y": 292.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "3eef3f7d.acf9e"
-            ]
-        ]
-    },
-    {
-        "id": "58dbc6ed.e4fb78",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 856.6666412353516,
-        "y": 359.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "28936220.7676ce",
-                "41a51be4.e2de84",
-                "97a885a0.8b08e8",
-                "95df12c3.3ce8e"
-            ]
-        ]
-    },
-    {
-        "id": "41a51be4.e2de84",
-        "type": "outcome",
-        "name": "sdnc_model_version",
-        "xml": "<outcome value='sdnc_model_version'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1097.6666412353516,
-        "y": 338.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "50619bed.59bcf4"
-            ]
-        ]
-    },
-    {
-        "id": "97a885a0.8b08e8",
-        "type": "outcome",
-        "name": "sdnc_artifact_name",
-        "xml": "<outcome value='sdnc_artifact_name'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1096.6666412353516,
-        "y": 387.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "82133366.c0bff"
-            ]
-        ]
-    },
-    {
-        "id": "50619bed.59bcf4",
-        "type": "set",
-        "name": "set tmp.sdnc-model-version",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n",
-        "comments": "",
-        "x": 1352.6666412353516,
-        "y": 338.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "82133366.c0bff",
-        "type": "set",
-        "name": "set tmp.sdnc-artifact-name",
-        "xml": "<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n",
-        "comments": "",
-        "x": 1348.6666412353516,
-        "y": 387.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "77c6656f.94e17c",
-        "type": "set",
-        "name": "set name-value other JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + '&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n",
-        "comments": "",
-        "x": 1364.6666412353516,
-        "y": 436.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "95df12c3.3ce8e",
-        "type": "outcome",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1056.666648864746,
-        "y": 436.9047546386719,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "77c6656f.94e17c"
-            ]
-        ]
-    },
-    {
-        "id": "dd0c4879.786768",
-        "type": "set",
-        "name": "set configAssignment JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vnf-topology-operation-input.service-information.service-instance-id   + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`\"/>\n",
-        "comments": "",
-        "x": 470,
-        "y": 620,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "654c303d.bc966",
-        "type": "execute",
-        "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 477.33331298828125,
-        "y": 834,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "d37d9ea0.c12ad",
-                "e8698b70.c431d8"
-            ]
-        ]
-    },
-    {
-        "id": "d37d9ea0.c12ad",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 717.3333129882812,
-        "y": 808,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "cb6982c3.5d096"
-            ]
-        ]
-    },
-    {
-        "id": "cb6982c3.5d096",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from ConfigAssignmentNode\" />\n",
-        "comments": "",
-        "x": 899.3333129882812,
-        "y": 829,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "8e50b155.95aaa",
-        "type": "for",
-        "name": "for resource-accumulator-resolved-data loop",
-        "xml": "<for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 501.66664123535156,
-        "y": 1051.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "76ae92fe.97658c"
-            ]
-        ]
-    },
-    {
-        "id": "edaf4d66.0e603",
-        "type": "set",
-        "name": "set from resource-accumulator-resolved-data",
-        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n",
-        "comments": "",
-        "x": 1731.6666412353516,
-        "y": 1103.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "4b3da748.094068",
-        "type": "for",
-        "name": "for capability-data",
-        "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 426.66664123535156,
-        "y": 1393.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "afcca100.08442"
-            ]
-        ]
-    },
-    {
-        "id": "afcca100.08442",
-        "type": "for",
-        "name": "for key-mapping",
-        "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 635.6666412353516,
-        "y": 1393.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "f22e79d3.9fa598"
-            ]
-        ]
-    },
-    {
-        "id": "41ae2337.afe27c",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 445.66664123535156,
-        "y": 972.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5a42798d.9a03d8",
-        "type": "execute",
-        "name": "execute generateUUID",
-        "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ",
-        "comments": "",
-        "outputs": 1,
-        "x": 451.66664123535156,
-        "y": 123.33333396911621,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "90850917.831e78"
-            ]
-        ]
-    },
-    {
-        "id": "90850917.831e78",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 629.6666412353516,
-        "y": 121.33333396911621,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "5b293973.a44fd8"
-            ]
-        ]
-    },
-    {
-        "id": "5b293973.a44fd8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n",
-        "comments": "",
-        "x": 776.6666412353516,
-        "y": 122.33333396911621,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "55dc72e4.040a6c",
-        "type": "for",
-        "name": "for vnf-parameters-data.param",
-        "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1474.6666412353516,
-        "y": 1051.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "ef8bc14b.ccbff"
-            ]
-        ]
-    },
-    {
-        "id": "76ae92fe.97658c",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 780.6666412353516,
-        "y": 1052.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "824fa75d.391fc8",
-                "2c5ebadc.773bc6",
-                "f84c1bca.bb7958"
-            ]
-        ]
-    },
-    {
-        "id": "f709c437.029758",
-        "type": "switchNode",
-        "name": "switch vnf-parameters-data.param_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 503.66664123535156,
-        "y": 221.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "23708a8a.213166",
-                "80282891.85c258"
-            ]
-        ]
-    },
-    {
-        "id": "23708a8a.213166",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 741.6666412353516,
-        "y": 189.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "dc5b10f3.283cb"
-            ]
-        ]
-    },
-    {
-        "id": "80282891.85c258",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 740.6666412353516,
-        "y": 253.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "9174046b.b8b7d8"
-            ]
-        ]
-    },
-    {
-        "id": "dc5b10f3.283cb",
-        "type": "set",
-        "name": "set pre service param len as 0",
-        "xml": "<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n",
-        "comments": "",
-        "x": 954.6666412353516,
-        "y": 189.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "9174046b.b8b7d8",
-        "type": "set",
-        "name": "set pre service param len",
-        "xml": "<set>\n   <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />",
-        "comments": "",
-        "x": 939.6666412353516,
-        "y": 253.3333339691162,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "ef8bc14b.ccbff",
-        "type": "switchNode",
-        "name": "switch input vnf-name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1732.6666412353516,
-        "y": 1051.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "ee6ccc97.25efa"
-            ]
-        ]
-    },
-    {
-        "id": "ee6ccc97.25efa",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1912.6666412353516,
-        "y": 1051.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "ed52e9db.e0c808"
-            ]
-        ]
-    },
-    {
-        "id": "ed52e9db.e0c808",
-        "type": "set",
-        "name": "set for existing param name",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n",
-        "comments": "",
-        "x": 2122.6666412353516,
-        "y": 1052.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "f84c1bca.bb7958",
-        "type": "switchNode",
-        "name": "switch tmp.mso.param.not-found",
-        "xml": "<switch test='`$tmp.mso.param.found`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1022.6666412353516,
-        "y": 1104.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "eb181e3d.05137"
-            ]
-        ]
-    },
-    {
-        "id": "eb181e3d.05137",
-        "type": "not-found",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1256.6666412353516,
-        "y": 1103.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "f72b62.fb42f4a"
-            ]
-        ]
-    },
-    {
-        "id": "824fa75d.391fc8",
-        "type": "set",
-        "name": "set for existing param name",
-        "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n",
-        "comments": "",
-        "x": 1006.6666412353516,
-        "y": 993.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "2c5ebadc.773bc6",
-        "type": "switchNode",
-        "name": "switch check length > 0",
-        "xml": "<switch test='`$prehighnum &gt; 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 999.1666412353516,
-        "y": 1052.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "6aca2d7e.39e184"
-            ]
-        ]
-    },
-    {
-        "id": "6aca2d7e.39e184",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1246.1666412353516,
-        "y": 1052.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "55dc72e4.040a6c"
-            ]
-        ]
-    },
-    {
-        "id": "32788be4.48e304",
-        "type": "for",
-        "name": "for payload",
-        "xml": "<for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1817.6666412353516,
-        "y": 1411.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "52ca6e98.bf065"
-            ]
-        ]
-    },
-    {
-        "id": "778c089.bfab7f8",
-        "type": "set",
-        "name": "set resource-key",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\n",
-        "comments": "",
-        "x": 2166.6666412353516,
-        "y": 1347.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "1eb3f359.e179fd",
-        "type": "set",
-        "name": "set output-data ",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />",
-        "comments": "",
-        "x": 1390.6666412353516,
-        "y": 1291.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "f22e79d3.9fa598",
-        "type": "for",
-        "name": "for output-key-mapping",
-        "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 858.6666412353516,
-        "y": 1393.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "b6e3c033.d365e"
-            ]
-        ]
-    },
-    {
-        "id": "b6e3c033.d365e",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1109.6666412353516,
-        "y": 1393.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "1eb3f359.e179fd",
-                "c8871600.cda7b8",
-                "31cafe60.c858c2",
-                "d883e8b5.c87cd8"
-            ]
-        ]
-    },
-    {
-        "id": "c8871600.cda7b8",
-        "type": "set",
-        "name": "set length",
-        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' value='`$highnum + 1`'/>\n",
-        "comments": "",
-        "x": 1378.6666412353516,
-        "y": 1429.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "e8698b70.c431d8",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 722.3333129882812,
-        "y": 870,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "cb6982c3.5d096"
-            ]
-        ]
-    },
-    {
-        "id": "31cafe60.c858c2",
-        "type": "switchNode",
-        "name": "switch payload_length",
-        "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1414.6666412353516,
-        "y": 1362.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "35a0c321.c01b8c",
-                "4c60a062.02cd4"
-            ]
-        ]
-    },
-    {
-        "id": "35a0c321.c01b8c",
-        "type": "outcome",
-        "name": "true",
-        "xml": "<outcome value='true'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1635.6666412353516,
-        "y": 1293.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4c60a062.02cd4",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1642.6666412353516,
-        "y": 1411.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "32788be4.48e304"
-            ]
-        ]
-    },
-    {
-        "id": "7c972f3e.f0f83",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1185.9523658752441,
-        "y": 608.9046821594238,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "a6be3be4.1bdc08"
-            ]
-        ]
-    },
-    {
-        "id": "b887f515.962a38",
-        "type": "set",
-        "name": "set length",
-        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n",
-        "comments": "",
-        "x": 2155.6666412353516,
-        "y": 1411.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "30950fde.196f6",
-        "type": "set",
-        "name": "increment length",
-        "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n",
-        "comments": "",
-        "x": 2173.6666412353516,
-        "y": 1485.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "d883e8b5.c87cd8",
-        "type": "set",
-        "name": "increment length",
-        "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n\n",
-        "comments": "",
-        "x": 1399.6666412353516,
-        "y": 1496.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "f72b62.fb42f4a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1433.6666412353516,
-        "y": 1102.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "edaf4d66.0e603",
-                "aba36cfb.938af"
-            ]
-        ]
-    },
-    {
-        "id": "aba36cfb.938af",
-        "type": "set",
-        "name": "increment length",
-        "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
-        "comments": "",
-        "x": 1648.6666412353516,
-        "y": 1162.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "52ca6e98.bf065",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1973.6666412353516,
-        "y": 1412.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            [
-                "778c089.bfab7f8",
-                "b887f515.962a38",
-                "30950fde.196f6"
-            ]
-        ]
-    },
-    {
-        "id": "72e48172.d53ce",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 399.9999809265137,
-        "y": 755.333324432373,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4471abbd.a27dc4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 396.6666488647461,
-        "y": 910.3333320617676,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fa837cb4.36bad",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 405.00000762939453,
-        "y": 1714.5000267028809,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "40bf0919.577208",
-        "type": "set",
-        "name": "set pathname",
-        "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vnf-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\" />\n",
-        "comments": "",
-        "x": 411.25000762939453,
-        "y": 1662.0000247955322,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    },
-    {
-        "id": "c9addd0a.302f8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: vnf-ra-assignment\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 388.75000381469727,
-        "y": 1615.7500247955322,
-        "z": "3ef876bf.78b1fa",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d351ac36.10e8b",
-        "type": "set",
-        "name": "set updateJsonPayload",
-        "xml": "<set>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />",
-        "comments": "",
-        "x": 441,
-        "y": 680,
-        "z": "3ef876bf.78b1fa",
-        "wires": []
-    }
-]
\ No newline at end of file
+[{"id":"3501e5a2.675aea","type":"dgstart","name":"DGSTART","outputs":1,"x":91,"y":33.5,"z":"8334cfbf.1dbfc","wires":[["b5f22dfe.6e31"]]},{"id":"b5f22dfe.6e31","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<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}'>","outputs":1,"x":367,"y":34.5,"z":"8334cfbf.1dbfc","wires":[["547f0019.d0fa3"]]},{"id":"547f0019.d0fa3","type":"method","name":"self-serve-vnf-ra-assignment","xml":"<method rpc='self-serve-vnf-ra-assignment' mode='sync'>\n","comments":"","outputs":1,"x":210.07144165039062,"y":91.46428775787354,"z":"8334cfbf.1dbfc","wires":[["2e63ff2b.561f1"]]},{"id":"2e63ff2b.561f1","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":204.4523468017578,"y":158.04761695861816,"z":"8334cfbf.1dbfc","wires":[["96155f36.4dee","ecd8ee9b.c02a9","1f066148.408b8f","694896b0.6ae8c8","bc33905f.8bba6","9226252e.e39d18","16b37854.35c298","1c416f3d.add001","8bd3a596.34f178","be4e75b8.3ec5d8","7ff74048.c7318","6a301448.38917c","5d4647a7.c772e8","363fca1c.bf8736","e7b4ac15.b3f62"]]},{"id":"ecd8ee9b.c02a9","type":"set","name":"set","xml":"<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>\n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n","comments":"","x":385.2023696899414,"y":226.5476131439209,"z":"8334cfbf.1dbfc","wires":[]},{"id":"eba7814c.4e099","type":"get-resource","name":"get-resource VF_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n  \n\n","comments":"","outputs":1,"x":943.8173675537109,"y":689.611005783081,"z":"8334cfbf.1dbfc","wires":[["c763b60b.7a9018","40f3797c.5f4068","93c98739.415188"]]},{"id":"c763b60b.7a9018","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1188.8174667358398,"y":638.8967294692993,"z":"8334cfbf.1dbfc","wires":[["c002a60.b907d58"]]},{"id":"c002a60.b907d58","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1361.8174667358398,"y":638.8967294692993,"z":"8334cfbf.1dbfc","wires":[]},{"id":"cc998536.46b198","type":"set","name":"set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n<parameter name='tmp.sdnc-artifact-name' value='`$db1.vf-model.sdnc-artifact-name`' />\n\n\n\n\n","comments":"","x":1587.2459678649902,"y":739.0395336151123,"z":"8334cfbf.1dbfc","wires":[]},{"id":"357da513.c5218a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1371.8174667358398,"y":687.8967294692993,"z":"8334cfbf.1dbfc","wires":[]},{"id":"bc33905f.8bba6","type":"switchNode","name":"switch: model info == NULL","xml":"<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.sdnc-artifact-name == ''`\">\n","comments":"","outputs":1,"x":461.81736755371094,"y":690.611005783081,"z":"8334cfbf.1dbfc","wires":[["ffaf5b0c.1fedc8"]]},{"id":"40f3797c.5f4068","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1194.8174667358398,"y":687.8967294692993,"z":"8334cfbf.1dbfc","wires":[["357da513.c5218a"]]},{"id":"ffaf5b0c.1fedc8","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":713.8173675537109,"y":690.611005783081,"z":"8334cfbf.1dbfc","wires":[["eba7814c.4e099"]]},{"id":"694896b0.6ae8c8","type":"for","name":"for vnf-topology-operation-input","xml":"<for silentFailure='true' index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >","comments":"","outputs":1,"x":473.4523468017578,"y":476.29761695861816,"z":"8334cfbf.1dbfc","wires":[["f14b9f13.ca1ba"]]},{"id":"f14b9f13.ca1ba","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":734.4523468017578,"y":476.29761695861816,"z":"8334cfbf.1dbfc","wires":[["38dc7b1c.057fc4"]]},{"id":"a24519d6.9da8a8","type":"set","name":"set tmp.sdnc-model-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n","comments":"","x":1383.4523468017578,"y":398.29761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"8c31b1c4.f2bee","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":1129.4523468017578,"y":398.29761695861816,"z":"8334cfbf.1dbfc","wires":[["a24519d6.9da8a8"]]},{"id":"38dc7b1c.057fc4","type":"switchNode","name":"switch","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n\n","comments":"","outputs":1,"x":908.4523468017578,"y":476.29761695861816,"z":"8334cfbf.1dbfc","wires":[["8c31b1c4.f2bee","6ab00d80.fca704","a9ef8550.572b88","8245db44.d86468"]]},{"id":"6ab00d80.fca704","type":"outcome","name":"sdnc_model_version","xml":"<outcome value='sdnc_model_version'>\n","comments":"","outputs":1,"x":1132.4523468017578,"y":444.29761695861816,"z":"8334cfbf.1dbfc","wires":[["8358a2cb.5dc06"]]},{"id":"a9ef8550.572b88","type":"outcome","name":"sdnc_artifact_name","xml":"<outcome value='sdnc_artifact_name'>\n","comments":"","outputs":1,"x":1131.4523468017578,"y":493.29761695861816,"z":"8334cfbf.1dbfc","wires":[["a9c04e60.ef2f8"]]},{"id":"8358a2cb.5dc06","type":"set","name":"set tmp.sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-version' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n","comments":"","x":1387.4523468017578,"y":444.29761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"a9c04e60.ef2f8","type":"set","name":"set tmp.sdnc-artifact-name","xml":"<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n","comments":"","x":1383.4523468017578,"y":493.29761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"86fadb38.c81f38","type":"set","name":"set name-value other JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + '&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n","comments":"","x":1399.4523468017578,"y":542.2976169586182,"z":"8334cfbf.1dbfc","wires":[]},{"id":"8245db44.d86468","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1091.4523544311523,"y":542.8690376281738,"z":"8334cfbf.1dbfc","wires":[["86fadb38.c81f38"]]},{"id":"9226252e.e39d18","type":"set","name":"set configAssignment JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vnf-topology-operation-input.service-information.service-instance-id   + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`\"/>\n","comments":"","x":475.0079040527344,"y":749.9920196533203,"z":"8334cfbf.1dbfc","wires":[]},{"id":"16b37854.35c298","type":"execute","name":"execute BlueprintProcessingClient","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />","comments":"","outputs":1,"x":477.8968048095703,"y":968.4364633560181,"z":"8334cfbf.1dbfc","wires":[["dd7f5eae.cd01d","f7ecbf9b.1b1ca"]]},{"id":"dd7f5eae.cd01d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":717.8968048095703,"y":942.4364633560181,"z":"8334cfbf.1dbfc","wires":[["11e08758.03b3a9"]]},{"id":"11e08758.03b3a9","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from ConfigAssignmentNode\" />\n","comments":"","x":899.8968048095703,"y":963.4364633560181,"z":"8334cfbf.1dbfc","wires":[]},{"id":"96155f36.4dee","type":"execute","name":"execute generateUUID","xml":" <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ","comments":"","outputs":1,"x":441.9523468017578,"y":158.04761695861816,"z":"8334cfbf.1dbfc","wires":[["42941485.41dd1c"]]},{"id":"42941485.41dd1c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":653.9523468017578,"y":157.04761695861816,"z":"8334cfbf.1dbfc","wires":[["44726b34.9c6614"]]},{"id":"44726b34.9c6614","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n","comments":"","x":829.9523468017578,"y":157.04761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"1f066148.408b8f","type":"switchNode","name":"switch vnf-parameters-data.param_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n","comments":"","outputs":1,"x":510.2023468017578,"y":304.79764461517334,"z":"8334cfbf.1dbfc","wires":[["7aad0ce7.e8e6c4","35092a50.a68416"]]},{"id":"7aad0ce7.e8e6c4","type":"outcome","name":"null","xml":"<outcome value=''>","comments":"","outputs":1,"x":777.2023468017578,"y":272.79764461517334,"z":"8334cfbf.1dbfc","wires":[["5d9fd2c5.25f81c"]]},{"id":"35092a50.a68416","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776.2023468017578,"y":336.79764461517334,"z":"8334cfbf.1dbfc","wires":[["848e04b8.ce3208"]]},{"id":"5d9fd2c5.25f81c","type":"set","name":"set pre service param len as 0","xml":"<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n","comments":"","x":990.2023468017578,"y":272.79764461517334,"z":"8334cfbf.1dbfc","wires":[]},{"id":"848e04b8.ce3208","type":"set","name":"set pre service param len","xml":"<set>\n   <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />","comments":"","x":975.2023468017578,"y":336.79764461517334,"z":"8334cfbf.1dbfc","wires":[]},{"id":"f7ecbf9b.1b1ca","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":722.8968048095703,"y":1004.4364633560181,"z":"8334cfbf.1dbfc","wires":[["11e08758.03b3a9"]]},{"id":"93c98739.415188","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1190.9602699279785,"y":738.8967018127441,"z":"8334cfbf.1dbfc","wires":[["cc998536.46b198"]]},{"id":"1c416f3d.add001","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":381.67456436157227,"y":894.2143058776855,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"8bd3a596.34f178","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":383.8968200683594,"y":1078.1031112670898,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"be4e75b8.3ec5d8","type":"set","name":"set updateJsonPayload","xml":"<set>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />","comments":"","x":440.4523468017578,"y":822.2143030166626,"z":"8334cfbf.1dbfc","wires":[]},{"id":"7ff74048.c7318","type":"execute","name":"execute jsonStringToCtx","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n","comments":"","outputs":1,"x":443.8888702392578,"y":1143.3332748413086,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"6a301448.38917c","type":"switchNode","name":"switch: jsonContextPrefix.resource-accumulator-resolved-data_length","xml":"<switch test=\"`$jsonContextPrefix.resource-accumulator-resolved-data_length`\">\n","comments":"","outputs":1,"x":601.8888854980469,"y":1233.3332777023315,"z":"8334cfbf.1dbfc","wires":[["cd8908db.761938","251a76.7423158a"]]},{"id":"cd8908db.761938","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":969.6666259765625,"y":1208.8887939453125,"z":"8334cfbf.1dbfc","wires":[["2fd0fd65.b23da2"]]},{"id":"f8ea61ad.0fe5b","type":"call","name":"Call self-serve-process-vnf-template-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1262.6666412353516,"y":1262.7776165008545,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"2fd0fd65.b23da2","type":"call","name":"Call self-serve-process-vnf-mapping-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1263.000015258789,"y":1208.8888187408447,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"251a76.7423158a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":968.6666107177734,"y":1262.2221927642822,"z":"8334cfbf.1dbfc","wires":[["f8ea61ad.0fe5b"]]},{"id":"e7b4ac15.b3f62","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n","comments":"","outputs":1,"x":397.5,"y":1432.5,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"363fca1c.bf8736","type":"set","name":"set pathname","xml":"<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vnf-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\" />\n","comments":"","x":402.75,"y":1379.9999980926514,"z":"8334cfbf.1dbfc","wires":[]},{"id":"5d4647a7.c772e8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-vnf-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":378.24999618530273,"y":1329.7499980926514,"z":"8334cfbf.1dbfc","wires":[[]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
index 94207ca5..1ddbca18 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "33be195b.75d4fe",
+        "id": "153cea09.c75a8e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 180,
-        "y": 166.70132446289062,
-        "z": "8b0e50c0.d902",
+        "x": 101.66668701171875,
+        "y": 63.33332824707031,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "887749a.214a238"
+                "fe3324a.ad54558"
             ]
         ]
     },
     {
-        "id": "887749a.214a238",
+        "id": "fe3324a.ad54558",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1512 +22,1760 @@
         "comments": "",
         "xml": "<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}'>",
         "outputs": 1,
-        "x": 293.28570556640625,
-        "y": 206.9394359588623,
-        "z": "8b0e50c0.d902",
+        "x": 214.952392578125,
+        "y": 103.57143974304199,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "29dcb1df.dc1b8e"
+                "1618b716.647759"
             ]
         ]
     },
     {
-        "id": "29dcb1df.dc1b8e",
+        "id": "1618b716.647759",
         "type": "method",
         "name": "method vf-module-topology-operation",
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 267.42862701416016,
-        "y": 246.70131874084473,
-        "z": "8b0e50c0.d902",
+        "x": 189.0953140258789,
+        "y": 143.3333225250244,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "5c539e88.795b58"
+                "647ccf73.e9d16"
             ]
         ]
     },
     {
-        "id": "96b1a3b6.caafe8",
+        "id": "f21f2bc9.a7ee3",
         "type": "comment",
         "name": "vf-module-topology-operation",
         "info": "",
         "comments": "",
-        "x": 497.34483337402344,
-        "y": 149.28766632080078,
-        "z": "8b0e50c0.d902",
+        "x": 419.0115203857422,
+        "y": 45.91967010498047,
+        "z": "c4b0d07d.92515",
         "wires": []
     },
     {
-        "id": "5c539e88.795b58",
+        "id": "647ccf73.e9d16",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 241.5000457763672,
-        "y": 580.061484336853,
-        "z": "8b0e50c0.d902",
+        "x": 163.16673278808594,
+        "y": 476.6934881210327,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "40f6b5c9.a683ec",
-                "28b20b0b.fec1e4",
-                "5bcfdc4b.d00a54"
+                "5a3085f5.d5ce44",
+                "3e48de1f.c44b7a",
+                "3ef5ce22.88127a"
             ]
         ]
     },
     {
-        "id": "40f6b5c9.a683ec",
+        "id": "5a3085f5.d5ce44",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 527.0000381469727,
-        "y": 753.5588731765747,
-        "z": "8b0e50c0.d902",
+        "x": 448.6667251586914,
+        "y": 650.1908769607544,
+        "z": "c4b0d07d.92515",
         "wires": []
     },
     {
-        "id": "28b20b0b.fec1e4",
+        "id": "3e48de1f.c44b7a",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 537.9046478271484,
-        "y": 578.2727088928223,
-        "z": "8b0e50c0.d902",
+        "x": 459.5713348388672,
+        "y": 474.90471267700195,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "caeb3334.585a08",
-                "24b9aded.f55092",
-                "ff253716.ed1",
-                "ecd15846.92d2a",
-                "b53dc71f.db6408",
-                "dd8d2752.a0ec3",
-                "18068d49.c7b22b",
-                "f038d95a.4f467",
-                "47a5544f.c67324"
+                "e696c7e9.b47468",
+                "b98403f7.cef768",
+                "cee42607.61438",
+                "82718d35.9a5ac",
+                "c48c6e.2684d39",
+                "ddd5b918.cd6bc",
+                "b60cf1f8.580f9",
+                "56a5d05d.f27d2",
+                "d6e391fa.c98b78"
             ]
         ]
     },
     {
-        "id": "caeb3334.585a08",
+        "id": "e696c7e9.b47468",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 749.3809280395508,
-        "y": 426.5586109161377,
-        "z": "8b0e50c0.d902",
+        "x": 671.0476150512695,
+        "y": 323.1906147003174,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "fcc6559a.f79908"
+                "69a629d9.7b14c"
             ]
         ]
     },
     {
-        "id": "24b9aded.f55092",
+        "id": "b98403f7.cef768",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 755.7619132995605,
-        "y": 614.7492380142212,
-        "z": "8b0e50c0.d902",
+        "x": 677.4286003112793,
+        "y": 511.3812417984009,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "4899f7bf.dcc26"
+                "66800c86.c97024"
             ]
         ]
     },
     {
-        "id": "ff253716.ed1",
+        "id": "cee42607.61438",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 659.4762649536133,
-        "y": 2030.2728834152222,
-        "z": "8b0e50c0.d902",
+        "x": 586.1429672241211,
+        "y": 2046.904836654663,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "e5f62cf2.166b38"
+                "11e297b8.71dcb"
             ]
         ]
     },
     {
-        "id": "e5f62cf2.166b38",
+        "id": "11e297b8.71dcb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 853.666690826416,
-        "y": 2030.272952079773,
-        "z": "8b0e50c0.d902",
+        "x": 787.0000190734863,
+        "y": 2136.9048748016357,
+        "z": "c4b0d07d.92515",
         "wires": []
     },
     {
-        "id": "5bcfdc4b.d00a54",
+        "id": "3ef5ce22.88127a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 665.0832824707031,
-        "y": 324.0823812484741,
-        "z": "8b0e50c0.d902",
+        "x": 586.7499694824219,
+        "y": 220.7143850326538,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "eef0ba00.12b89",
+        "id": "d40c65e8.5ae13",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.5237197875977,
-        "y": 564.7966537475586,
-        "z": "8b0e50c0.d902",
+        "x": 1053.1904067993164,
+        "y": 461.4286575317383,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "4899f7bf.dcc26",
+        "id": "66800c86.c97024",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1125.856990814209,
-        "y": 614.4633731842041,
-        "z": "8b0e50c0.d902",
+        "x": 1047.5236778259277,
+        "y": 511.0953769683838,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "58ba8f60.b4c0a",
+        "id": "a46899f8.43c288",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 759.857006072998,
-        "y": 565.4633274078369,
-        "z": "8b0e50c0.d902",
+        "x": 681.5236930847168,
+        "y": 462.0953311920166,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "eef0ba00.12b89"
+                "d40c65e8.5ae13"
             ]
         ]
     },
     {
-        "id": "ecd15846.92d2a",
+        "id": "82718d35.9a5ac",
         "type": "outcome",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.3333282470703,
-        "y": 662.3679676055908,
-        "z": "8b0e50c0.d902",
+        "x": 692.0000152587891,
+        "y": 558.9999713897705,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "c288c362.34d07"
+                "e923b3d2.aa64b"
             ]
         ]
     },
     {
-        "id": "c288c362.34d07",
+        "id": "e923b3d2.aa64b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1139.4283981323242,
-        "y": 662.082103729248,
-        "z": "8b0e50c0.d902",
+        "x": 1061.095085144043,
+        "y": 558.7141075134277,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "b53dc71f.db6408",
+        "id": "c48c6e.2684d39",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 756.0000076293945,
-        "y": 860.7013120651245,
-        "z": "8b0e50c0.d902",
+        "x": 677.6666946411133,
+        "y": 757.3333158493042,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "18e7ef46.d6b7b1"
+                "1e5afca3.bad373"
             ]
         ]
     },
     {
-        "id": "607a2fa9.0f2298",
+        "id": "32944a32.f5fae6",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 994.333610534668,
-        "y": 868.2876752316952,
-        "z": "8b0e50c0.d902",
+        "x": 916.0002975463867,
+        "y": 764.9196790158749,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "7311d758.3c29a8",
-                "1c43fcbc.b491cb",
-                "1f820a59.6cfe26",
-                "263d1347.d54d4c",
-                "70589bb7.c48cd4",
-                "17d2ee47.67d4f2"
+                "dbc501f4.15c418",
+                "d866165c.1a50c",
+                "daf35240.82eef",
+                "11f10ff7.8f31",
+                "f7d471cc.6d2f08",
+                "daacc1e1.3a252",
+                "f1d4d27b.a55f18",
+                "cd308409.06664"
             ]
         ]
     },
     {
-        "id": "1c43fcbc.b491cb",
+        "id": "d866165c.1a50c",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1284.809928894043,
-        "y": 776.7670440673828,
-        "z": "8b0e50c0.d902",
+        "x": 1206.4766159057617,
+        "y": 673.3990478515625,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "d033bd2f.c327f8"
+                "8c575c9d.eb50e8"
             ]
         ]
     },
     {
-        "id": "7311d758.3c29a8",
+        "id": "dbc501f4.15c418",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.7143936157227,
-        "y": 952.1449384689331,
-        "z": "8b0e50c0.d902",
+        "x": 1126.3809814453125,
+        "y": 922.1103363037109,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "985190ee.26958"
+                "3de35ea1.4611ca"
             ]
         ]
     },
     {
-        "id": "18e7ef46.d6b7b1",
+        "id": "1e5afca3.bad373",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 942.3335266113281,
-        "y": 788.2876768112183,
-        "z": "8b0e50c0.d902",
+        "x": 864.0002136230469,
+        "y": 684.919680595398,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "607a2fa9.0f2298",
-                "8882f132.8ac148"
+                "32944a32.f5fae6",
+                "6b98be15.5c31b8"
             ]
         ]
     },
     {
-        "id": "d033bd2f.c327f8",
+        "id": "8c575c9d.eb50e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1708.3338012695312,
-        "y": 775.2878203392029,
-        "z": "8b0e50c0.d902",
+        "x": 1630.00048828125,
+        "y": 671.9198241233826,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "985190ee.26958",
+        "id": "3de35ea1.4611ca",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1348.0000457763672,
-        "y": 952.2013349533081,
-        "z": "8b0e50c0.d902",
+        "x": 1276.333251953125,
+        "y": 920.5000152587891,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f820a59.6cfe26",
+        "id": "daf35240.82eef",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1258.6667861938477,
-        "y": 910.5348291397095,
-        "z": "8b0e50c0.d902",
+        "x": 1180.3334732055664,
+        "y": 807.1668329238892,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "10e74aca.5e9dcd"
+                "4c73beae.c4f208"
             ]
         ]
     },
     {
-        "id": "10e74aca.5e9dcd",
+        "id": "4c73beae.c4f208",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.1904830932617,
-        "y": 910.0555810928345,
-        "z": "8b0e50c0.d902",
+        "x": 1652.8571701049805,
+        "y": 806.6875848770142,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "263d1347.d54d4c",
+        "id": "11f10ff7.8f31",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1267.0311088562012,
-        "y": 830.732789516449,
-        "z": "8b0e50c0.d902",
+        "x": 1188.69779586792,
+        "y": 727.3647933006287,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "f8c54fdf.a0282"
+                "16bfb20e.6eff86"
             ]
         ]
     },
     {
-        "id": "f8c54fdf.a0282",
+        "id": "16bfb20e.6eff86",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1722.5548973083496,
-        "y": 830.2536587715149,
-        "z": "8b0e50c0.d902",
+        "x": 1644.2215843200684,
+        "y": 726.8856625556946,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "70589bb7.c48cd4",
+        "id": "f7d471cc.6d2f08",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1297.0000267028809,
-        "y": 729.7013640403748,
-        "z": "8b0e50c0.d902",
+        "x": 1218.6667137145996,
+        "y": 626.3333678245544,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "69cbe655.d4531"
+                "e9749f09.7aac68"
             ]
         ]
     },
     {
-        "id": "69cbe655.d4531",
+        "id": "e9749f09.7aac68",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1705.5237998962402,
-        "y": 727.2221312522888,
-        "z": "8b0e50c0.d902",
+        "x": 1627.190486907959,
+        "y": 623.8541350364685,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "dd8d2752.a0ec3",
+        "id": "ddd5b918.cd6bc",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 746.0000076293945,
-        "y": 1056.0346250534058,
-        "z": "8b0e50c0.d902",
+        "x": 676,
+        "y": 1039.3333129882812,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "bcb67265.e288a"
+                "30af29ca.390ed6"
             ]
         ]
     },
     {
-        "id": "c0fe026d.5bbbb",
+        "id": "7ab05668.71ae18",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1276.1430587768555,
-        "y": 1058.933578491211,
-        "z": "8b0e50c0.d902",
+        "x": 1206.143051147461,
+        "y": 1042.2322664260864,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "5109a3a6.561364"
+                "1fcb5a9.ae883a5"
             ]
         ]
     },
     {
-        "id": "bcb67265.e288a",
+        "id": "30af29ca.390ed6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 926.6667785644531,
-        "y": 1051.4543018341064,
-        "z": "8b0e50c0.d902",
+        "x": 856.6667709350586,
+        "y": 1034.752989768982,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "47246527.1e56ec"
+                "de6a9866.aa5828"
             ]
         ]
     },
     {
-        "id": "5109a3a6.561364",
+        "id": "1fcb5a9.ae883a5",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1688.6669464111328,
-        "y": 1052.454360961914,
-        "z": "8b0e50c0.d902",
+        "x": 1618.6669387817383,
+        "y": 1035.7530488967896,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "c60830d0.17f5a",
+        "id": "e66705a2.bbcc4",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1265.33349609375,
-        "y": 1104.9543671607971,
-        "z": "8b0e50c0.d902",
+        "x": 1195.3334884643555,
+        "y": 1088.2530550956726,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "25d9361e.9c65ba"
+                "c1805771.0819f8"
             ]
         ]
     },
     {
-        "id": "25d9361e.9c65ba",
+        "id": "c1805771.0819f8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.857192993164,
-        "y": 1104.47513961792,
-        "z": "8b0e50c0.d902",
+        "x": 1630.8571853637695,
+        "y": 1087.7738275527954,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "b6aa92f9.cdc2a8",
+        "id": "64b056c.8877b28",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1699.3333206176758,
-        "y": 1189.95432138443,
-        "z": "8b0e50c0.d902",
+        "x": 1629.3333129882812,
+        "y": 1173.2530093193054,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "a18c69ab.01a818",
+        "id": "8e3e13b7.4d7fd8",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1263.8096237182617,
-        "y": 1190.4335489273071,
-        "z": "8b0e50c0.d902",
+        "x": 1193.8096160888672,
+        "y": 1173.7322368621826,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "b6aa92f9.cdc2a8"
+                "64b056c.8877b28"
             ]
         ]
     },
     {
-        "id": "47246527.1e56ec",
+        "id": "de6a9866.aa5828",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1003.0000076293945,
-        "y": 1118.0346250534058,
-        "z": "8b0e50c0.d902",
+        "x": 933,
+        "y": 1101.3333129882812,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "c0fe026d.5bbbb",
-                "c60830d0.17f5a",
-                "a18c69ab.01a818",
-                "4eb9f891.327f5",
-                "90d715c6.9c265",
-                "f02a5298.2eefc"
+                "7ab05668.71ae18",
+                "e66705a2.bbcc4",
+                "8e3e13b7.4d7fd8",
+                "ae7ebf9a.9d5728",
+                "e786a9cd.c7b768",
+                "c6ae21b.9d991e",
+                "470b9ad1.39ed14",
+                "7418d7ec.38a8f"
             ]
         ]
     },
     {
-        "id": "4eb9f891.327f5",
+        "id": "ae7ebf9a.9d5728",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1195.5714874267578,
-        "y": 1239.2461342811584,
-        "z": "8b0e50c0.d902",
+        "x": 1123.9047241210938,
+        "y": 1277.5447998046875,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "5d183311.69fac4"
+                "3422a44a.60f054"
             ]
         ]
     },
     {
-        "id": "90d715c6.9c265",
+        "id": "e786a9cd.c7b768",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1279.0000076293945,
-        "y": 1014.0346250534058,
-        "z": "8b0e50c0.d902",
+        "x": 1209,
+        "y": 997.3333129882812,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "88c09726.eefab8"
+                "76d36ae2.9c9924"
             ]
         ]
     },
     {
-        "id": "88c09726.eefab8",
+        "id": "76d36ae2.9c9924",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1694.523811340332,
-        "y": 1007.555401802063,
-        "z": "8b0e50c0.d902",
+        "x": 1624.5238037109375,
+        "y": 990.8540897369385,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "18068d49.c7b22b",
+        "id": "b60cf1f8.580f9",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 730,
-        "y": 1342.0347180366516,
-        "z": "8b0e50c0.d902",
+        "x": 668.333251953125,
+        "y": 1378.6666259765625,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "681e9593.4046f4"
+                "d902e7.6b323d18"
             ]
         ]
     },
     {
-        "id": "1c91b5af.7e24a2",
+        "id": "b02c158c.dcddd",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1268.1431198120117,
-        "y": 1341.9336881637573,
-        "z": "8b0e50c0.d902",
+        "x": 1189.8097457885742,
+        "y": 1380.232195854187,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "45ef4065.1ebd28"
+                "8c270238.c3c8c8"
             ]
         ]
     },
     {
-        "id": "681e9593.4046f4",
+        "id": "d902e7.6b323d18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 910.6667709350586,
-        "y": 1337.4543948173523,
-        "z": "8b0e50c0.d902",
+        "x": 832.3333969116211,
+        "y": 1375.752902507782,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "33bfb465.398c74"
+                "2518a88.ea22ad8"
             ]
         ]
     },
     {
-        "id": "45ef4065.1ebd28",
+        "id": "8c270238.c3c8c8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1685.6668853759766,
-        "y": 1343.4544248580933,
-        "z": "8b0e50c0.d902",
+        "x": 1607.333511352539,
+        "y": 1381.752932548523,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2c160f0.81abc8",
+        "id": "fa38900c.4b0c9",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1249.3334884643555,
-        "y": 1390.954460144043,
-        "z": "8b0e50c0.d902",
+        "x": 1171.000114440918,
+        "y": 1429.2529678344727,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "6d633c2a.19ba84"
+                "49cf5463.b68144"
             ]
         ]
     },
     {
-        "id": "6d633c2a.19ba84",
+        "id": "49cf5463.b68144",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1684.8571853637695,
-        "y": 1390.4752326011658,
-        "z": "8b0e50c0.d902",
+        "x": 1606.523811340332,
+        "y": 1428.7737402915955,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "534faaf3.c3270c",
+        "id": "55d87d86.c7c894",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1682.333396911621,
-        "y": 1468.9544343948364,
-        "z": "8b0e50c0.d902",
+        "x": 1604.0000228881836,
+        "y": 1507.252942085266,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "a881781.4a03f08",
+        "id": "9b4c7c3a.81ad58",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1246.809700012207,
-        "y": 1469.4336619377136,
-        "z": "8b0e50c0.d902",
+        "x": 1168.4763259887695,
+        "y": 1507.7321696281433,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "534faaf3.c3270c"
+                "55d87d86.c7c894"
             ]
         ]
     },
     {
-        "id": "33bfb465.398c74",
+        "id": "2518a88.ea22ad8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 987,
-        "y": 1404.0347180366516,
-        "z": "8b0e50c0.d902",
+        "x": 908.6666259765625,
+        "y": 1442.3332257270813,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "1c91b5af.7e24a2",
-                "a2c160f0.81abc8",
-                "a881781.4a03f08",
-                "e96ddfb5.feaf6",
-                "627fe7de.350708",
-                "824d42e5.fe91b"
+                "b02c158c.dcddd",
+                "fa38900c.4b0c9",
+                "9b4c7c3a.81ad58",
+                "432728ba.c11a38",
+                "84d60925.31d678",
+                "a8e829e3.8183",
+                "ccae6641.31434",
+                "a6a8695d.564e28"
             ]
         ]
     },
     {
-        "id": "e96ddfb5.feaf6",
+        "id": "432728ba.c11a38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.571434020996,
-        "y": 1519.2462244033813,
-        "z": "8b0e50c0.d902",
+        "x": 1102.5712280273438,
+        "y": 1642.5446166992188,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "fc7b9ae9.e004f8"
+                "c7edf50f.976288"
             ]
         ]
     },
     {
-        "id": "627fe7de.350708",
+        "id": "84d60925.31d678",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1263,
-        "y": 1300.0347180366516,
-        "z": "8b0e50c0.d902",
+        "x": 1184.6666259765625,
+        "y": 1338.3332257270813,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "51976a8e.a60084"
+                "db35e090.10dfe8"
             ]
         ]
     },
     {
-        "id": "51976a8e.a60084",
+        "id": "db35e090.10dfe8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1678.5238037109375,
-        "y": 1293.5554947853088,
-        "z": "8b0e50c0.d902",
+        "x": 1600.1904296875,
+        "y": 1331.8540024757385,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc7b9ae9.e004f8",
+        "id": "c7edf50f.976288",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.000114440918,
-        "y": 1519.7014350891113,
-        "z": "8b0e50c0.d902",
+        "x": 1457.6663208007812,
+        "y": 1642.9998168945312,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d183311.69fac4",
+        "id": "3422a44a.60f054",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1526,
-        "y": 1236.701344013214,
-        "z": "8b0e50c0.d902",
+        "x": 1632.666748046875,
+        "y": 1276.666748046875,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5ddeebb.393828",
+        "id": "e231092d.d187b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1123.9999656677246,
-        "y": 515.7012996673584,
-        "z": "8b0e50c0.d902",
+        "x": 1045.6666526794434,
+        "y": 412.3333034515381,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "d10ab8db.cf3c38",
+        "id": "d176524b.1e092",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 751.9999504089355,
-        "y": 516.367977142334,
-        "z": "8b0e50c0.d902",
+        "x": 673.6666374206543,
+        "y": 412.9999809265137,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "a5ddeebb.393828"
+                "e231092d.d187b8"
             ]
         ]
     },
     {
-        "id": "f038d95a.4f467",
+        "id": "56a5d05d.f27d2",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 693.0000457763672,
-        "y": 1687.368046760559,
-        "z": "8b0e50c0.d902",
+        "x": 619.666748046875,
+        "y": 1704,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "10193305.fa5d35"
+                "dd00380.83700c8"
             ]
         ]
     },
     {
-        "id": "b3ed8338.35bbd8",
+        "id": "6af9eda8.4f30b4",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 932.3335647583008,
-        "y": 1687.9544134140015,
-        "z": "8b0e50c0.d902",
+        "x": 865.6668930053711,
+        "y": 1794.5863361358643,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "f639dd.e0c2962",
-                "2f28b183.0a3116",
-                "2dac1bff.bca26c",
-                "c2c7f7f5.8148e8",
-                "8661a779.b1bbc8",
-                "c19404b2.ac4d9"
+                "acdba1bb.271aa8",
+                "41e45c65.4f48b4",
+                "365b77d0.aa0eb8",
+                "ac104092.6353d8",
+                "bd543300.11b69",
+                "63b5bf9.29c61c",
+                "24867b99.975184",
+                "86ad5770.f9ee38"
             ]
         ]
     },
     {
-        "id": "2f28b183.0a3116",
+        "id": "41e45c65.4f48b4",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1217.8101119995117,
-        "y": 1621.4338130950928,
-        "z": "8b0e50c0.d902",
+        "x": 1151.143440246582,
+        "y": 1728.0657358169556,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "272fa7f.e3f75d8"
+                "80fe0e03.e986c"
             ]
         ]
     },
     {
-        "id": "f639dd.e0c2962",
+        "id": "acdba1bb.271aa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.7144317626953,
-        "y": 1778.8116731643677,
-        "z": "8b0e50c0.d902",
+        "x": 1075.047622680664,
+        "y": 1948.7767133712769,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "721cca52.351b1c"
+                "b65e68d0.d5eb2"
             ]
         ]
     },
     {
-        "id": "10193305.fa5d35",
+        "id": "dd00380.83700c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 879.3335647583008,
-        "y": 1614.9544115066528,
-        "z": "8b0e50c0.d902",
+        "x": 812.6668930053711,
+        "y": 1721.5863342285156,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "b3ed8338.35bbd8"
+                "6af9eda8.4f30b4"
             ]
         ]
     },
     {
-        "id": "272fa7f.e3f75d8",
+        "id": "80fe0e03.e986c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1621.333724975586,
-        "y": 1616.9546580314636,
-        "z": "8b0e50c0.d902",
+        "x": 1554.6670532226562,
+        "y": 1723.5865807533264,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "721cca52.351b1c",
+        "id": "b65e68d0.d5eb2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1285.0000839233398,
-        "y": 1778.8680696487427,
-        "z": "8b0e50c0.d902",
+        "x": 1226.6664581298828,
+        "y": 1953.8332319259644,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dac1bff.bca26c",
+        "id": "365b77d0.aa0eb8",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1195.6668243408203,
-        "y": 1737.201563835144,
-        "z": "8b0e50c0.d902",
+        "x": 1140.666763305664,
+        "y": 1843.8334760665894,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "d36bdd40.7f4cb"
+                "fa46a4df.465f48"
             ]
         ]
     },
     {
-        "id": "d36bdd40.7f4cb",
+        "id": "fa46a4df.465f48",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1668.1905212402344,
-        "y": 1736.722315788269,
-        "z": "8b0e50c0.d902",
+        "x": 1601.5238494873047,
+        "y": 1843.3542385101318,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2c7f7f5.8148e8",
+        "id": "ac104092.6353d8",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1220.0312194824219,
-        "y": 1660.3994517326355,
-        "z": "8b0e50c0.d902",
+        "x": 1153.3645477294922,
+        "y": 1767.0313744544983,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "4e0eb9d5.aa847"
+                "20de69e5.be86ce"
             ]
         ]
     },
     {
-        "id": "4e0eb9d5.aa847",
+        "id": "20de69e5.be86ce",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1634.5550384521484,
-        "y": 1655.9203562736511,
-        "z": "8b0e50c0.d902",
+        "x": 1567.8883666992188,
+        "y": 1762.552278995514,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "8661a779.b1bbc8",
+        "id": "bd543300.11b69",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1224.0000762939453,
-        "y": 1580.3680639266968,
-        "z": "8b0e50c0.d902",
+        "x": 1157.3334045410156,
+        "y": 1686.9999866485596,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "4efe6039.8a2b38"
+                "a935d1ef.f74388"
             ]
         ]
     },
     {
-        "id": "4efe6039.8a2b38",
+        "id": "a935d1ef.f74388",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1617.5238800048828,
-        "y": 1580.888831615448,
-        "z": "8b0e50c0.d902",
+        "x": 1550.8572082519531,
+        "y": 1687.5207543373108,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "8882f132.8ac148",
+        "id": "6b98be15.5c31b8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083.7500076293945,
-        "y": 737.2915614545345,
-        "z": "8b0e50c0.d902",
+        "x": 1005.4166946411133,
+        "y": 633.9235652387142,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "17d2ee47.67d4f2",
+        "id": "daacc1e1.3a252",
         "type": "outcome",
         "name": "CreateSDWANLanPortInstance",
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1260.743507385254,
-        "y": 871.5415625572205,
-        "z": "8b0e50c0.d902",
+        "x": 1182.4101943969727,
+        "y": 768.1735663414001,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "b44bb5fa.e9aaf8"
+                "7725c009.749b4"
             ]
         ]
     },
     {
-        "id": "b44bb5fa.e9aaf8",
+        "id": "7725c009.749b4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1733.267204284668,
-        "y": 871.0623145103455,
-        "z": "8b0e50c0.d902",
+        "x": 1654.9338912963867,
+        "y": 767.6943182945251,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "f02a5298.2eefc",
+        "id": "c6ae21b.9d991e",
         "type": "outcome",
         "name": "ActivateSDWANLanPortInstance",
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1272.743507385254,
-        "y": 1148.7915625572205,
-        "z": "8b0e50c0.d902",
+        "x": 1202.7434997558594,
+        "y": 1132.090250492096,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "3fa74ce7.5a3b6c"
+                "a9085f43.fb5d98"
             ]
         ]
     },
     {
-        "id": "3fa74ce7.5a3b6c",
+        "id": "a9085f43.fb5d98",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1690.2671585083008,
-        "y": 1148.3123240470886,
-        "z": "8b0e50c0.d902",
+        "x": 1620.2671508789062,
+        "y": 1131.611011981964,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "824d42e5.fe91b",
+        "id": "a8e829e3.8183",
         "type": "outcome",
         "name": "DeactivateSDWANLanPortInstance",
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1258.743507385254,
-        "y": 1435.0415625572205,
-        "z": "8b0e50c0.d902",
+        "x": 1180.4101333618164,
+        "y": 1473.3400702476501,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "c7eaff30.b937a"
+                "a0352b06.1ab6a"
             ]
         ]
     },
     {
-        "id": "c7eaff30.b937a",
+        "id": "a0352b06.1ab6a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1676.2671585083008,
-        "y": 1434.5623240470886,
-        "z": "8b0e50c0.d902",
+        "x": 1597.9337844848633,
+        "y": 1472.8608317375183,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "c19404b2.ac4d9",
+        "id": "63b5bf9.29c61c",
         "type": "outcome",
         "name": "DeleteSDWANLanPortInstance",
         "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1222.743507385254,
-        "y": 1698.0415625572205,
-        "z": "8b0e50c0.d902",
+        "x": 1156.0768356323242,
+        "y": 1804.6734852790833,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "611bfd14.6cb0c4"
+                "d935e9d8.5a3f98"
             ]
         ]
     },
     {
-        "id": "611bfd14.6cb0c4",
+        "id": "d935e9d8.5a3f98",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.2671585083008,
-        "y": 1697.5623240470886,
-        "z": "8b0e50c0.d902",
+        "x": 1573.600486755371,
+        "y": 1804.1942467689514,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "47a5544f.c67324",
+        "id": "d6e391fa.c98b78",
         "type": "outcome",
         "name": "update",
         "xml": "<outcome value='update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 664.0000076293945,
-        "y": 1826.2876539230347,
-        "z": "8b0e50c0.d902",
+        "x": 590.6667098999023,
+        "y": 1842.9196071624756,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "7a09cd0b.a3ae6c"
+                "11620b80.062a65"
             ]
         ]
     },
     {
-        "id": "7a09cd0b.a3ae6c",
+        "id": "11620b80.062a65",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 838.3335037231445,
-        "y": 1830.874140739441,
-        "z": "8b0e50c0.d902",
+        "x": 771.6668319702148,
+        "y": 1937.5060634613037,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "f9c37f80.58b198"
+                "3c40302c.ff9b98"
             ]
         ]
     },
     {
-        "id": "f9c37f80.58b198",
+        "id": "3c40302c.ff9b98",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 994.3335037231445,
-        "y": 1900.874140739441,
-        "z": "8b0e50c0.d902",
+        "x": 924.3335113525391,
+        "y": 2042.5059614181519,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "4313d5d.b934a2c",
-                "96008004.f3fb08"
+                "69288b61.625154",
+                "ce72f259.349b28"
             ]
         ]
     },
     {
-        "id": "4313d5d.b934a2c",
+        "id": "69288b61.625154",
         "type": "outcome",
         "name": "SdwanBandwidthChange",
         "xml": "<outcome value='SdwanBandwidthChange'>",
         "comments": "",
         "outputs": 1,
-        "x": 1232.999984741211,
-        "y": 1856.2877740859985,
-        "z": "8b0e50c0.d902",
+        "x": 1167.9998931884766,
+        "y": 2001.2531538009644,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "4a9a8312.107f34"
+                "66378131.684b6"
             ]
         ]
     },
     {
-        "id": "4a9a8312.107f34",
+        "id": "66378131.684b6",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1626.5237884521484,
-        "y": 1856.8085417747498,
-        "z": "8b0e50c0.d902",
+        "x": 1561.5237579345703,
+        "y": 2020.1070356369019,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "96008004.f3fb08",
+        "id": "ce72f259.349b28",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1158.714340209961,
-        "y": 1929.7313776016235,
-        "z": "8b0e50c0.d902",
+        "x": 1088.7141876220703,
+        "y": 2089.696635246277,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "da42a936.4d80e8"
+                "51152d6d.2147ec"
             ]
         ]
     },
     {
-        "id": "da42a936.4d80e8",
+        "id": "51152d6d.2147ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1311.9999923706055,
-        "y": 1929.7877740859985,
-        "z": "8b0e50c0.d902",
+        "x": 1252.000015258789,
+        "y": 2094.7529706954956,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "409c63f3.0be97c",
+        "id": "f4f08860.8e36f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2006.8573913574219,
-        "y": 366.987060546875,
-        "z": "8b0e50c0.d902",
+        "x": 1928.5240783691406,
+        "y": 263.6190643310547,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "cb5df7e4.b1ee5",
-                "977a2626.95574"
+                "4bf22256.7fc7ac",
+                "c762aa36.1446a8"
             ]
         ]
     },
     {
-        "id": "cb5df7e4.b1ee5",
+        "id": "4bf22256.7fc7ac",
         "type": "set",
         "name": "set skip-mdsal-update to Y",
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
         "comments": "",
-        "x": 2253.6429443359375,
-        "y": 343.3411045074463,
-        "z": "8b0e50c0.d902",
+        "x": 2175.3096313476562,
+        "y": 239.97310829162598,
+        "z": "c4b0d07d.92515",
         "wires": []
     },
     {
-        "id": "977a2626.95574",
+        "id": "c762aa36.1446a8",
         "type": "set",
         "name": "set ack-final to 'N' (default)",
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
         "comments": "",
-        "x": 2254.071517944336,
-        "y": 383.34118843078613,
-        "z": "8b0e50c0.d902",
+        "x": 2175.7382049560547,
+        "y": 279.9731922149658,
+        "z": "c4b0d07d.92515",
         "wires": []
     },
     {
-        "id": "f8118221.e92548",
+        "id": "e1bfb2c0.c48e28",
         "type": "switchNode",
         "name": "so-response-url empty?",
         "xml": "<switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1141.4285583496094,
-        "y": 220.98703002929688,
-        "z": "8b0e50c0.d902",
+        "x": 1063.0952453613281,
+        "y": 117.61903381347656,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "6aa69e65.ea868",
-                "8240759e.2b7448"
+                "33bd04c7.af5b24",
+                "f2d7cddb.b68ca"
             ]
         ]
     },
     {
-        "id": "6aa69e65.ea868",
+        "id": "33bd04c7.af5b24",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1366.4285583496094,
-        "y": 176.98703002929688,
-        "z": "8b0e50c0.d902",
+        "x": 1288.0952453613281,
+        "y": 73.61903381347656,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "327527d3.7b4b18"
+                "782ea3fd.5ac0f4"
             ]
         ]
     },
     {
-        "id": "8240759e.2b7448",
+        "id": "f2d7cddb.b68ca",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1356.4285583496094,
-        "y": 268.9870300292969,
-        "z": "8b0e50c0.d902",
+        "x": 1278.0952453613281,
+        "y": 165.61903381347656,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "7a731e6.34210e"
+                "571c94fa.79ac6c"
             ]
         ]
     },
     {
-        "id": "7a731e6.34210e",
+        "id": "571c94fa.79ac6c",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1578.4285583496094,
-        "y": 269.9870300292969,
-        "z": "8b0e50c0.d902",
+        "x": 1500.0952453613281,
+        "y": 166.61903381347656,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "d46d074d.48dc58",
-                "6fce7505.b4aa9c"
+                "4b5b497a.23ca3",
+                "82a707d0.94da68"
             ]
         ]
     },
     {
-        "id": "d46d074d.48dc58",
+        "id": "4b5b497a.23ca3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1818.4285583496094,
-        "y": 268.9870300292969,
-        "z": "8b0e50c0.d902",
+        "x": 1740.0952453613281,
+        "y": 165.61903381347656,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "327527d3.7b4b18"
+                "782ea3fd.5ac0f4"
             ]
         ]
     },
     {
-        "id": "6fce7505.b4aa9c",
+        "id": "82a707d0.94da68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1826.4285583496094,
-        "y": 369.9870300292969,
-        "z": "8b0e50c0.d902",
+        "x": 1748.0952453613281,
+        "y": 266.61903381347656,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "409c63f3.0be97c"
+                "f4f08860.8e36f"
             ]
         ]
     },
     {
-        "id": "327527d3.7b4b18",
+        "id": "782ea3fd.5ac0f4",
         "type": "call",
         "name": "call vf-module-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2325.285858154297,
-        "y": 175.1298828125,
-        "z": "8b0e50c0.d902",
+        "x": 2246.9525451660156,
+        "y": 71.76188659667969,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "486c23d4.36def4",
+        "id": "df9ced4b.6be258",
         "type": "execute",
         "name": "execute getProperties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132.3376159667969,
-        "y": 129.81817626953125,
-        "z": "8b0e50c0.d902",
+        "x": 1054.0043029785156,
+        "y": 26.450180053710938,
+        "z": "c4b0d07d.92515",
         "wires": [
             []
         ]
     },
     {
-        "id": "fcc6559a.f79908",
+        "id": "69a629d9.7b14c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 941.4286804199219,
-        "y": 128,
-        "z": "8b0e50c0.d902",
+        "x": 863.0953674316406,
+        "y": 24.632003784179688,
+        "z": "c4b0d07d.92515",
         "wires": [
             [
-                "486c23d4.36def4",
-                "f8118221.e92548"
+                "df9ced4b.6be258",
+                "e1bfb2c0.c48e28"
             ]
         ]
+    },
+    {
+        "id": "f1d4d27b.a55f18",
+        "type": "outcome",
+        "name": "CreateSOTNUniInstance",
+        "xml": "<outcome value='CreateSOTNUniInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1180,
+        "y": 841.6666870117188,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "7c693995.3f2d28"
+            ]
+        ]
+    },
+    {
+        "id": "7c693995.3f2d28",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-uni-create",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-create' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1652.523696899414,
+        "y": 841.1874389648438,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "470b9ad1.39ed14",
+        "type": "outcome",
+        "name": "ActivateSOTNUniInstance",
+        "xml": "<outcome value='ActivateSOTNUniInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1194.9999923706055,
+        "y": 1208.3333101272583,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "7e2db8fc.02b99"
+            ]
+        ]
+    },
+    {
+        "id": "7e2db8fc.02b99",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-uni-activate",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-activate' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1605.8568649291992,
+        "y": 1206.187252998352,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ccae6641.31434",
+        "type": "outcome",
+        "name": "DeactivateSOTNUniInstance",
+        "xml": "<outcome value='DeactivateSOTNUniInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1155.2777099609375,
+        "y": 1543.6109008789062,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "d1293598.e627c8"
+            ]
+        ]
+    },
+    {
+        "id": "d1293598.e627c8",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-uni-deactivate",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-deactivate' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1581.1347045898438,
+        "y": 1541.4649047851562,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "24867b99.975184",
+        "type": "outcome",
+        "name": "DeleteSOTNUniInstance",
+        "xml": "<outcome value='DeleteSOTNUniInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1131.9444122314453,
+        "y": 1880.2776288986206,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "7e42b134.72d018"
+            ]
+        ]
+    },
+    {
+        "id": "7e42b134.72d018",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-uni-delete",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-delete' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1554.4679718017578,
+        "y": 1881.4649152755737,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "86ad5770.f9ee38",
+        "type": "outcome",
+        "name": "DeleteSOTNL2VpnInstance",
+        "xml": "<outcome value='DeleteSOTNL2VpnInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1130.2777252197266,
+        "y": 1915.2776594161987,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "a36b8be3.d2254"
+            ]
+        ]
+    },
+    {
+        "id": "a36b8be3.d2254",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-l2vpn-delete",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-delete' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1552.801284790039,
+        "y": 1916.4649457931519,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a6a8695d.564e28",
+        "type": "outcome",
+        "name": "DeactivateSOTNL2VpnInstance",
+        "xml": "<outcome value='DeactivateSOTNL2VpnInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1183.61083984375,
+        "y": 1590.2775268554688,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "ca6eae0f.1d2c38"
+            ]
+        ]
+    },
+    {
+        "id": "ca6eae0f.1d2c38",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-l2vpn-deactivate",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-deactivate' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1597.8012084960938,
+        "y": 1589.7981262207031,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5441c097.300118",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-l2vpn-activate",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-activate' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1633.6109619140625,
+        "y": 1240.2778930664062,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7418d7ec.38a8f",
+        "type": "outcome",
+        "name": "ActivateSOTNL2VpnInstance",
+        "xml": "<outcome value='ActivateSOTNL2VpnInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1209.4207458496094,
+        "y": 1242.4239501953125,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "5441c097.300118"
+            ]
+        ]
+    },
+    {
+        "id": "cd308409.06664",
+        "type": "outcome",
+        "name": "CreateSOTNL2VpnInstance",
+        "xml": "<outcome value='CreateSOTNL2VpnInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1198.6110229492188,
+        "y": 881.9444274902344,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            [
+                "3fcd184d.9e71a"
+            ]
+        ]
+    },
+    {
+        "id": "3fcd184d.9e71a",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vf-operation-l2vpn-create",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-create' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1672.8011474609375,
+        "y": 879.7983093261719,
+        "z": "c4b0d07d.92515",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
index 1336db55..862af35e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "7f4aec0b.5502f4",
+        "id": "8fdeb7a9.28b73",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 330,
-        "y": 210.98507690429688,
-        "z": "f5eee496.37583",
+        "x": 133.33334350585938,
+        "y": 198.65174865722656,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "3c7ef46a.98dca4"
+                "ac89694.ba92398"
             ]
         ]
     },
     {
-        "id": "3c7ef46a.98dca4",
+        "id": "ac89694.ba92398",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1314 +22,1437 @@
         "comments": "",
         "xml": "<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}'>",
         "outputs": 1,
-        "x": 413.28570556640625,
-        "y": 272.2231750488281,
-        "z": "f5eee496.37583",
+        "x": 216.61904907226562,
+        "y": 259.8898468017578,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "b47a6501.64ba38"
+                "4ed3dee7.bee43"
             ]
         ]
     },
     {
-        "id": "b47a6501.64ba38",
+        "id": "4ed3dee7.bee43",
         "type": "method",
         "name": "method vnf-topology-operation",
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 405.42862701416016,
-        "y": 334.985071182251,
-        "z": "f5eee496.37583",
+        "x": 208.76197052001953,
+        "y": 322.65174293518066,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "76bed0c3.5ba96"
+                "323edb9d.64f90c"
             ]
         ]
     },
     {
-        "id": "af2b7b93.b6f818",
+        "id": "f6611062.32edc8",
         "type": "comment",
         "name": "vnf-topology-operation",
         "info": "",
         "comments": "",
-        "x": 729.9162979125977,
-        "y": 54,
-        "z": "f5eee496.37583",
+        "x": 533.249641418457,
+        "y": 41.66667175292969,
+        "z": "4222f00.ce0af9",
         "wires": []
     },
     {
-        "id": "76bed0c3.5ba96",
+        "id": "323edb9d.64f90c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 429.16676330566406,
-        "y": 664.6785974502563,
-        "z": "f5eee496.37583",
+        "x": 232.50010681152344,
+        "y": 652.345269203186,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "c01d08e.c985a78",
-                "f3cdf661.920ac",
-                "33260e4d.c20b2a"
+                "bb8e5eb.0d904a",
+                "a9e4287a.aac75",
+                "f6d8c8e4.810ef8"
             ]
         ]
     },
     {
-        "id": "c01d08e.c985a78",
+        "id": "bb8e5eb.0d904a",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 721.6667175292969,
-        "y": 819.8426303863525,
-        "z": "f5eee496.37583",
+        "x": 525.0000610351562,
+        "y": 807.5093021392822,
+        "z": "4222f00.ce0af9",
         "wires": []
     },
     {
-        "id": "f3cdf661.920ac",
+        "id": "a9e4287a.aac75",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 724.5714340209961,
-        "y": 662.8898410797119,
-        "z": "f5eee496.37583",
+        "x": 527.9047775268555,
+        "y": 650.5565128326416,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "6a62e528.843adc",
-                "27ec3c87.0a16a4",
-                "141ab523.6149e3",
-                "8445a42.64341d8",
-                "baec8114.d828c8",
-                "90f19b33.a1e3a",
-                "26901c7e.371ebc"
+                "94449c01.485b08",
+                "ab1de4a6.ec9de8",
+                "22cb5ee7.7cac7a",
+                "1bb1a526.b8fb8b",
+                "d38893a3.06ce68",
+                "7c2e0e4c.dbf17",
+                "80230dcd.458b9"
             ]
         ]
     },
     {
-        "id": "6a62e528.843adc",
+        "id": "94449c01.485b08",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.3809814453125,
-        "y": 490.5089511871338,
-        "z": "f5eee496.37583",
+        "x": 862.7143249511719,
+        "y": 478.1756229400635,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "1151efa6.7d7988"
+                "30e9386b.1bf9e"
             ]
         ]
     },
     {
-        "id": "27ec3c87.0a16a4",
+        "id": "ab1de4a6.ec9de8",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1135.4287996292114,
-        "y": 1259.6997060775757,
-        "z": "f5eee496.37583",
+        "x": 938.7621431350708,
+        "y": 1247.3663778305054,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "b7aab17f.d8737"
+                "e1715245.60eaa"
             ]
         ]
     },
     {
-        "id": "8445a42.64341d8",
+        "id": "1bb1a526.b8fb8b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1119.1430358886719,
-        "y": 1947.8899335861206,
-        "z": "f5eee496.37583",
+        "x": 922.4763793945312,
+        "y": 1935.5566053390503,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "1a454130.e9b437"
+                "6484b763.09f248"
             ]
         ]
     },
     {
-        "id": "1a454130.e9b437",
+        "id": "6484b763.09f248",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 1352.3334655761719,
-        "y": 1947.8899946212769,
-        "z": "f5eee496.37583",
+        "x": 1155.6668090820312,
+        "y": 1935.5566663742065,
+        "z": "4222f00.ce0af9",
         "wires": []
     },
     {
-        "id": "33260e4d.c20b2a",
+        "id": "f6d8c8e4.810ef8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 830.4166870117188,
-        "y": 415.3661289215088,
-        "z": "f5eee496.37583",
+        "x": 633.7500305175781,
+        "y": 403.0328006744385,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1c75a1f.b736a",
+        "id": "429c50f6.4998d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1941.857307434082,
-        "y": 1213.4137859344482,
-        "z": "f5eee496.37583",
+        "x": 1758.52392578125,
+        "y": 1224.4137573242188,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7aab17f.d8737",
+        "id": "e1715245.60eaa",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1499.5239305496216,
-        "y": 1264.4137868881226,
-        "z": "f5eee496.37583",
+        "x": 1304.52392578125,
+        "y": 1268.7471923828125,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "141ab523.6149e3",
+        "id": "22cb5ee7.7cac7a",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1104.5238800048828,
-        "y": 999.080415725708,
-        "z": "f5eee496.37583",
+        "x": 907.8572235107422,
+        "y": 986.7470874786377,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "174a6915.f20dff"
+                "cdaea7ef.202f1"
             ]
         ]
     },
     {
-        "id": "9c2d6c28.9eabb8",
+        "id": "5f7fbdef.90e2d4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1898.666877746582,
-        "y": 872.9850749969482,
-        "z": "f5eee496.37583",
+        "x": 1710.33349609375,
+        "y": 885.6517333984375,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "baec8114.d828c8",
+        "id": "d38893a3.06ce68",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1067.3333129882812,
-        "y": 660.6517143249512,
-        "z": "f5eee496.37583",
+        "x": 870.6666564941406,
+        "y": 648.3183860778809,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "272242b5.b176e6"
+                "b35b44fe.c5e848"
             ]
         ]
     },
     {
-        "id": "90f19b33.a1e3a",
+        "id": "7c2e0e4c.dbf17",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1137.0002298355103,
-        "y": 1392.0713729858398,
-        "z": "f5eee496.37583",
+        "x": 940.3335733413696,
+        "y": 1379.7380447387695,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "e8ab363a.a04b1"
+                "fe327fc4.4bce4"
             ]
         ]
     },
     {
-        "id": "26901c7e.371ebc",
+        "id": "80230dcd.458b9",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1130.000228881836,
-        "y": 1703.0713829994202,
-        "z": "f5eee496.37583",
+        "x": 933.3335723876953,
+        "y": 1690.7380547523499,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "948c6273.9d905"
+                "b29c169a.b9c29"
             ]
         ]
     },
     {
-        "id": "a9e35ff1.79f4e8",
+        "id": "dcb80299.88d2d8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1309.0000839233398,
-        "y": 716.0713911056519,
-        "z": "f5eee496.37583",
+        "x": 1112.3334274291992,
+        "y": 703.7380628585815,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "f87379c.1e07488",
-                "c36c43cc.aeeda8",
-                "13164371.5de335",
-                "a2611719.24c7b",
-                "176f424b.dada06",
-                "39f3b84c.87449"
+                "e5663cdc.f3bed8",
+                "7304998c.6c78d8",
+                "8d2f7cd0.1216b",
+                "e5c3291c.26157",
+                "6ed7f901.e4837",
+                "f1eb2324.c790d",
+                "793759a8.9ea39"
             ]
         ]
     },
     {
-        "id": "c36c43cc.aeeda8",
+        "id": "7304998c.6c78d8",
         "type": "outcome",
         "name": "ActivateSiteInstance",
         "xml": "<outcome value='ActivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1569.4763259887695,
-        "y": 638.5506420135498,
-        "z": "f5eee496.37583",
+        "x": 1372.809669494629,
+        "y": 626.2173137664795,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "bb367534.ef4ec8"
+                "fe22d944.1fc73"
             ]
         ]
     },
     {
-        "id": "f87379c.1e07488",
+        "id": "e5663cdc.f3bed8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1542.3811111450195,
-        "y": 873.9286479949951,
-        "z": "f5eee496.37583",
+        "x": 1342.3810424804688,
+        "y": 888.2620239257812,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "9c2d6c28.9eabb8"
+                "5f7fbdef.90e2d4"
             ]
         ]
     },
     {
-        "id": "272242b5.b176e6",
+        "id": "b35b44fe.c5e848",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1248.0000839233398,
-        "y": 661.0713911056519,
-        "z": "f5eee496.37583",
+        "x": 1051.3334274291992,
+        "y": 648.7380628585815,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "a9e35ff1.79f4e8"
+                "dcb80299.88d2d8"
             ]
         ]
     },
     {
-        "id": "bb367534.ef4ec8",
+        "id": "fe22d944.1fc73",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1936.000129699707,
-        "y": 641.0714244842529,
-        "z": "f5eee496.37583",
+        "x": 1739.3334732055664,
+        "y": 628.7380962371826,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "bf370495.757518",
+        "id": "ca1873d2.9915c8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1367.0001983642578,
-        "y": 1032.071382522583,
-        "z": "f5eee496.37583",
+        "x": 1170.3335418701172,
+        "y": 1019.7380542755127,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "49eaa74e.8c768",
-                "673e8d63.ef464c",
-                "6f7de94e.d598f",
-                "3bbdbf03.70f7",
-                "9e5f5985.9a8c28",
-                "12389cbe.8a7ceb"
+                "c7150aee.048ae",
+                "a855fae3.c07",
+                "149bd874.b6e848",
+                "f2c6835b.e4dce8",
+                "23e0c188.77d676",
+                "7fbdfe6d.74e92"
             ]
         ]
     },
     {
-        "id": "673e8d63.ef464c",
+        "id": "a855fae3.c07",
         "type": "outcome",
         "name": "DeactivateSiteInstance",
         "xml": "<outcome value='DeactivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1610.4763946533203,
-        "y": 983.5506310462952,
-        "z": "f5eee496.37583",
+        "x": 1413.8097381591797,
+        "y": 971.2173027992249,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "76abc0e2.85bc5"
+                "b98150d7.417838"
             ]
         ]
     },
     {
-        "id": "49eaa74e.8c768",
+        "id": "c7150aee.048ae",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.3811111450195,
-        "y": 1213.9286785125732,
-        "z": "f5eee496.37583",
+        "x": 1395.3810424804688,
+        "y": 1223.2620239257812,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "b1c75a1f.b736a"
+                "429c50f6.4998d"
             ]
         ]
     },
     {
-        "id": "174a6915.f20dff",
+        "id": "cdaea7ef.202f1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1306.0001983642578,
-        "y": 977.071382522583,
-        "z": "f5eee496.37583",
+        "x": 1109.3335418701172,
+        "y": 964.7380542755127,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "bf370495.757518"
+                "ca1873d2.9915c8"
             ]
         ]
     },
     {
-        "id": "76abc0e2.85bc5",
+        "id": "b98150d7.417838",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1980.0001983642578,
-        "y": 981.0714135169983,
-        "z": "f5eee496.37583",
+        "x": 1783.3335418701172,
+        "y": 968.738085269928,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "6945b0fa.57898",
+        "id": "e3b42cf5.a45af",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1335.333625793457,
-        "y": 1478.6576824188232,
-        "z": "f5eee496.37583",
+        "x": 1138.6669692993164,
+        "y": 1466.324354171753,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "878cf713.a74bf",
-                "6f7cdd9b.38d304",
-                "6f40b7fc.70cde",
-                "40ffdf8b.d98258",
-                "6fc6cf80.2742",
-                "96eee0bd.7d8858"
+                "6adc7d8f.7076d4",
+                "b51aa3b1.e2b098",
+                "b80b7710.1796",
+                "7ffb66a7.7d6c7",
+                "68aa167c.112dc",
+                "3353033f.efa8dc",
+                "a5d6fe4e.3bf49"
             ]
         ]
     },
     {
-        "id": "6f7cdd9b.38d304",
+        "id": "b51aa3b1.e2b098",
         "type": "outcome",
         "name": "CreateSiteInstance",
         "xml": "<outcome value='CreateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1590.8101167678833,
-        "y": 1331.1370167732239,
-        "z": "f5eee496.37583",
+        "x": 1394.1434602737427,
+        "y": 1318.8036885261536,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "b46cf4df.32707"
+                "ca881a35.a5529"
             ]
         ]
     },
     {
-        "id": "878cf713.a74bf",
+        "id": "6adc7d8f.7076d4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1557.714599609375,
-        "y": 1552.5149021148682,
-        "z": "f5eee496.37583",
+        "x": 1367.714485168457,
+        "y": 1586.8482398986816,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "2c3d033f.ef6ef4"
+                "a995e733.6624d"
             ]
         ]
     },
     {
-        "id": "e8ab363a.a04b1",
+        "id": "fe327fc4.4bce4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1319.3337144851685,
-        "y": 1389.6577405929565,
-        "z": "f5eee496.37583",
+        "x": 1122.6670579910278,
+        "y": 1377.3244123458862,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "6945b0fa.57898"
+                "e3b42cf5.a45af"
             ]
         ]
     },
     {
-        "id": "b46cf4df.32707",
+        "id": "ca881a35.a5529",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1967.333821296692,
-        "y": 1329.657775402069,
-        "z": "f5eee496.37583",
+        "x": 1770.6671648025513,
+        "y": 1317.3244471549988,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "2c3d033f.ef6ef4",
+        "id": "a995e733.6624d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1698.0001754760742,
-        "y": 1553.571325302124,
-        "z": "f5eee496.37583",
+        "x": 1508.0000610351562,
+        "y": 1587.9046630859375,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7a1cbe3.987808",
+        "id": "3304e593.ae05a2",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1376.000228881836,
-        "y": 1755.5713829994202,
-        "z": "f5eee496.37583",
+        "x": 1179.3335723876953,
+        "y": 1743.2380547523499,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "c62eb926.85d33",
-                "7a7ae529.cd458c",
-                "5d404aca.28015c",
-                "24ef76eb.fe68ca",
-                "d11af3be.8899c",
-                "e8482541.be4a68"
+                "f68499ae.c551c",
+                "61c977c4.a99308",
+                "3a60ff9d.338988",
+                "6cb20a0.dcd7c78",
+                "c9636adc.daf0f8",
+                "c849034b.de7bb",
+                "36a6c0b5.0c1d9"
             ]
         ]
     },
     {
-        "id": "7a7ae529.cd458c",
+        "id": "61c977c4.a99308",
         "type": "outcome",
         "name": "DeleteSiteInstance",
         "xml": "<outcome value='DeleteSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1616.476448059082,
-        "y": 1701.0506267547607,
-        "z": "f5eee496.37583",
+        "x": 1419.8097915649414,
+        "y": 1688.7172985076904,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "7f9a71f7.e7a108"
+                "7e6766e4.d1d63"
             ]
         ]
     },
     {
-        "id": "c62eb926.85d33",
+        "id": "f68499ae.c551c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1581.381233215332,
-        "y": 1951.428861618042,
-        "z": "f5eee496.37583",
+        "x": 1389.7146606445312,
+        "y": 1965.7623291015625,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "b15da572.e87ef"
+                "7e606597.d9e3f4"
             ]
         ]
     },
     {
-        "id": "948c6273.9d905",
+        "id": "b29c169a.b9c29",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1315.000228881836,
-        "y": 1700.5713829994202,
-        "z": "f5eee496.37583",
+        "x": 1118.3335723876953,
+        "y": 1688.2380547523499,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "c7a1cbe3.987808"
+                "3304e593.ae05a2"
             ]
         ]
     },
     {
-        "id": "7f9a71f7.e7a108",
+        "id": "7e6766e4.d1d63",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1989.0002517700195,
-        "y": 1698.5713787078857,
-        "z": "f5eee496.37583",
+        "x": 1792.333595275879,
+        "y": 1686.2380504608154,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b15da572.e87ef",
+        "id": "7e606597.d9e3f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1721.6668090820312,
-        "y": 1952.4852848052979,
-        "z": "f5eee496.37583",
+        "x": 1525.0001831054688,
+        "y": 1958.4853515625,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "13164371.5de335",
+        "id": "8d2f7cd0.1216b",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1600.6667556762695,
-        "y": 689.571455001831,
-        "z": "f5eee496.37583",
+        "x": 1404.000099182129,
+        "y": 677.2381267547607,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "bb7369d2.79a9b"
+                "38a8e37a.8a0dfc"
             ]
         ]
     },
     {
-        "id": "bb7369d2.79a9b",
+        "id": "38a8e37a.8a0dfc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2040.1904373168945,
-        "y": 688.092206954956,
-        "z": "f5eee496.37583",
+        "x": 1843.523780822754,
+        "y": 675.7588787078857,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f7de94e.d598f",
+        "id": "149bd874.b6e848",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1651.666633605957,
-        "y": 1031.571409702301,
-        "z": "f5eee496.37583",
+        "x": 1454.9999771118164,
+        "y": 1019.2380814552307,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "5c24aa9.f8036d4"
+                "5a563206.aad004"
             ]
         ]
     },
     {
-        "id": "5c24aa9.f8036d4",
+        "id": "5a563206.aad004",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2108.190330505371,
-        "y": 1031.0922451019287,
-        "z": "f5eee496.37583",
+        "x": 1911.5236740112305,
+        "y": 1018.7589168548584,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd3d0953.02e43",
+        "id": "3a9b518c.93c52e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2037.666633605957,
-        "y": 728.5713939666748,
-        "z": "f5eee496.37583",
+        "x": 1840.9999771118164,
+        "y": 716.2380657196045,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2611719.24c7b",
+        "id": "e5c3291c.26157",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1594.142951965332,
-        "y": 736.0506114959717,
-        "z": "f5eee496.37583",
+        "x": 1397.4762954711914,
+        "y": 723.7172832489014,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "fd3d0953.02e43"
+                "3a9b518c.93c52e"
             ]
         ]
     },
     {
-        "id": "3bbdbf03.70f7",
+        "id": "f2c6835b.e4dce8",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1643.6666793823242,
-        "y": 1069.904725074768,
-        "z": "f5eee496.37583",
+        "x": 1447.0000228881836,
+        "y": 1057.5713968276978,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "25fa8901.ea4226"
+                "9cd1da68.7c00b8"
             ]
         ]
     },
     {
-        "id": "25fa8901.ea4226",
+        "id": "9cd1da68.7c00b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2118.190330505371,
-        "y": 1086.4255270957947,
-        "z": "f5eee496.37583",
+        "x": 1921.5236740112305,
+        "y": 1074.0921988487244,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f40b7fc.70cde",
+        "id": "b80b7710.1796",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1640.6670122146606,
-        "y": 1419.9048511981964,
-        "z": "f5eee496.37583",
+        "x": 1444.00035572052,
+        "y": 1407.571522951126,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "cbbee8f6.313cb8"
+                "683a64bd.1411b4"
             ]
         ]
     },
     {
-        "id": "cbbee8f6.313cb8",
+        "id": "683a64bd.1411b4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2097.1906328201294,
-        "y": 1424.425630569458,
-        "z": "f5eee496.37583",
+        "x": 1900.5239763259888,
+        "y": 1412.0923023223877,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d404aca.28015c",
+        "id": "3a60ff9d.338988",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1652.3334655761719,
-        "y": 1811.9047713279724,
-        "z": "f5eee496.37583",
+        "x": 1455.6668090820312,
+        "y": 1799.571443080902,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "15dc39bf.cd04de"
+                "f08cabbe.1566c"
             ]
         ]
     },
     {
-        "id": "15dc39bf.cd04de",
+        "id": "f08cabbe.1566c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2078.8571853637695,
-        "y": 1811.4256267547607,
-        "z": "f5eee496.37583",
+        "x": 1882.190528869629,
+        "y": 1799.0922985076904,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "24ef76eb.fe68ca",
+        "id": "6cb20a0.dcd7c78",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1661.0316162109375,
-        "y": 1752.102677822113,
-        "z": "f5eee496.37583",
+        "x": 1464.3649597167969,
+        "y": 1739.7693495750427,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "ebf4bbea.e5ce9"
+                "353aaf17.4c28b8"
             ]
         ]
     },
     {
-        "id": "ebf4bbea.e5ce9",
+        "id": "353aaf17.4c28b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2093.555221557617,
-        "y": 1751.6233911514282,
-        "z": "f5eee496.37583",
+        "x": 1896.8885650634766,
+        "y": 1739.290062904358,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "40ffdf8b.d98258",
+        "id": "7ffb66a7.7d6c7",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1656.031361579895,
-        "y": 1376.1028146743774,
-        "z": "f5eee496.37583",
+        "x": 1459.3647050857544,
+        "y": 1363.7694864273071,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "618700fa.fa57e"
+                "be3e977e.2c5d4"
             ]
         ]
     },
     {
-        "id": "618700fa.fa57e",
+        "id": "be3e977e.2c5d4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2112.555027961731,
-        "y": 1374.623628616333,
-        "z": "f5eee496.37583",
+        "x": 1915.8883714675903,
+        "y": 1362.2903003692627,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "176f424b.dada06",
+        "id": "6ed7f901.e4837",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1598.2961502075195,
-        "y": 785.1484661102295,
-        "z": "f5eee496.37583",
+        "x": 1406.6295166015625,
+        "y": 764.4818115234375,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "4be7a0af.f34808"
+                "3bf7e2c.06ec69e"
             ]
         ]
     },
     {
-        "id": "39f3b84c.87449",
+        "id": "f1eb2324.c790d",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1602.2961502075195,
-        "y": 827.8149089813232,
-        "z": "f5eee496.37583",
+        "x": 1410.6295166015625,
+        "y": 807.1482543945312,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "4be7a0af.f34808"
+                "3bf7e2c.06ec69e"
             ]
         ]
     },
     {
-        "id": "4be7a0af.f34808",
+        "id": "3bf7e2c.06ec69e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1873.296142578125,
-        "y": 805.8149607181549,
-        "z": "f5eee496.37583",
+        "x": 1681.629508972168,
+        "y": 785.1483061313629,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "f5fc6a61.fbff"
+                "8153499b.6e1098"
             ]
         ]
     },
     {
-        "id": "f5fc6a61.fbff",
+        "id": "8153499b.6e1098",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2251.2959899902344,
-        "y": 803.148619890213,
-        "z": "f5eee496.37583",
+        "x": 2059.6293563842773,
+        "y": 782.481965303421,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "8713d091.3458c8",
+        "id": "68ae2f99.4d69e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2304.3332138061523,
-        "y": 1141.9380941390991,
-        "z": "f5eee496.37583",
+        "x": 2107.6665573120117,
+        "y": 1129.6047658920288,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "61c74aac.7351c4",
+        "id": "2a02ee62.b6456a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1907.3333053588867,
-        "y": 1143.6044387817383,
-        "z": "f5eee496.37583",
+        "x": 1710.666648864746,
+        "y": 1131.271110534668,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "8713d091.3458c8"
+                "68ae2f99.4d69e"
             ]
         ]
     },
     {
-        "id": "12389cbe.8a7ceb",
+        "id": "7fbdfe6d.74e92",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1649.3332901000977,
-        "y": 1165.6044034957886,
-        "z": "f5eee496.37583",
+        "x": 1452.666633605957,
+        "y": 1153.2710752487183,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "61c74aac.7351c4"
+                "2a02ee62.b6456a"
             ]
         ]
     },
     {
-        "id": "9e5f5985.9a8c28",
+        "id": "23e0c188.77d676",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1643.3332595825195,
-        "y": 1122.9379558563232,
-        "z": "f5eee496.37583",
+        "x": 1446.666603088379,
+        "y": 1110.604627609253,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "61c74aac.7351c4"
+                "2a02ee62.b6456a"
             ]
         ]
     },
     {
-        "id": "6fc6cf80.2742",
+        "id": "68aa167c.112dc",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1636.851692199707,
-        "y": 1474.592924118042,
-        "z": "f5eee496.37583",
+        "x": 1440.1850357055664,
+        "y": 1462.2595958709717,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "6a26d308.85095c"
+                "8a987eaf.1c41f8"
             ]
         ]
     },
     {
-        "id": "96eee0bd.7d8858",
+        "id": "3353033f.efa8dc",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1628.8516693115234,
-        "y": 1516.2593126296997,
-        "z": "f5eee496.37583",
+        "x": 1432.1850128173828,
+        "y": 1503.9259843826294,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "6a26d308.85095c"
+                "8a987eaf.1c41f8"
             ]
         ]
     },
     {
-        "id": "6a26d308.85095c",
+        "id": "8a987eaf.1c41f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1886.8516845703125,
-        "y": 1494.2593479156494,
-        "z": "f5eee496.37583",
+        "x": 1690.1850280761719,
+        "y": 1481.926019668579,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "b45845a5.efe788"
+                "ba617d6f.b174d"
             ]
         ]
     },
     {
-        "id": "b45845a5.efe788",
+        "id": "ba617d6f.b174d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2264.851531982422,
-        "y": 1491.5930070877075,
-        "z": "f5eee496.37583",
+        "x": 2068.1848754882812,
+        "y": 1479.2596788406372,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "d11af3be.8899c",
+        "id": "c9636adc.daf0f8",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1643.333381652832,
-        "y": 1858.9380779266357,
-        "z": "f5eee496.37583",
+        "x": 1446.6667251586914,
+        "y": 1846.6047496795654,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "f4a10691.8e0f9"
+                "74eb4885.217568"
             ]
         ]
     },
     {
-        "id": "e8482541.be4a68",
+        "id": "c849034b.de7bb",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1643.333381652832,
-        "y": 1899.604642868042,
-        "z": "f5eee496.37583",
+        "x": 1446.6667251586914,
+        "y": 1887.2713146209717,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "f4a10691.8e0f9"
+                "74eb4885.217568"
             ]
         ]
     },
     {
-        "id": "f4a10691.8e0f9",
+        "id": "74eb4885.217568",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1893.3333740234375,
-        "y": 1878.6045017242432,
-        "z": "f5eee496.37583",
+        "x": 1696.6667175292969,
+        "y": 1866.2711734771729,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "ae8b0dcf.01d3b"
+                "1d78c22.9c0523e"
             ]
         ]
     },
     {
-        "id": "ae8b0dcf.01d3b",
+        "id": "1d78c22.9c0523e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2271.333221435547,
-        "y": 1875.9381608963013,
-        "z": "f5eee496.37583",
+        "x": 2074.6665649414062,
+        "y": 1863.604832649231,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "90dfa10c.d03aa",
+        "id": "4b721b98.8de544",
         "type": "set",
         "name": "set skip-mdsal-update to Y",
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
         "comments": "",
-        "x": 2420.0318908691406,
-        "y": 381.4920959472656,
-        "z": "f5eee496.37583",
+        "x": 2223.365234375,
+        "y": 369.1587677001953,
+        "z": "4222f00.ce0af9",
         "wires": []
     },
     {
-        "id": "18cf87e0.6196e8",
+        "id": "19c05886.3013f7",
         "type": "set",
         "name": "set ack-final to 'N'",
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
         "comments": "",
-        "x": 2391.841583251953,
-        "y": 445.8401184082031,
-        "z": "f5eee496.37583",
+        "x": 2195.1749267578125,
+        "y": 433.5067901611328,
+        "z": "4222f00.ce0af9",
         "wires": []
     },
     {
-        "id": "11b35a07.5a2e3e",
+        "id": "babbb832.10e11",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2183.381134033203,
-        "y": 384.4126281738281,
-        "z": "f5eee496.37583",
+        "x": 1986.7144775390625,
+        "y": 372.0792999267578,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "90dfa10c.d03aa",
-                "18cf87e0.6196e8"
+                "4b721b98.8de544",
+                "19c05886.3013f7"
             ]
         ]
     },
     {
-        "id": "2b315e75.81704a",
+        "id": "df28f745.38b6c8",
         "type": "comment",
         "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",
         "info": "",
         "comments": "",
-        "x": 2604.158966064453,
-        "y": 486.8094787597656,
-        "z": "f5eee496.37583",
+        "x": 2407.4923095703125,
+        "y": 474.4761505126953,
+        "z": "4222f00.ce0af9",
         "wires": []
     },
     {
-        "id": "14ca87f8.41176",
+        "id": "b74ae95.15c3798",
         "type": "switchNode",
         "name": "so-response-url empty?",
         "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1289.2857971191406,
-        "y": 231.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1092.619140625,
+        "y": 218.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "26f3c83e.94f3d",
-                "8cb49b5.ced0668"
+                "d060b162.861068",
+                "174d2265.acef4e"
             ]
         ]
     },
     {
-        "id": "26f3c83e.94f3d",
+        "id": "d060b162.861068",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1514.2857971191406,
-        "y": 187.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1317.619140625,
+        "y": 174.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "98eada69.09cbf8"
+                "2d99ad86.7ea77a"
             ]
         ]
     },
     {
-        "id": "8cb49b5.ced0668",
+        "id": "174d2265.acef4e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1504.2857971191406,
-        "y": 279.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1307.619140625,
+        "y": 266.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "7f12b283.43e464"
+                "81914c1b.0b07d8"
             ]
         ]
     },
     {
-        "id": "7f12b283.43e464",
+        "id": "81914c1b.0b07d8",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1726.2857971191406,
-        "y": 280.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1529.619140625,
+        "y": 267.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "d9307a61.e9cdb8",
-                "3106a2ed.a08146"
+                "bf23c330.4d5838",
+                "51e5200d.187d08"
             ]
         ]
     },
     {
-        "id": "98eada69.09cbf8",
+        "id": "2d99ad86.7ea77a",
         "type": "call",
         "name": "call vnf-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2190.2857971191406,
-        "y": 188.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1993.619140625,
+        "y": 175.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9307a61.e9cdb8",
+        "id": "bf23c330.4d5838",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1966.2857971191406,
-        "y": 279.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1769.619140625,
+        "y": 266.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "98eada69.09cbf8"
+                "2d99ad86.7ea77a"
             ]
         ]
     },
     {
-        "id": "3106a2ed.a08146",
+        "id": "51e5200d.187d08",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1974.2857971191406,
-        "y": 380.28570556640625,
-        "z": "f5eee496.37583",
+        "x": 1777.619140625,
+        "y": 367.95237731933594,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "11b35a07.5a2e3e"
+                "babbb832.10e11"
             ]
         ]
     },
     {
-        "id": "87242f67.49446",
+        "id": "3a76d55f.574fea",
         "type": "execute",
         "name": "execute getProperties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302.6622619628906,
-        "y": 121.54547119140625,
-        "z": "f5eee496.37583",
+        "x": 1105.99560546875,
+        "y": 109.21214294433594,
+        "z": "4222f00.ce0af9",
         "wires": [
             []
         ]
     },
     {
-        "id": "1151efa6.7d7988",
+        "id": "30e9386b.1bf9e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1111.7533264160156,
-        "y": 119.727294921875,
-        "z": "f5eee496.37583",
+        "x": 915.086669921875,
+        "y": 107.39396667480469,
+        "z": "4222f00.ce0af9",
         "wires": [
             [
-                "14ca87f8.41176",
-                "87242f67.49446"
+                "b74ae95.15c3798",
+                "3a76d55f.574fea"
             ]
         ]
+    },
+    {
+        "id": "a5d6fe4e.3bf49",
+        "type": "outcome",
+        "name": "CreateSOTNUnderlayInstance",
+        "xml": "<outcome value='CreateSOTNUnderlayInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1440,
+        "y": 1541.6666259765625,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            [
+                "b0a72405.4724e8"
+            ]
+        ]
+    },
+    {
+        "id": "b0a72405.4724e8",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-create",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-create' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1896.5236206054688,
+        "y": 1546.187405347824,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "793759a8.9ea39",
+        "type": "outcome",
+        "name": "ActivateSOTNUnderlayInstance",
+        "xml": "<outcome value='ActivateSOTNUnderlayInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1423.3333129882812,
+        "y": 845.9999420642853,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            [
+                "a4e643a3.be23f"
+            ]
+        ]
+    },
+    {
+        "id": "a4e643a3.be23f",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-activate",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1883.1903076171875,
+        "y": 840.520751953125,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8f77f4e2.24c688",
+        "type": "outcome",
+        "name": "DeactivateSOTNUnderlayInstance",
+        "xml": "<outcome value='DeactivateSOTNUnderlayInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1455,
+        "y": 1189.333251953125,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            [
+                "5859b61d.7a069"
+            ]
+        ]
+    },
+    {
+        "id": "5859b61d.7a069",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-deactivate",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-deactivate' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1923.1903076171875,
+        "y": 1192.1871948242188,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "36a6c0b5.0c1d9",
+        "type": "outcome",
+        "name": "DeleteSOTNUnderlayInstance",
+        "xml": "<outcome value='DeleteSOTNUnderlayInstance'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1455,
+        "y": 1921,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            [
+                "93805448.bb27d8"
+            ]
+        ]
+    },
+    {
+        "id": "93805448.bb27d8",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-delete",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1893.1904296875,
+        "y": 1917.1873779296875,
+        "z": "4222f00.ce0af9",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
new file mode 100644
index 00000000..a7b5394d
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "6ddd4074.f6564",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 234.80560302734375,
+        "y": 111.47219848632812,
+        "z": "d2e10b7b.600a68",
+        "wires": [
+            [
+                "ddeb5b5a.bb49b"
+            ]
+        ]
+    },
+    {
+        "id": "ddeb5b5a.bb49b",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 366.09129333496094,
+        "y": 160.71030712127686,
+        "z": "d2e10b7b.600a68",
+        "wires": [
+            [
+                "b1bc4dd3.fa521"
+            ]
+        ]
+    },
+    {
+        "id": "b1bc4dd3.fa521",
+        "type": "method",
+        "name": "method sotn-vf-operation-l2vpn-activate",
+        "xml": "<method rpc='sotn-vf-operation-l2vpn-activate' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 369.2342224121094,
+        "y": 245.47223091125488,
+        "z": "d2e10b7b.600a68",
+        "wires": [
+            [
+                "23b0f2c.b4c290e"
+            ]
+        ]
+    },
+    {
+        "id": "23b0f2c.b4c290e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 510.3329429626465,
+        "y": 462.54641246795654,
+        "z": "d2e10b7b.600a68",
+        "wires": [
+            [
+                "6c6251b8.988708"
+            ]
+        ]
+    },
+    {
+        "id": "6c6251b8.988708",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 778.2500610351562,
+        "y": 545.0833129882812,
+        "z": "d2e10b7b.600a68",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
new file mode 100644
index 00000000..99d429eb
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "db0f78a5.c01a3",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 160.27777099609375,
+        "y": 91.94441223144531,
+        "z": "7ef93f2c.40fb2",
+        "wires": [
+            [
+                "d8303e2.7d965c"
+            ]
+        ]
+    },
+    {
+        "id": "d8303e2.7d965c",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 291.56346130371094,
+        "y": 141.18252086639404,
+        "z": "7ef93f2c.40fb2",
+        "wires": [
+            [
+                "c458b05f.c1372"
+            ]
+        ]
+    },
+    {
+        "id": "c458b05f.c1372",
+        "type": "method",
+        "name": "method sotn-vf-operation-l2vpn-create",
+        "xml": "<method rpc='sotn-vf-operation-l2vpn-create' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 294.7063903808594,
+        "y": 225.94444465637207,
+        "z": "7ef93f2c.40fb2",
+        "wires": [
+            [
+                "c5107308.c6aab"
+            ]
+        ]
+    },
+    {
+        "id": "c5107308.c6aab",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 435.8051109313965,
+        "y": 443.01862621307373,
+        "z": "7ef93f2c.40fb2",
+        "wires": [
+            [
+                "4e54cc73.474b5c"
+            ]
+        ]
+    },
+    {
+        "id": "4e54cc73.474b5c",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 703.7222290039062,
+        "y": 525.5555267333984,
+        "z": "7ef93f2c.40fb2",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.json
new file mode 100644
index 00000000..19781d05
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "90b43524.1bba",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 178.13888549804688,
+        "y": 111.47219848632812,
+        "z": "c6830f2a.6a9d68",
+        "wires": [
+            [
+                "389b8a0e.3a0a5e"
+            ]
+        ]
+    },
+    {
+        "id": "389b8a0e.3a0a5e",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 309.42457580566406,
+        "y": 160.71030712127686,
+        "z": "c6830f2a.6a9d68",
+        "wires": [
+            [
+                "39e685a3.66f172"
+            ]
+        ]
+    },
+    {
+        "id": "39e685a3.66f172",
+        "type": "method",
+        "name": "method sotn-vf-operation-l2vpn-deactivate",
+        "xml": "<method rpc='sotn-vf-operation-l2vpn-deactivate' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 312.5675048828125,
+        "y": 245.47223091125488,
+        "z": "c6830f2a.6a9d68",
+        "wires": [
+            [
+                "a281b71.8f33f48"
+            ]
+        ]
+    },
+    {
+        "id": "a281b71.8f33f48",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 453.6662254333496,
+        "y": 462.54641246795654,
+        "z": "c6830f2a.6a9d68",
+        "wires": [
+            [
+                "dab0995.6fb4068"
+            ]
+        ]
+    },
+    {
+        "id": "dab0995.6fb4068",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 721.5833435058594,
+        "y": 545.0833129882812,
+        "z": "c6830f2a.6a9d68",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json
new file mode 100644
index 00000000..223bb835
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "8398072c.bb",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 164.8055419921875,
+        "y": 111.47222900390625,
+        "z": "227abea9.82942a",
+        "wires": [
+            [
+                "f7478e4.3f877f"
+            ]
+        ]
+    },
+    {
+        "id": "f7478e4.3f877f",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 296.0912322998047,
+        "y": 160.71033763885498,
+        "z": "227abea9.82942a",
+        "wires": [
+            [
+                "2116c7dc.76a62"
+            ]
+        ]
+    },
+    {
+        "id": "2116c7dc.76a62",
+        "type": "method",
+        "name": "method sotn-vf-operation-l2vpn-delete",
+        "xml": "<method rpc='sotn-vf-operation-l2vpn-delete' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 299.2341613769531,
+        "y": 245.472261428833,
+        "z": "227abea9.82942a",
+        "wires": [
+            [
+                "6477dca3.236454"
+            ]
+        ]
+    },
+    {
+        "id": "6477dca3.236454",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 440.33288192749023,
+        "y": 462.54644298553467,
+        "z": "227abea9.82942a",
+        "wires": [
+            [
+                "ef907cc.c0768"
+            ]
+        ]
+    },
+    {
+        "id": "ef907cc.c0768",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 708.25,
+        "y": 545.0833435058594,
+        "z": "227abea9.82942a",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
new file mode 100644
index 00000000..4d9aad4b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "b87fb992.37671",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 179.8055419921875,
+        "y": 128.13888549804688,
+        "z": "28baf2a.ead510e",
+        "wires": [
+            [
+                "527522f9.ff69e4"
+            ]
+        ]
+    },
+    {
+        "id": "527522f9.ff69e4",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 311.0912322998047,
+        "y": 177.3769941329956,
+        "z": "28baf2a.ead510e",
+        "wires": [
+            [
+                "74e85c6a.58678c"
+            ]
+        ]
+    },
+    {
+        "id": "74e85c6a.58678c",
+        "type": "method",
+        "name": "method sotn-vf-operation-uni-activate",
+        "xml": "<method rpc='sotn-vf-operation-uni-activate' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 314.2341613769531,
+        "y": 262.13891792297363,
+        "z": "28baf2a.ead510e",
+        "wires": [
+            [
+                "ae007ab1.699328"
+            ]
+        ]
+    },
+    {
+        "id": "ae007ab1.699328",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 455.33288192749023,
+        "y": 479.2130994796753,
+        "z": "28baf2a.ead510e",
+        "wires": [
+            [
+                "da013af.4338448"
+            ]
+        ]
+    },
+    {
+        "id": "da013af.4338448",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 723.25,
+        "y": 561.75,
+        "z": "28baf2a.ead510e",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
new file mode 100644
index 00000000..e137522c
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "5567fb41.3853ac",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 442.02733993530273,
+        "y": 433.74087047576904,
+        "z": "6cf3d2be.22379c",
+        "wires": [
+            [
+                "a47debf4.9031c"
+            ]
+        ]
+    },
+    {
+        "id": "67dcf0d.95d1c1",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 166.5,
+        "y": 82.66665649414062,
+        "z": "6cf3d2be.22379c",
+        "wires": [
+            [
+                "13cbcd0e.cde623"
+            ]
+        ]
+    },
+    {
+        "id": "13cbcd0e.cde623",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 297.7856903076172,
+        "y": 131.90476512908936,
+        "z": "6cf3d2be.22379c",
+        "wires": [
+            [
+                "90d8ef48.9bbbb8"
+            ]
+        ]
+    },
+    {
+        "id": "90d8ef48.9bbbb8",
+        "type": "method",
+        "name": "method sotn-vf-operation-uni-create",
+        "xml": "<method rpc='sotn-vf-operation-uni-create' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 300.9286193847656,
+        "y": 216.66668891906738,
+        "z": "6cf3d2be.22379c",
+        "wires": [
+            [
+                "5567fb41.3853ac"
+            ]
+        ]
+    },
+    {
+        "id": "a47debf4.9031c",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 709.9444580078125,
+        "y": 516.2777709960938,
+        "z": "6cf3d2be.22379c",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-deactivate.json
new file mode 100644
index 00000000..cc93cced
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-deactivate.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "2415414f.50ca06",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 146.47222900390625,
+        "y": 99.80555725097656,
+        "z": "1b0c4510.2bf803",
+        "wires": [
+            [
+                "93a63e26.730fa8"
+            ]
+        ]
+    },
+    {
+        "id": "93a63e26.730fa8",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 277.75791931152344,
+        "y": 149.0436658859253,
+        "z": "1b0c4510.2bf803",
+        "wires": [
+            [
+                "1803fa4d.6adf06"
+            ]
+        ]
+    },
+    {
+        "id": "1803fa4d.6adf06",
+        "type": "method",
+        "name": "method sotn-vf-operation-uni-deactivate",
+        "xml": "<method rpc='sotn-vf-operation-uni-deactivate' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 280.9008483886719,
+        "y": 233.80558967590332,
+        "z": "1b0c4510.2bf803",
+        "wires": [
+            [
+                "90b1cbb4.020398"
+            ]
+        ]
+    },
+    {
+        "id": "90b1cbb4.020398",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 421.999568939209,
+        "y": 450.879771232605,
+        "z": "1b0c4510.2bf803",
+        "wires": [
+            [
+                "32ad8bf6.04ca74"
+            ]
+        ]
+    },
+    {
+        "id": "32ad8bf6.04ca74",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 689.9166870117188,
+        "y": 533.4166717529297,
+        "z": "1b0c4510.2bf803",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-delete.json
new file mode 100644
index 00000000..3f570006
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-delete.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "16adb85b.30eaa8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 256.47216796875,
+        "y": 136.47222900390625,
+        "z": "5becc04d.b82dc8",
+        "wires": [
+            [
+                "a4bc46f6.cba6e"
+            ]
+        ]
+    },
+    {
+        "id": "a4bc46f6.cba6e",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 387.7578582763672,
+        "y": 185.71033763885498,
+        "z": "5becc04d.b82dc8",
+        "wires": [
+            [
+                "e2a7c6a2.0f6808"
+            ]
+        ]
+    },
+    {
+        "id": "e2a7c6a2.0f6808",
+        "type": "method",
+        "name": "method sotn-vf-operation-uni-delete",
+        "xml": "<method rpc='sotn-vf-operation-uni-delete' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 390.9007873535156,
+        "y": 270.472261428833,
+        "z": "5becc04d.b82dc8",
+        "wires": [
+            [
+                "b67ab4ac.e7faa"
+            ]
+        ]
+    },
+    {
+        "id": "b67ab4ac.e7faa",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 531.9995079040527,
+        "y": 487.54644298553467,
+        "z": "5becc04d.b82dc8",
+        "wires": [
+            [
+                "2e21339.0553f4c"
+            ]
+        ]
+    },
+    {
+        "id": "2e21339.0553f4c",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 799.9166259765625,
+        "y": 570.0833435058594,
+        "z": "5becc04d.b82dc8",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
new file mode 100644
index 00000000..6b71cf5f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "8e70cbab.9e762",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 192.56666564941406,
+        "y": 127.56666564941406,
+        "z": "cee6034b.da01e8",
+        "wires": [
+            [
+                "a562bec1.5c6bb"
+            ]
+        ]
+    },
+    {
+        "id": "a562bec1.5c6bb",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 323.85235595703125,
+        "y": 176.8047742843628,
+        "z": "cee6034b.da01e8",
+        "wires": [
+            [
+                "bd2e1e6.b1131e"
+            ]
+        ]
+    },
+    {
+        "id": "bd2e1e6.b1131e",
+        "type": "method",
+        "name": "method sotn-vnf-topology-operation-underlay-activate",
+        "xml": "<method rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 326.9952850341797,
+        "y": 261.5666980743408,
+        "z": "cee6034b.da01e8",
+        "wires": [
+            [
+                "948a9c7.119abe"
+            ]
+        ]
+    },
+    {
+        "id": "948a9c7.119abe",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 468.0940055847168,
+        "y": 478.6408796310425,
+        "z": "cee6034b.da01e8",
+        "wires": [
+            [
+                "1b5215d4.38c512"
+            ]
+        ]
+    },
+    {
+        "id": "1b5215d4.38c512",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 721.566650390625,
+        "y": 589.566650390625,
+        "z": "cee6034b.da01e8",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
new file mode 100644
index 00000000..2a955c16
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "6e8e8f80.d43c1",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 198.56666564941406,
+        "y": 102.56666564941406,
+        "z": "fcd8d790.9bb058",
+        "wires": [
+            [
+                "bbddfda2.fd8ca8"
+            ]
+        ]
+    },
+    {
+        "id": "bbddfda2.fd8ca8",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 482.85235595703125,
+        "y": 163.8047742843628,
+        "z": "fcd8d790.9bb058",
+        "wires": [
+            [
+                "b5eed43.f629328"
+            ]
+        ]
+    },
+    {
+        "id": "b5eed43.f629328",
+        "type": "method",
+        "name": "method sotn-vnf-topology-operation-underlay-create",
+        "xml": "<method rpc='sotn-vnf-topology-operation-underlay-create' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 488.9952697753906,
+        "y": 248.5666961669922,
+        "z": "fcd8d790.9bb058",
+        "wires": [
+            [
+                "5debc633.a3523"
+            ]
+        ]
+    },
+    {
+        "id": "5debc633.a3523",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 627.0940055847168,
+        "y": 465.6408796310425,
+        "z": "fcd8d790.9bb058",
+        "wires": [
+            [
+                "f1ef9959.63e988"
+            ]
+        ]
+    },
+    {
+        "id": "f1ef9959.63e988",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 880.566650390625,
+        "y": 576.566650390625,
+        "z": "fcd8d790.9bb058",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json
new file mode 100644
index 00000000..22f21465
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "cbc1a13.7b8456",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 154.56666564941406,
+        "y": 94.56666564941406,
+        "z": "81a75cb3.dfe96",
+        "wires": [
+            [
+                "58be845c.53f8dc"
+            ]
+        ]
+    },
+    {
+        "id": "58be845c.53f8dc",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 438.85235595703125,
+        "y": 155.8047742843628,
+        "z": "81a75cb3.dfe96",
+        "wires": [
+            [
+                "1e9f5313.eb2125"
+            ]
+        ]
+    },
+    {
+        "id": "1e9f5313.eb2125",
+        "type": "method",
+        "name": "method sotn-vnf-topology-operation-underlay-deactivate",
+        "xml": "<method rpc='sotn-vnf-topology-operation-underlay-deactivate' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 444.9952697753906,
+        "y": 240.5666961669922,
+        "z": "81a75cb3.dfe96",
+        "wires": [
+            [
+                "1920f1ef.4bc3e6"
+            ]
+        ]
+    },
+    {
+        "id": "1920f1ef.4bc3e6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 583.0940055847168,
+        "y": 457.6408796310425,
+        "z": "81a75cb3.dfe96",
+        "wires": [
+            [
+                "7d3f17a8.8dc"
+            ]
+        ]
+    },
+    {
+        "id": "7d3f17a8.8dc",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 836.566650390625,
+        "y": 568.566650390625,
+        "z": "81a75cb3.dfe96",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json
new file mode 100644
index 00000000..6610951e
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.json
@@ -0,0 +1,78 @@
+[
+    {
+        "id": "3747de4a.ccc95a",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 192.56666564941406,
+        "y": 124.56666564941406,
+        "z": "6d4d0934.24831",
+        "wires": [
+            [
+                "a6a68d99.1f09a8"
+            ]
+        ]
+    },
+    {
+        "id": "a6a68d99.1f09a8",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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}'>",
+        "outputs": 1,
+        "x": 476.85235595703125,
+        "y": 185.8047742843628,
+        "z": "6d4d0934.24831",
+        "wires": [
+            [
+                "19971b48.295af5"
+            ]
+        ]
+    },
+    {
+        "id": "19971b48.295af5",
+        "type": "method",
+        "name": "method sotn-vnf-topology-operation-underlay-delete",
+        "xml": "<method rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 482.9952697753906,
+        "y": 270.5666961669922,
+        "z": "6d4d0934.24831",
+        "wires": [
+            [
+                "d89b2a32.f1b858"
+            ]
+        ]
+    },
+    {
+        "id": "d89b2a32.f1b858",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 621.0940055847168,
+        "y": 487.6408796310425,
+        "z": "6d4d0934.24831",
+        "wires": [
+            [
+                "5e754ce4.b92d84"
+            ]
+        ]
+    },
+    {
+        "id": "5e754ce4.b92d84",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 874.566650390625,
+        "y": 598.566650390625,
+        "z": "6d4d0934.24831",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index cd5b8203..c90222c6 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -128,12 +128,16 @@ GENERIC-RESOURCE-API self-serve-vfmodule-changeassign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vfmodule-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vf-module-forking-logic ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vf-module-mdsal-put ${project.version} sync
+GENERIC-RESOURCE-API self-serve-process-vfmodule-mapping-ra-response ${project.version} sync
+GENERIC-RESOURCE-API self-serve-process-vfmodule-template-ra-response ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-mdsal-put ${project.version} sync 
 GENERIC-RESOURCE-API self-serve-vnf-assign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-changeassign ${project.version} sync 
 GENERIC-RESOURCE-API self-serve-vnf-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-unassign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-forking-logic ${project.version} sync
+GENERIC-RESOURCE-API self-serve-process-vnf-mapping-ra-response ${project.version} sync
+GENERIC-RESOURCE-API self-serve-process-vnf-template-ra-response ${project.version} sync
 GENERIC-RESOURCE-API self-serve-pnf-assign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-pnf-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-pnf-unassign ${project.version} sync
@@ -264,3 +268,15 @@ GENERIC-RESOURCE-API sdwan-vf-operation-lanport-delete ${project.version} sync
 GENERIC-RESOURCE-API sdwan-get-vf-module-lanport-param ${project.version} sync
 GENERIC-RESOURCE-API sdwan-bandwidth-policy-change ${project.version} sync
 GENERIC-RESOURCE-API send-so-response ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-uni-create ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-uni-activate ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-uni-deactivate ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-uni-delete ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-l2vpn-create ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-l2vpn-activate ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-l2vpn-deactivate ${project.version} sync
+GENERIC-RESOURCE-API sotn-vf-operation-l2vpn-delete ${project.version} sync
+GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-create ${project.version} sync
+GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-activate ${project.version} sync
+GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-deactivate ${project.version} sync
+GENERIC-RESOURCE-API sotn-vnf-topology-operation-underlay-delete ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
new file mode 100644
index 00000000..cc9d60bb
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
@@ -0,0 +1,92 @@
+<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='self-serve-process-vfmodule-mapping-ra-response' mode='sync'>
+        <block atomic="true">
+            <switch test='`$jsonContextPrefix.resolution-summary_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="resolution-summary_length is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >
+                <block atomic="true">
+                    <set>
+                        <parameter name='tmp.mso.param.found' value='false' />
+                    </set>
+                    <switch test='`$prehighnum &gt; 0`'>
+                        <outcome value='true'>
+                            <for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>
+                                    <outcome value='true'>
+                                        <block>
+                                            <set>
+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].value' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
+                                            </set>
+                                            <set>
+                                                <parameter name='tmp.mso.param.found' value='true' />
+                                            </set>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                    <switch test='`$tmp.mso.param.found`'>
+                        <outcome value='false'>
+                            <block atomic='true'>
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
+                                </set>
+                                <switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>
+                                    <outcome value='sdnc'>
+                                        <for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >
+                                            <set>
+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>
+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>
+                                            </set>
+                                        </for>
+                                    </outcome>
+                                </switch>
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />
+                                </set>
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.payload' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>
+                                </set>
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name' 
+	value='RA Resolved'/>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>
+                                </set>
+                                <set>
+                                    <parameter name='highnum' value='`$highnum + 1`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <set>
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' 
+	value='`$highnum`'/>
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value="DONE: self-serve-process-vfmodule-mapping-ra-response"/>
+            </record>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
new file mode 100644
index 00000000..b2746cf9
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
@@ -0,0 +1,99 @@
+<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='self-serve-process-vfmodule-template-ra-response' mode='sync'>
+        <block atomic="true">
+            <switch test='`$jsonContextPrefix.resource-accumulator-resolved-data_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="resource-accumulator-resolved-data_length is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >
+                <block atomic="true">
+                    <set>
+                        <parameter name='tmp.mso.param.found' value='false' />
+                    </set>
+                    <switch test='`$prehighnum &gt; 0`'>
+                        <outcome value='true'>
+                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' 
+	value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
+                                            <parameter name='tmp.mso.param.found' value='true' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                    <switch test='`$tmp.mso.param.found`'>
+                        <outcome value='false'>
+                            <block atomic='true'>
+                                <set>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>
+                                </set>
+                                <set>
+                                    <parameter name='highnum' value='`$highnum + 1`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >
+                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >
+                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >
+                        <block atomic="true">
+                            <set>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>
+                                <parameter name='num' value='0' />
+                            </set>
+                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">
+                                <outcome value='true'></outcome>
+                                <outcome value='false'>
+                                    <for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >
+                                        <block atomic='true'>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>
+                                            </set>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>
+                                            </set>
+                                            <set>
+                                                <parameter name='num' value='`$num + 1`' />
+                                            </set>
+                                        </block>
+                                    </for>
+                                </outcome>
+                            </switch>
+                            <set>
+                                <parameter name='highnum' value='`$highnum + 1`' />
+                            </set>
+                        </block>
+                    </for>
+                </for>
+            </for>
+            <set>
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' 
+	value='`$highnum`'/>
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value="DONE: self-serve-process-vfmodule-template-ra-response"/>
+            </record>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
new file mode 100644
index 00000000..67f16c81
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
@@ -0,0 +1,92 @@
+<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='self-serve-process-vnf-mapping-ra-response' mode='sync'>
+        <block atomic="true">
+            <switch test='`$jsonContextPrefix.resolution-summary_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="resolution-summary is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >
+                <block atomic="true">
+                    <set>
+                        <parameter name='tmp.mso.param.found' value='false' />
+                    </set>
+                    <switch test='`$prehighnum &gt; 0`'>
+                        <outcome value='true'>
+                            <for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>
+                                    <outcome value='true'>
+                                        <block>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].value`' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
+                                            </set>
+                                            <set>
+                                                <parameter name='tmp.mso.param.found' value='true' />
+                                            </set>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                    <switch test='`$tmp.mso.param.found`'>
+                        <outcome value='false'>
+                            <block atomic='true'>
+                                <set>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
+                                </set>
+                                <switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>
+                                    <outcome value='sdnc'>
+                                        <for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >
+                                            <set>
+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>
+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>
+                                            </set>
+                                        </for>
+                                    </outcome>
+                                </switch>
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />
+                                </set>
+                                <set>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`' 
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>
+                                </set>
+                                <set>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' 
+	value='RA Resolved'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' 
+	value='`$jsonContextPrefix.payload.resolution-summary[$vdns-index].status`'/>
+                                </set>
+                                <set>
+                                    <parameter name='highnum' value='`$highnum + 1`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <set>
+                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' 
+	value='`$highnum`'/>
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value="DONE: self-serve-process-vnf-mapping-ra-response"/>
+            </record>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
new file mode 100644
index 00000000..2e628320
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
@@ -0,0 +1,104 @@
+<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='self-serve-process-vnf-template-ra-response' mode='sync'>
+        <block atomic="true">
+            <switch test='`$jsonContextPrefix.resource-accumulator-resolved-data_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="resource-accumulator-resolved-data_length is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >
+                <block atomic="true">
+                    <set>
+                        <parameter name='tmp.mso.param.found' value='false' />
+                    </set>
+                    <switch test='`$prehighnum &gt; 0`'>
+                        <outcome value='true'>
+                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>
+                                    <outcome value='true'>
+                                        <block>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
+                                                <parameter name='tmp.mso.param.found' value='true' />
+                                            </set>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
+                                                <parameter name='tmp.mso.param.found' value='true' />
+                                            </set>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                    <switch test='`$tmp.mso.param.found`'>
+                        <outcome value='false'>
+                            <block atomic='true'>
+                                <set>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>
+                                </set>
+                                <set>
+                                    <parameter name='highnum' value='`$highnum + 1`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >
+                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >
+                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >
+                        <block atomic="true">
+                            <set>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>
+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>
+                                <parameter name='num' value='0' />
+                            </set>
+                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">
+                                <outcome value='true'></outcome>
+                                <outcome value='false'>
+                                    <for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>
+                                            </set>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>
+                                            </set>
+                                            <set>
+                                                <parameter name='num' value='`$num + 1`' />
+                                            </set>
+                                        </block>
+                                    </for>
+                                </outcome>
+                            </switch>
+                            <set>
+                                <parameter name='highnum' value='`$highnum + 1`' />
+                            </set>
+                        </block>
+                    </for>
+                </for>
+            </for>
+            <set>
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length' 
+	value='`$highnum`'/>
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log"/>
+                <parameter name="field1" value="DONE: self-serve-process-vnf-template-ra-response"/>
+            </record>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index 79e84d61..b1486e22 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
@@ -167,82 +167,14 @@
                 <parameter name="outputPath" value="jsonContextPrefix" />
                 <parameter name="isEscaped" value="false" />
             </execute>
-            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >
-                <block atomic="true">
-                    <set>
-                        <parameter name='tmp.mso.param.found' value='false' />
-                    </set>
-                    <switch test='`$prehighnum &gt; 0`'>
-                        <outcome value='true'>
-                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
-                                            <parameter name='tmp.mso.param.found' value='true' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </outcome>
-                    </switch>
-                    <switch test='`$tmp.mso.param.found`'>
-                        <outcome value='false'>
-                            <block atomic='true'>
-                                <set>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>
-                                </set>
-                                <set>
-                                    <parameter name='highnum' value='`$highnum + 1`' />
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >
-                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >
-                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >
-                        <block atomic="true">
-                            <set>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>
-                                <parameter name='num' value='0' />
-                            </set>
-                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">
-                                <outcome value='true'></outcome>
-                                <outcome value='false'>
-                                    <for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>
-                                            </set>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>
-                                            </set>
-                                            <set>
-                                                <parameter name='num' value='`$num + 1`' />
-                                            </set>
-                                        </block>
-                                    </for>
-                                </outcome>
-                            </switch>
-                            <set>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' value='`$highnum + 1`'/>
-                            </set>
-                            <set>
-                                <parameter name='highnum' value='`$highnum + 1`' />
-                            </set>
-                        </block>
-                    </for>
-                </for>
-            </for>
+            <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">
+                <outcome value=''>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' ></call>
+                </outcome>
+                <outcome value='Other'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' ></call>
+                </outcome>
+            </switch>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
                 <parameter name="field1" value="DONE: vfmodule-ra-assignment"/>
@@ -257,4 +189,4 @@
             </execute>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
index 347dd718..494fe4a4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
@@ -142,85 +142,17 @@
                 <parameter name="outputPath" value="jsonContextPrefix" />
                 <parameter name="isEscaped" value="false" />
             </execute>
-            <for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >
-                <block atomic="true">
-                    <set>
-                        <parameter name='tmp.mso.param.found' value='false' />
-                    </set>
-                    <switch test='`$prehighnum &gt; 0`'>
-                        <outcome value='true'>
-                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>
-                                    <outcome value='true'>
-                                        <set>
-                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
-                                            <parameter name='tmp.mso.param.found' value='true' />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                            </for>
-                        </outcome>
-                    </switch>
-                    <switch test='`$tmp.mso.param.found`'>
-                        <outcome value='false'>
-                            <block atomic='true'>
-                                <set>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>
-                                </set>
-                                <set>
-                                    <parameter name='highnum' value='`$highnum + 1`' />
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >
-                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >
-                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >
-                        <block atomic="true">
-                            <set>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>
-                                <parameter name='num' value='0' />
-                            </set>
-                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">
-                                <outcome value='true'></outcome>
-                                <outcome value='false'>
-                                    <for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>
-                                            </set>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>
-                                            </set>
-                                            <set>
-                                                <parameter name='num' value='`$num + 1`' />
-                                            </set>
-                                        </block>
-                                    </for>
-                                </outcome>
-                            </switch>
-                            <set>
-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' value='`$highnum + 1`'/>
-                            </set>
-                            <set>
-                                <parameter name='highnum' value='`$highnum + 1`' />
-                            </set>
-                        </block>
-                    </for>
-                </for>
-            </for>
+            <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">
+                <outcome value=''>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' ></call>
+                </outcome>
+                <outcome value='Other'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' ></call>
+                </outcome>
+            </switch>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
-                <parameter name="field1" value="DONE: vnf-ra-assignment"/>
+                <parameter name="field1" value="DONE: self-serve-vnf-ra-assignment"/>
             </record>
             <set>
                 <parameter name='pathname' 
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index 9258d3b5..fa9cbd95 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -65,6 +65,12 @@
                             <outcome value='CreateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' ></call>
                             </outcome>
+                            <outcome value='CreateSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-create' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='CreateSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-create' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
@@ -89,6 +95,12 @@
                             <outcome value='ActivateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' ></call>
                             </outcome>
+                            <outcome value='ActivateSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-activate' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='ActivateSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-activate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' ></call>
                             </outcome>
@@ -113,6 +125,12 @@
                             <outcome value='DeactivateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DeactivateSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-deactivate' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='DeactivateSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-deactivate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' ></call>
                             </outcome>
@@ -137,6 +155,12 @@
                             <outcome value='DeleteSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DeleteSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-delete' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='DeleteSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-delete' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index c796dd88..74ce797f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -57,6 +57,9 @@
                                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' ></call>
                                 </block>
                             </outcome>
+                            <outcome value='ActivateSOTNUnderlayInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>
                             </outcome>
@@ -116,6 +119,9 @@
                                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' ></call>
                                 </block>
                             </outcome>
+                            <outcome value='CreateSOTNUnderlayInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-create' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
@@ -144,6 +150,9 @@
                                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' ></call>
                                 </block>
                             </outcome>
+                            <outcome value='DeleteSOTNUnderlayInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
new file mode 100644
index 00000000..ca13a5e6
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-l2vpn-activate' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
new file mode 100644
index 00000000..3876fd24
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-l2vpn-create' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.xml
new file mode 100644
index 00000000..c16d3b0e
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-deactivate.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-l2vpn-deactivate' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.xml
new file mode 100644
index 00000000..89a18ed8
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-delete.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-l2vpn-delete' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
new file mode 100644
index 00000000..9ccbd07f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-uni-activate' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
new file mode 100644
index 00000000..f1c7ecd6
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-uni-create' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-deactivate.xml
new file mode 100644
index 00000000..75822d17
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-deactivate.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-uni-deactivate' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-delete.xml
new file mode 100644
index 00000000..3920209a
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-delete.xml
@@ -0,0 +1,13 @@
+<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-vf-operation-uni-delete' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
new file mode 100644
index 00000000..28faefee
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml
@@ -0,0 +1,13 @@
+<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-vnf-topology-operation-underlay-activate' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
new file mode 100644
index 00000000..1f7b0138
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml
@@ -0,0 +1,13 @@
+<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-vnf-topology-operation-underlay-create' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.xml
new file mode 100644
index 00000000..28acdbf6
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-deactivate.xml
@@ -0,0 +1,13 @@
+<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-vnf-topology-operation-underlay-deactivate' mode='sync'>
+        <block atomic="true">
+            <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/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.xml
new file mode 100644
index 00000000..7c106ee8
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-delete.xml
@@ -0,0 +1,13 @@
+<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-vnf-topology-operation-underlay-delete' mode='sync'>
+        <block atomic="true">
+            <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/optical-service/src/main/json/optical-service_aai-delete-service-handling.json b/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
new file mode 100644
index 00000000..6cf5663f
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
@@ -0,0 +1,258 @@
+[
+    {
+        "id": "168f1b9b.e0d8a4",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 290,
+        "y": 256.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            [
+                "69efd249.69fbdc"
+            ]
+        ]
+    },
+    {
+        "id": "69efd249.69fbdc",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 477,
+        "y": 205.66665649414062,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            [
+                "7c805408.44c49c"
+            ]
+        ]
+    },
+    {
+        "id": "7c805408.44c49c",
+        "type": "method",
+        "name": "method",
+        "xml": "<method rpc='aai-delete-service-handling' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 331,
+        "y": 379.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            [
+                "9d8283a.657188"
+            ]
+        ]
+    },
+    {
+        "id": "9d8283a.657188",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 504,
+        "y": 378.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            [
+                "f165a108.8a699",
+                "940496d9.dec278",
+                "32c002b0.0f4fce",
+                "2caf6515.aa94aa",
+                "a8c5a8ab.1bde18",
+                "a1d8c39f.8281b"
+            ]
+        ]
+    },
+    {
+        "id": "f165a108.8a699",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 735,
+        "y": 265.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "940496d9.dec278",
+        "type": "get-resource",
+        "name": "Get service from AAI",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $output.service-instance-id' \npfx='aai.service'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 754,
+        "y": 381.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "32c002b0.0f4fce",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$aai.service.orchestration-status`\"/>\n<parameter name=\"field3\" value=\"`$aai.service.relationship-list.relationship_length`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 764,
+        "y": 447.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2caf6515.aa94aa",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 737,
+        "y": 510.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            [
+                "c68f711c.1667a"
+            ]
+        ]
+    },
+    {
+        "id": "1e030001.bace",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />\n<parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />\n\n",
+        "comments": "",
+        "x": 1147,
+        "y": 197.66665649414062,
+        "z": "5b091ac8.c4f784",
+        "wires": []
+    },
+    {
+        "id": "e3a487a2.2e5338",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$pnf-name`\"/>\n<parameter name=\"field3\" value=\"`$pinterface-name`\"/>\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1170,
+        "y": 266.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a8c5a8ab.1bde18",
+        "type": "delete",
+        "name": "delete service instance AAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 757,
+        "y": 586.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c68f711c.1667a",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 921,
+        "y": 514.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            [
+                "1e030001.bace",
+                "e3a487a2.2e5338",
+                "2c623e61.ef3c52",
+                "46559965.50bc28",
+                "c493aa8c.c04b68",
+                "d87c55e6.d344b8"
+            ]
+        ]
+    },
+    {
+        "id": "a1d8c39f.8281b",
+        "type": "delete",
+        "name": "delete from db",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",
+        "comments": "",
+        "outputs": 1,
+        "x": 694,
+        "y": 643.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c493aa8c.c04b68",
+        "type": "get-resource",
+        "name": "get p-interface total capacity",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name ' \npfx='p.in.details'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1266.8887939453125,
+        "y": 322.77777099609375,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d87c55e6.d344b8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$p.in.details.speed-value`' />\n",
+        "comments": "",
+        "x": 1207.111083984375,
+        "y": 413,
+        "z": "5b091ac8.c4f784",
+        "wires": []
+    },
+    {
+        "id": "2c623e61.ef3c52",
+        "type": "update",
+        "name": "update p-interface capacity AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name '\n      local-only='false'>\n<parameter name='available-capacity' value='`$new-rate`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1174,
+        "y": 518.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "46559965.50bc28",
+        "type": "save",
+        "name": "update pinterface rate DB",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1165,
+        "y": 586.6666564941406,
+        "z": "5b091ac8.c4f784",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu1.json b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu1.json
new file mode 100644
index 00000000..7cfc441d
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu1.json
@@ -0,0 +1,442 @@
+[
+    {
+        "id": "7fb6b53d.9b40ac",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 914,
+        "y": 180,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "d89ee2bf.9fb95",
+                "489955f7.b8044c"
+            ]
+        ]
+    },
+    {
+        "id": "d89ee2bf.9fb95",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1047,
+        "y": 149,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "861165e4.072d78"
+            ]
+        ]
+    },
+    {
+        "id": "408487d0.188348",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n",
+        "comments": "",
+        "x": 919,
+        "y": 102,
+        "z": "ea0daf8b.a0dea",
+        "wires": []
+    },
+    {
+        "id": "a318d25.4d1703",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='mul' value='`$odu-number * 1.25`' />\n<parameter name='sub' value='`$mul - 1.25`' />\n<parameter name='new-odu-number' value='`$sub / 1.25`' />\n\n",
+        "comments": "",
+        "x": 1281,
+        "y": 77,
+        "z": "ea0daf8b.a0dea",
+        "wires": []
+    },
+    {
+        "id": "42556171.da338",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 638,
+        "y": 126,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "b03c2fe2.e7ca6"
+            ]
+        ]
+    },
+    {
+        "id": "3256d64.31dae2a",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 562,
+        "y": 244,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "42556171.da338",
+                "3f9ae2a7.46b9ee"
+            ]
+        ]
+    },
+    {
+        "id": "b03c2fe2.e7ca6",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 776,
+        "y": 133,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "7fb6b53d.9b40ac",
+                "408487d0.188348"
+            ]
+        ]
+    },
+    {
+        "id": "489955f7.b8044c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1046,
+        "y": 264,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "aa954ac8.c12048"
+            ]
+        ]
+    },
+    {
+        "id": "e5d7b43a.ff8d18",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1321,
+        "y": 232,
+        "z": "ea0daf8b.a0dea",
+        "wires": []
+    },
+    {
+        "id": "16da9b23.f12fc5",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 928,
+        "y": 460,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "6a47243c.bf922c",
+                "d39786ac.f9ffc8"
+            ]
+        ]
+    },
+    {
+        "id": "6a47243c.bf922c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1069,
+        "y": 452,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "945b4572.2a9d18"
+            ]
+        ]
+    },
+    {
+        "id": "3a491e8e.6ef662",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n",
+        "comments": "",
+        "x": 933,
+        "y": 382,
+        "z": "ea0daf8b.a0dea",
+        "wires": []
+    },
+    {
+        "id": "52b46c06.224904",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1271,
+        "y": 385,
+        "z": "ea0daf8b.a0dea",
+        "wires": []
+    },
+    {
+        "id": "3f9ae2a7.46b9ee",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 639,
+        "y": 406,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "ba6bed77.7ecf2"
+            ]
+        ]
+    },
+    {
+        "id": "ba6bed77.7ecf2",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 790,
+        "y": 413,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "16da9b23.f12fc5",
+                "3a491e8e.6ef662"
+            ]
+        ]
+    },
+    {
+        "id": "d39786ac.f9ffc8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1053,
+        "y": 583,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "1229605a.bcb7e"
+            ]
+        ]
+    },
+    {
+        "id": "bdb03da8.db153",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1298,
+        "y": 539,
+        "z": "ea0daf8b.a0dea",
+        "wires": []
+    },
+    {
+        "id": "75dd10a.39260f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 405,
+        "y": 235,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "3256d64.31dae2a"
+            ]
+        ]
+    },
+    {
+        "id": "7e7327e.e63f7d8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.5,
+        "y": 184,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "e15dddc3.ed1ff"
+            ]
+        ]
+    },
+    {
+        "id": "e15dddc3.ed1ff",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 134.5,
+        "y": 244,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "eb187c1b.5aa9"
+            ]
+        ]
+    },
+    {
+        "id": "eb187c1b.5aa9",
+        "type": "method",
+        "name": "method bandwidth-update-odu1",
+        "xml": "<method rpc='bandwidth-update-odu1' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 318.5,
+        "y": 137,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "75dd10a.39260f"
+            ]
+        ]
+    },
+    {
+        "id": "c2a66fb.f71b39",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1284,
+        "y": 144,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a32257d4.77af48",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1297,
+        "y": 287,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ba783ab9.044e18",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1317,
+        "y": 441,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5b0a9685.46e438",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1248,
+        "y": 610,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "861165e4.072d78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1154,
+        "y": 77,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "a318d25.4d1703",
+                "c2a66fb.f71b39"
+            ]
+        ]
+    },
+    {
+        "id": "aa954ac8.c12048",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1177,
+        "y": 228,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "e5d7b43a.ff8d18",
+                "a32257d4.77af48"
+            ]
+        ]
+    },
+    {
+        "id": "945b4572.2a9d18",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1151,
+        "y": 375,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "52b46c06.224904",
+                "ba783ab9.044e18"
+            ]
+        ]
+    },
+    {
+        "id": "1229605a.bcb7e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1171,
+        "y": 542,
+        "z": "ea0daf8b.a0dea",
+        "wires": [
+            [
+                "bdb03da8.db153",
+                "5b0a9685.46e438"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu2.json b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu2.json
new file mode 100644
index 00000000..10887310
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu2.json
@@ -0,0 +1,860 @@
+[
+    {
+        "id": "d2167b55.82b018",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 405,
+        "y": 203,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "17fa8fe8.9bf91"
+            ]
+        ]
+    },
+    {
+        "id": "811b077a.d09798",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1046,
+        "y": 248,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "d1adad05.70436",
+                "21b9545b.56d0dc",
+                "f3d86763.54a138"
+            ]
+        ]
+    },
+    {
+        "id": "d1adad05.70436",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1122,
+        "y": 214,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "ac2b88c8.8664e8"
+            ]
+        ]
+    },
+    {
+        "id": "62f5d265.23ab0c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 1028,
+        "y": 152,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "2e87013c.8fc8ce",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 1.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1410,
+        "y": 182,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "7c5d3d95.cc5f74",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 703,
+        "y": 202,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "2c622caf.eaa2a4"
+            ]
+        ]
+    },
+    {
+        "id": "17fa8fe8.9bf91",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 559,
+        "y": 202,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "7c5d3d95.cc5f74",
+                "2f408a05.a33d16",
+                "f3c2b240.a115b"
+            ]
+        ]
+    },
+    {
+        "id": "1b7f98e2.94bee7",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 886,
+        "y": 190,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "811b077a.d09798",
+                "62f5d265.23ab0c"
+            ]
+        ]
+    },
+    {
+        "id": "21b9545b.56d0dc",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1135,
+        "y": 350,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "15e3e9b.8ba2616"
+            ]
+        ]
+    },
+    {
+        "id": "a06a5535.b89f68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1434,
+        "y": 303,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "6a12dbc4.c2c474",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 927,
+        "y": 61,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "f3d86763.54a138",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1099,
+        "y": 453,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "6365557.81351ac"
+            ]
+        ]
+    },
+    {
+        "id": "b0a7f453.296058",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1403,
+        "y": 425,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "354fa1c1.f1f6ae",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 974,
+        "y": 638,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "2cba8af9.f08436",
+                "c67aa5c9.f4db98",
+                "613274fc.a6713c"
+            ]
+        ]
+    },
+    {
+        "id": "2cba8af9.f08436",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1096,
+        "y": 592,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "afd7c951.cf6a88"
+            ]
+        ]
+    },
+    {
+        "id": "47a078bd.631e68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 965,
+        "y": 547,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "20e37e98.d28f12",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.5 - 2.5`' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1419,
+        "y": 564,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "2f408a05.a33d16",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 677,
+        "y": 580,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "9cbe7dee.94883"
+            ]
+        ]
+    },
+    {
+        "id": "682f2695.e292e8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 851,
+        "y": 611,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "354fa1c1.f1f6ae",
+                "47a078bd.631e68"
+            ]
+        ]
+    },
+    {
+        "id": "c67aa5c9.f4db98",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1109,
+        "y": 728,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "849d925b.74177"
+            ]
+        ]
+    },
+    {
+        "id": "a4523229.d6783",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1417,
+        "y": 680,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "8aef3377.3c117",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 895,
+        "y": 473,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "613274fc.a6713c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1073,
+        "y": 831,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "6eb2648c.81a19c"
+            ]
+        ]
+    },
+    {
+        "id": "deaaf26b.10d53",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1334,
+        "y": 797,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "99b2b453.ad7458",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 942,
+        "y": 1049,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "4187876d.dc02e8",
+                "761e3130.940b3",
+                "b24927d8.4257b8"
+            ]
+        ]
+    },
+    {
+        "id": "4187876d.dc02e8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1162,
+        "y": 1000,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "a1a3c897.76f2c8"
+            ]
+        ]
+    },
+    {
+        "id": "fd35744a.032178",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 932,
+        "y": 966,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "58773dca.32a9d4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1435,
+        "y": 964,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "f3c2b240.a115b",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 450,
+        "y": 1017,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "1dd9e0cc.abefff"
+            ]
+        ]
+    },
+    {
+        "id": "1dd9e0cc.abefff",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 734,
+        "y": 1039,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "99b2b453.ad7458",
+                "fd35744a.032178"
+            ]
+        ]
+    },
+    {
+        "id": "761e3130.940b3",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1174,
+        "y": 1110,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "b3ea3cfa.44044"
+            ]
+        ]
+    },
+    {
+        "id": "ee22130b.ddcc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1456,
+        "y": 1105,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "b24927d8.4257b8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1139,
+        "y": 1239,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "b43c1f4d.37883"
+            ]
+        ]
+    },
+    {
+        "id": "c6ed6d86.a3142",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1434,
+        "y": 1203,
+        "z": "d291f834.d4cbf8",
+        "wires": []
+    },
+    {
+        "id": "d3ed497f.e63998",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.5,
+        "y": 152,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "5490e45b.ec8f7c"
+            ]
+        ]
+    },
+    {
+        "id": "5490e45b.ec8f7c",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 134.5,
+        "y": 212,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "c1ead28d.6c8d3"
+            ]
+        ]
+    },
+    {
+        "id": "c1ead28d.6c8d3",
+        "type": "method",
+        "name": "method bandwidth-update-odu2",
+        "xml": "<method rpc='bandwidth-update-odu2' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 318.5,
+        "y": 105,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "d2167b55.82b018"
+            ]
+        ]
+    },
+    {
+        "id": "96acfef0.2597f",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1474,
+        "y": 244,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "506c233c.43ef1c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1500,
+        "y": 377,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "45d21d06.df7524",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1477,
+        "y": 471,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c7f985a4.c76918",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1489,
+        "y": 613,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b4a35a6d.5c6478",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1492,
+        "y": 740,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "97a76dca.636f9",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1407,
+        "y": 844,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a9c10315.e0892",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1512,
+        "y": 1020,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1cfce80.51afa18",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1518,
+        "y": 1148,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "13bea178.4cb18f",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1504,
+        "y": 1275,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ac2b88c8.8664e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1258,
+        "y": 212,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "2e87013c.8fc8ce",
+                "96acfef0.2597f"
+            ]
+        ]
+    },
+    {
+        "id": "15e3e9b.8ba2616",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1283,
+        "y": 348,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "a06a5535.b89f68",
+                "506c233c.43ef1c"
+            ]
+        ]
+    },
+    {
+        "id": "6365557.81351ac",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1249,
+        "y": 453,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "b0a7f453.296058",
+                "45d21d06.df7524"
+            ]
+        ]
+    },
+    {
+        "id": "afd7c951.cf6a88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1247,
+        "y": 591,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "20e37e98.d28f12",
+                "c7f985a4.c76918"
+            ]
+        ]
+    },
+    {
+        "id": "849d925b.74177",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1249,
+        "y": 724,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "a4523229.d6783",
+                "b4a35a6d.5c6478"
+            ]
+        ]
+    },
+    {
+        "id": "6eb2648c.81a19c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1212,
+        "y": 826,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "deaaf26b.10d53",
+                "97a76dca.636f9"
+            ]
+        ]
+    },
+    {
+        "id": "a1a3c897.76f2c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1296,
+        "y": 999,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "58773dca.32a9d4",
+                "a9c10315.e0892"
+            ]
+        ]
+    },
+    {
+        "id": "b3ea3cfa.44044",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1310,
+        "y": 1110,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "ee22130b.ddcc",
+                "1cfce80.51afa18"
+            ]
+        ]
+    },
+    {
+        "id": "b43c1f4d.37883",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1296,
+        "y": 1236,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "c6ed6d86.a3142",
+                "13bea178.4cb18f"
+            ]
+        ]
+    },
+    {
+        "id": "2c622caf.eaa2a4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 814,
+        "y": 110,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "6a12dbc4.c2c474",
+                "1b7f98e2.94bee7"
+            ]
+        ]
+    },
+    {
+        "id": "9cbe7dee.94883",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 750,
+        "y": 495,
+        "z": "d291f834.d4cbf8",
+        "wires": [
+            [
+                "8aef3377.3c117",
+                "682f2695.e292e8"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu3.json b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu3.json
new file mode 100644
index 00000000..cfc383bc
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu3.json
@@ -0,0 +1,1369 @@
+[
+    {
+        "id": "59bd3927.592868",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 906.5,
+        "y": 146,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "686976fa.e39a38",
+                "5a90cb29.5918e4",
+                "9ff85014.553ad",
+                "7f3619a0.9e0de8"
+            ]
+        ]
+    },
+    {
+        "id": "686976fa.e39a38",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1045.5,
+        "y": 105,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "1d32ea36.ac6196"
+            ]
+        ]
+    },
+    {
+        "id": "d7f141cc.723c8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 914.5,
+        "y": 60,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "a32f2439.cb6ab8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 1.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1338.5,
+        "y": 76,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "4c8f08a5.d0cd38",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 626.5,
+        "y": 93,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "7a765f28.8bea6"
+            ]
+        ]
+    },
+    {
+        "id": "25cd1da9.b3f392",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 495.5,
+        "y": 149,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "4c8f08a5.d0cd38",
+                "f16923b.76bace",
+                "d50cccac.ae255",
+                "d6e62384.c44eb"
+            ]
+        ]
+    },
+    {
+        "id": "eb046504.a184d8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 770.5,
+        "y": 111,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "59bd3927.592868",
+                "d7f141cc.723c8"
+            ]
+        ]
+    },
+    {
+        "id": "5a90cb29.5918e4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1075.5,
+        "y": 194,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "e76aea9c.e12bd8"
+            ]
+        ]
+    },
+    {
+        "id": "5aa343d7.14c6fc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1342.5,
+        "y": 179,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "1b913f9a.27c49",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 858.5,
+        "y": 20,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "9ff85014.553ad",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1044.5,
+        "y": 294,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "80d48ef5.9912"
+            ]
+        ]
+    },
+    {
+        "id": "cef4b295.6c496",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1330.5,
+        "y": 291,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "7f3619a0.9e0de8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 972,
+        "y": 402,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "8c7e1bd7.f41a68"
+            ]
+        ]
+    },
+    {
+        "id": "59568bd7.60cba4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1259,
+        "y": 387,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "b8915894.bda8e8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 847,
+        "y": 671,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "d416a38f.22749",
+                "50b4be98.ddf0c",
+                "d2192c61.4bdf7",
+                "728f7fb2.a1cac"
+            ]
+        ]
+    },
+    {
+        "id": "d416a38f.22749",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 986,
+        "y": 630,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "606ba16.524bc6"
+            ]
+        ]
+    },
+    {
+        "id": "318f9aba.df2006",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 855,
+        "y": 585,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "17a117e5.591708",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 2.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1263,
+        "y": 590,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "f16923b.76bace",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 567,
+        "y": 618,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "7d7cd2ec.065b2c"
+            ]
+        ]
+    },
+    {
+        "id": "13b57033.9951",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 754,
+        "y": 615,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "b8915894.bda8e8",
+                "318f9aba.df2006"
+            ]
+        ]
+    },
+    {
+        "id": "50b4be98.ddf0c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1021,
+        "y": 723,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "31b7a978.6ce366"
+            ]
+        ]
+    },
+    {
+        "id": "2d2e684.a340898",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1294,
+        "y": 707,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "f02b9dc0.9a744",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 787,
+        "y": 512,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "d2192c61.4bdf7",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 979,
+        "y": 814,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "5aa134da.c5d79c"
+            ]
+        ]
+    },
+    {
+        "id": "f96115b6.ae0958",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1284,
+        "y": 813,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "728f7fb2.a1cac",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 885.5,
+        "y": 984,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "c49e735f.4d186"
+            ]
+        ]
+    },
+    {
+        "id": "aad0db15.cc7c18",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1151.5,
+        "y": 952,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "1c012ace.64f805",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 710,
+        "y": 1209,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "5289693d.e0a268",
+                "31d3f86f.e846f8",
+                "7d5fdc36.750854",
+                "99806796.f1f338"
+            ]
+        ]
+    },
+    {
+        "id": "5289693d.e0a268",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 897,
+        "y": 1149,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "de9cb28.9f9d45"
+            ]
+        ]
+    },
+    {
+        "id": "30fb08fd.b5dda8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 736,
+        "y": 1103,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "d67ef568.42cc38",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 2.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1197,
+        "y": 1112,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "d50cccac.ae255",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 417,
+        "y": 1154,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "712de01.298dd2"
+            ]
+        ]
+    },
+    {
+        "id": "d3523aa7.075c48",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 589,
+        "y": 1148,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "1c012ace.64f805",
+                "30fb08fd.b5dda8"
+            ]
+        ]
+    },
+    {
+        "id": "31d3f86f.e846f8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 919,
+        "y": 1240,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "6fab0d4e.49f804"
+            ]
+        ]
+    },
+    {
+        "id": "17e177eb.a9a758",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1210,
+        "y": 1227,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "d69e06e0.b960b8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 628,
+        "y": 950,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "7d5fdc36.750854",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 913,
+        "y": 1340,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "ea510da.c129ff"
+            ]
+        ]
+    },
+    {
+        "id": "1cffb56f.5f74cb",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1216,
+        "y": 1325,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "99806796.f1f338",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 859.5,
+        "y": 1463,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "ffafbd3d.43709"
+            ]
+        ]
+    },
+    {
+        "id": "ea23ac7b.49a0e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1171.5,
+        "y": 1433,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "1fdbfea9.06f971",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 599,
+        "y": 1735,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "b234c218.56c75",
+                "d7567c2b.d744d",
+                "da086275.9fed4",
+                "9dc682c9.2b9f6"
+            ]
+        ]
+    },
+    {
+        "id": "b234c218.56c75",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 738,
+        "y": 1694,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "9e0dc2de.70214"
+            ]
+        ]
+    },
+    {
+        "id": "8370fc5d.bbbb6",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 607,
+        "y": 1649,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "76e5208f.cb277",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1065,
+        "y": 1662,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "624e9330.541bbc",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1077,
+        "y": 1720,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d6e62384.c44eb",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 169,
+        "y": 1712,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "14677342.8acb9d"
+            ]
+        ]
+    },
+    {
+        "id": "14677342.8acb9d",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 415,
+        "y": 1711,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "1fdbfea9.06f971",
+                "8370fc5d.bbbb6"
+            ]
+        ]
+    },
+    {
+        "id": "d7567c2b.d744d",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 751,
+        "y": 1830,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "ad4c759a.2f2898"
+            ]
+        ]
+    },
+    {
+        "id": "986204b7.0e72d8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 1021,
+        "y": 1796,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "5e457023.84189",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1092,
+        "y": 1850,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "da086275.9fed4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 715,
+        "y": 1933,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "287e67.d378d19a"
+            ]
+        ]
+    },
+    {
+        "id": "2bbf429f.61555e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 1032,
+        "y": 1901,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "d21d0e47.828fe",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1084,
+        "y": 1981,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9dc682c9.2b9f6",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 637.5,
+        "y": 2048,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "5ba96bee.3ec3d4"
+            ]
+        ]
+    },
+    {
+        "id": "22448edc.1c06a2",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 930.5,
+        "y": 2014,
+        "z": "73143c7.55534c4",
+        "wires": []
+    },
+    {
+        "id": "43ae63f9.14b1dc",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 986.5,
+        "y": 2088,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bf7cf5bd.6cd3f8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.5,
+        "y": 106,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "f1e26e1a.6f29c"
+            ]
+        ]
+    },
+    {
+        "id": "f1e26e1a.6f29c",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 134.5,
+        "y": 166,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "79406a70.446d04"
+            ]
+        ]
+    },
+    {
+        "id": "79406a70.446d04",
+        "type": "method",
+        "name": "method bandwidth-update-odu3",
+        "xml": "<method rpc='bandwidth-update-odu3' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 321.5,
+        "y": 59,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "37af137e.e2f76c"
+            ]
+        ]
+    },
+    {
+        "id": "37af137e.e2f76c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 369,
+        "y": 203,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "25cd1da9.b3f392"
+            ]
+        ]
+    },
+    {
+        "id": "42b178a2.3d8ba8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1384,
+        "y": 134,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aef28b8.b6c4b78",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1397,
+        "y": 233,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "170418bf.9dd4e7",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1376,
+        "y": 337,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "767736d7.c19918",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1320,
+        "y": 437,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8cb02fdb.f9b1f",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1230,
+        "y": 1005,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "39614b88.12fe44",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1314,
+        "y": 859,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7fbf2795.5c7328",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1343,
+        "y": 757,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "97e385a2.e3b1f8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1329,
+        "y": 647,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd933a2b.a244e8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1257,
+        "y": 1165,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3cd728ae.126d18",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1264,
+        "y": 1273,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3f6653fd.04dd4c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1244,
+        "y": 1383,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "48b19296.b91e8c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1238,
+        "y": 1496,
+        "z": "73143c7.55534c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1d32ea36.ac6196",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1188,
+        "y": 105,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "a32f2439.cb6ab8",
+                "42b178a2.3d8ba8"
+            ]
+        ]
+    },
+    {
+        "id": "e76aea9c.e12bd8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1205,
+        "y": 191,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "5aa343d7.14c6fc",
+                "aef28b8.b6c4b78"
+            ]
+        ]
+    },
+    {
+        "id": "80d48ef5.9912",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1195,
+        "y": 296,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "cef4b295.6c496",
+                "170418bf.9dd4e7"
+            ]
+        ]
+    },
+    {
+        "id": "8c7e1bd7.f41a68",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1107,
+        "y": 399,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "59568bd7.60cba4",
+                "767736d7.c19918"
+            ]
+        ]
+    },
+    {
+        "id": "606ba16.524bc6",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1129,
+        "y": 628,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "17a117e5.591708",
+                "97e385a2.e3b1f8"
+            ]
+        ]
+    },
+    {
+        "id": "31b7a978.6ce366",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1155,
+        "y": 724,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "2d2e684.a340898",
+                "7fbf2795.5c7328"
+            ]
+        ]
+    },
+    {
+        "id": "5aa134da.c5d79c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1125,
+        "y": 813,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "f96115b6.ae0958",
+                "39614b88.12fe44"
+            ]
+        ]
+    },
+    {
+        "id": "c49e735f.4d186",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1021,
+        "y": 982,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "aad0db15.cc7c18",
+                "8cb02fdb.f9b1f"
+            ]
+        ]
+    },
+    {
+        "id": "de9cb28.9f9d45",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1039,
+        "y": 1146,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "d67ef568.42cc38",
+                "fd933a2b.a244e8"
+            ]
+        ]
+    },
+    {
+        "id": "6fab0d4e.49f804",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1064,
+        "y": 1240,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "17e177eb.a9a758",
+                "3cd728ae.126d18"
+            ]
+        ]
+    },
+    {
+        "id": "ea510da.c129ff",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1064,
+        "y": 1335,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "1cffb56f.5f74cb",
+                "3f6653fd.04dd4c"
+            ]
+        ]
+    },
+    {
+        "id": "ffafbd3d.43709",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1001,
+        "y": 1460,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "ea23ac7b.49a0e",
+                "48b19296.b91e8c"
+            ]
+        ]
+    },
+    {
+        "id": "9e0dc2de.70214",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 887,
+        "y": 1688,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "76e5208f.cb277",
+                "624e9330.541bbc"
+            ]
+        ]
+    },
+    {
+        "id": "ad4c759a.2f2898",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 891,
+        "y": 1827,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "986204b7.0e72d8",
+                "5e457023.84189"
+            ]
+        ]
+    },
+    {
+        "id": "287e67.d378d19a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 861,
+        "y": 1930,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "2bbf429f.61555e",
+                "d21d0e47.828fe"
+            ]
+        ]
+    },
+    {
+        "id": "5ba96bee.3ec3d4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 769,
+        "y": 2044,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "22448edc.1c06a2",
+                "43ae63f9.14b1dc"
+            ]
+        ]
+    },
+    {
+        "id": "7a765f28.8bea6",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 712,
+        "y": 27,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "1b913f9a.27c49",
+                "eb046504.a184d8"
+            ]
+        ]
+    },
+    {
+        "id": "7d7cd2ec.065b2c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 653,
+        "y": 524,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "f02b9dc0.9a744",
+                "13b57033.9951"
+            ]
+        ]
+    },
+    {
+        "id": "712de01.298dd2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 528,
+        "y": 1012,
+        "z": "73143c7.55534c4",
+        "wires": [
+            [
+                "d69e06e0.b960b8",
+                "d3523aa7.075c48"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu4.json b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu4.json
new file mode 100644
index 00000000..47d4391f
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update-odu4.json
@@ -0,0 +1,1998 @@
+[
+    {
+        "id": "e3feee36.dfc57",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 911,
+        "y": 188,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "8c8b0340.fea55",
+                "bbae384a.c600d8",
+                "81fb76a8.ffe2f8",
+                "ec837101.493ce",
+                "4f3806a1.3db668"
+            ]
+        ]
+    },
+    {
+        "id": "8c8b0340.fea55",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1050,
+        "y": 147,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "349a0c0c.fe1ba4"
+            ]
+        ]
+    },
+    {
+        "id": "d2e27b7b.5c60a8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 919,
+        "y": 102,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "d77d3b20.4deaf8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 1.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1353,
+        "y": 85,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "b7144f81.df566",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 631,
+        "y": 135,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "f63ce118.af64a"
+            ]
+        ]
+    },
+    {
+        "id": "79a768dc.a905b8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 500,
+        "y": 191,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "b7144f81.df566",
+                "c9bcd5cc.2d7a38",
+                "bb3aa450.7afcd8",
+                "3fe43b1f.6606f4",
+                "c20ced2c.54286"
+            ]
+        ]
+    },
+    {
+        "id": "e749c854.0dc6c8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 821,
+        "y": 139,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "e3feee36.dfc57",
+                "d2e27b7b.5c60a8"
+            ]
+        ]
+    },
+    {
+        "id": "bbae384a.c600d8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1063,
+        "y": 283,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "38c2eecb.ad0df2"
+            ]
+        ]
+    },
+    {
+        "id": "95485793.c9cb48",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1320,
+        "y": 238,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "1dc3bc82.c95123",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 788,
+        "y": 39,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "81fb76a8.ffe2f8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1027,
+        "y": 386,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "54d432b1.c4d86c"
+            ]
+        ]
+    },
+    {
+        "id": "f2edcadd.b7afc8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1324,
+        "y": 358,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "ec837101.493ce",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 949.5,
+        "y": 501,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d3c54b7f.d37ce8"
+            ]
+        ]
+    },
+    {
+        "id": "dd9d755f.f70388",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 1251.5,
+        "y": 473,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "cce12306.4f347",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 126,
+        "y": 148,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d14b0a8.027a7f8"
+            ]
+        ]
+    },
+    {
+        "id": "d14b0a8.027a7f8",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 139,
+        "y": 208,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "da99be36.fe011"
+            ]
+        ]
+    },
+    {
+        "id": "da99be36.fe011",
+        "type": "method",
+        "name": "method bandwidth-update-odu4",
+        "xml": "<method rpc='bandwidth-update-odu4' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 323,
+        "y": 101,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "c5e7c025.0f62c"
+            ]
+        ]
+    },
+    {
+        "id": "c5e7c025.0f62c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 373.5,
+        "y": 245,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "79a768dc.a905b8"
+            ]
+        ]
+    },
+    {
+        "id": "4f3806a1.3db668",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 859,
+        "y": 632,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "f41938e6.1bebe8"
+            ]
+        ]
+    },
+    {
+        "id": "2adc2f40.dc7d4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1194,
+        "y": 607,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "4cf1c380.32bbdc",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 704,
+        "y": 829,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "265152f.0b59fae",
+                "9ce3dd24.3e3c7",
+                "a19a912a.fe52f",
+                "f470a7e3.298178",
+                "f79cb52.e73e448"
+            ]
+        ]
+    },
+    {
+        "id": "265152f.0b59fae",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 843,
+        "y": 788,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "fd01f978.0f3698"
+            ]
+        ]
+    },
+    {
+        "id": "4d185c07.cc41d4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 712,
+        "y": 743,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "1a2eb6ab.8d8199",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 2.5 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1123,
+        "y": 765,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "c9bcd5cc.2d7a38",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 424,
+        "y": 776,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "30b73784.022928"
+            ]
+        ]
+    },
+    {
+        "id": "c4b29e77.0b02a",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 612,
+        "y": 786,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "4cf1c380.32bbdc",
+                "4d185c07.cc41d4"
+            ]
+        ]
+    },
+    {
+        "id": "9ce3dd24.3e3c7",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 856,
+        "y": 924,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "952f6f66.9b3a7"
+            ]
+        ]
+    },
+    {
+        "id": "3389c8d8.7dc548",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1170,
+        "y": 898,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "57d6620f.6163cc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 715,
+        "y": 613,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "a19a912a.fe52f",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 820,
+        "y": 1027,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "50fc2c72.542084"
+            ]
+        ]
+    },
+    {
+        "id": "5e807b52.3b6674",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1118,
+        "y": 1015,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "f470a7e3.298178",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 742.5,
+        "y": 1142,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "e42e2444.15dd28"
+            ]
+        ]
+    },
+    {
+        "id": "b0c44c3f.e472",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 995.5,
+        "y": 1143,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "f79cb52.e73e448",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 652,
+        "y": 1273,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "74474581.b5e87c"
+            ]
+        ]
+    },
+    {
+        "id": "9570111b.094dd",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 915,
+        "y": 1252,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "bf7d6c6b.e0ece",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 555,
+        "y": 1476,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "b561742b.cd28e8",
+                "fa15bcfc.6af83",
+                "61666fc.db1569",
+                "f1e48908.aaabd8",
+                "8f4f4b48.14a0b8"
+            ]
+        ]
+    },
+    {
+        "id": "b561742b.cd28e8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 694,
+        "y": 1435,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "23fa6a55.3ea336"
+            ]
+        ]
+    },
+    {
+        "id": "985f9b24.eeace8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 563,
+        "y": 1390,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "3049243b.bf71ec",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 10 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 961,
+        "y": 1437,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "bb3aa450.7afcd8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 275,
+        "y": 1423,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "61e4c74f.7d0068"
+            ]
+        ]
+    },
+    {
+        "id": "3f1ddc4f.602e34",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 419,
+        "y": 1441,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "bf7d6c6b.e0ece",
+                "985f9b24.eeace8"
+            ]
+        ]
+    },
+    {
+        "id": "fa15bcfc.6af83",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 707,
+        "y": 1571,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "f9ec6aee.e4c848"
+            ]
+        ]
+    },
+    {
+        "id": "79ac5779.cefe88",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 969,
+        "y": 1546,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "99a06c04.fc087",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 498,
+        "y": 1306,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "61666fc.db1569",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 671,
+        "y": 1674,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "94357a7.a130f88"
+            ]
+        ]
+    },
+    {
+        "id": "15aa4115.225e1f",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 953,
+        "y": 1646,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "f1e48908.aaabd8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 593.5,
+        "y": 1789,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "8dce08fb.34cdb8"
+            ]
+        ]
+    },
+    {
+        "id": "d72c3e8d.b95f1",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 874.5,
+        "y": 1784,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "8f4f4b48.14a0b8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 503,
+        "y": 1920,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "425a258e.6c173c"
+            ]
+        ]
+    },
+    {
+        "id": "29176cbc.abf4c4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 781,
+        "y": 1914,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "c8cc7f5b.29157",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 485,
+        "y": 2130,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "95fe5423.8d72f8",
+                "c6923f1c.db161",
+                "c2f012bc.b8b8b",
+                "e958d54f.06a758",
+                "66b70ac8.ccefd4"
+            ]
+        ]
+    },
+    {
+        "id": "95fe5423.8d72f8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 624,
+        "y": 2089,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "1bf49ff2.464d4"
+            ]
+        ]
+    },
+    {
+        "id": "77e3b83.e43a648",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 493,
+        "y": 2044,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "d19285ad.4d90a8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 40 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 891,
+        "y": 2066,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "3fe43b1f.6606f4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 205,
+        "y": 2077,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "c2791d26.93119"
+            ]
+        ]
+    },
+    {
+        "id": "7726f454.56bf9c",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 386,
+        "y": 2070,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "c8cc7f5b.29157",
+                "77e3b83.e43a648"
+            ]
+        ]
+    },
+    {
+        "id": "c6923f1c.db161",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 637,
+        "y": 2225,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "55d9ef5.6d3f01"
+            ]
+        ]
+    },
+    {
+        "id": "b2271a07.74ec28",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 889,
+        "y": 2221,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "89ba325e.4bc83",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 436,
+        "y": 1984,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "c2f012bc.b8b8b",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 601,
+        "y": 2328,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "924b471a.324748"
+            ]
+        ]
+    },
+    {
+        "id": "f1edcf75.5da63",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 887,
+        "y": 2326,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "e958d54f.06a758",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 523.5,
+        "y": 2443,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "4afed28.6e4ed2c"
+            ]
+        ]
+    },
+    {
+        "id": "d286e908.53cd68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 794.5,
+        "y": 2437,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "66b70ac8.ccefd4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 433,
+        "y": 2574,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "49cef9bf.0a62e8"
+            ]
+        ]
+    },
+    {
+        "id": "99bb505e.aea4d",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 741,
+        "y": 2566,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "763ed9fe.b41af8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 467,
+        "y": 2803,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "3c67a2b6.56ec0e",
+                "5db1fe3e.c50c4",
+                "3f5a2e5b.807e42",
+                "a57f36b0.498bb8",
+                "e74b0463.901ba8"
+            ]
+        ]
+    },
+    {
+        "id": "3c67a2b6.56ec0e",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 606,
+        "y": 2762,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "7b44fdae.dba374"
+            ]
+        ]
+    },
+    {
+        "id": "ccbab50d.fb1c08",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 475,
+        "y": 2717,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "b6bdc28d.0a9d1",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 878,
+        "y": 2740,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "c20ced2c.54286",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 187,
+        "y": 2750,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "80ac6d40.b471f"
+            ]
+        ]
+    },
+    {
+        "id": "80ac6d40.b471f",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 331,
+        "y": 2768,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "763ed9fe.b41af8",
+                "ccbab50d.fb1c08"
+            ]
+        ]
+    },
+    {
+        "id": "5db1fe3e.c50c4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 619,
+        "y": 2898,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "a1a1153c.aaf6a8"
+            ]
+        ]
+    },
+    {
+        "id": "37f02bd6.a3bc34",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 874,
+        "y": 2872,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "3f5a2e5b.807e42",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 583,
+        "y": 3001,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "9682ea99.385bb8"
+            ]
+        ]
+    },
+    {
+        "id": "5fa94b20.fa80a4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 856,
+        "y": 3001,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "a57f36b0.498bb8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 505.5,
+        "y": 3116,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d48499c7.7a7708"
+            ]
+        ]
+    },
+    {
+        "id": "48180881.455f58",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 850.5,
+        "y": 3113,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "e74b0463.901ba8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 415,
+        "y": 3247,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "984049b4.f3f768"
+            ]
+        ]
+    },
+    {
+        "id": "194a38c2.ba5f17",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />",
+        "comments": "",
+        "x": 732,
+        "y": 3226,
+        "z": "cf306303.ef4a7",
+        "wires": []
+    },
+    {
+        "id": "692a2465.ed0e4c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396,
+        "y": 156,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "349a0c0c.fe1ba4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1183,
+        "y": 143,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d77d3b20.4deaf8",
+                "692a2465.ed0e4c"
+            ]
+        ]
+    },
+    {
+        "id": "38c2eecb.ad0df2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1191,
+        "y": 282,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "95485793.c9cb48",
+                "1bb4b679.b5f7aa"
+            ]
+        ]
+    },
+    {
+        "id": "54d432b1.c4d86c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1152,
+        "y": 384,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "f2edcadd.b7afc8",
+                "a605a893.aa9e08"
+            ]
+        ]
+    },
+    {
+        "id": "d3c54b7f.d37ce8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1089,
+        "y": 500,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "dd9d755f.f70388",
+                "9a31744f.663728"
+            ]
+        ]
+    },
+    {
+        "id": "f41938e6.1bebe8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1000,
+        "y": 629,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "2adc2f40.dc7d4",
+                "db36b1ce.29afa"
+            ]
+        ]
+    },
+    {
+        "id": "1bb4b679.b5f7aa",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1391,
+        "y": 295,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a605a893.aa9e08",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1347,
+        "y": 418,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9a31744f.663728",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1299,
+        "y": 535,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "db36b1ce.29afa",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252,
+        "y": 664,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd01f978.0f3698",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 974,
+        "y": 791,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "1a2eb6ab.8d8199",
+                "7b8b1c71.d4b564"
+            ]
+        ]
+    },
+    {
+        "id": "952f6f66.9b3a7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 995,
+        "y": 917,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "3389c8d8.7dc548",
+                "89e6c787.5eaec8"
+            ]
+        ]
+    },
+    {
+        "id": "50fc2c72.542084",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 959,
+        "y": 1022,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "5e807b52.3b6674",
+                "dd906860.1e0508"
+            ]
+        ]
+    },
+    {
+        "id": "e42e2444.15dd28",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 877,
+        "y": 1142,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "b0c44c3f.e472",
+                "a4b23de1.e4be2"
+            ]
+        ]
+    },
+    {
+        "id": "74474581.b5e87c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 792,
+        "y": 1266,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "9570111b.094dd",
+                "ad791da9.09703"
+            ]
+        ]
+    },
+    {
+        "id": "7b8b1c71.d4b564",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1176,
+        "y": 820,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "89e6c787.5eaec8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1217,
+        "y": 952,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dd906860.1e0508",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186,
+        "y": 1063,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a4b23de1.e4be2",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1103,
+        "y": 1194,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ad791da9.09703",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 979,
+        "y": 1297,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "23fa6a55.3ea336",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 831,
+        "y": 1436,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "3049243b.bf71ec",
+                "d3f85039.043cd"
+            ]
+        ]
+    },
+    {
+        "id": "f9ec6aee.e4c848",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 840,
+        "y": 1569,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "79ac5779.cefe88",
+                "38258153.d7527e"
+            ]
+        ]
+    },
+    {
+        "id": "94357a7.a130f88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 806,
+        "y": 1672,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "15aa4115.225e1f",
+                "91a910f5.57bfe"
+            ]
+        ]
+    },
+    {
+        "id": "8dce08fb.34cdb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 739,
+        "y": 1787,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d72c3e8d.b95f1",
+                "87d5be5d.2b207"
+            ]
+        ]
+    },
+    {
+        "id": "425a258e.6c173c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 643,
+        "y": 1915,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "29176cbc.abf4c4",
+                "649070e6.751a3"
+            ]
+        ]
+    },
+    {
+        "id": "d3f85039.043cd",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1018,
+        "y": 1488,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "38258153.d7527e",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1041,
+        "y": 1599,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "91a910f5.57bfe",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 996,
+        "y": 1706,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "87d5be5d.2b207",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 950,
+        "y": 1844,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "649070e6.751a3",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 870,
+        "y": 1963,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1bf49ff2.464d4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 766,
+        "y": 2066,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d19285ad.4d90a8",
+                "79bcc46a.422fdc"
+            ]
+        ]
+    },
+    {
+        "id": "55d9ef5.6d3f01",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 766,
+        "y": 2225,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "b2271a07.74ec28",
+                "cc056ff9.228ea"
+            ]
+        ]
+    },
+    {
+        "id": "924b471a.324748",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 726,
+        "y": 2329,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "f1edcf75.5da63",
+                "93cf8bc1.5dacb8"
+            ]
+        ]
+    },
+    {
+        "id": "4afed28.6e4ed2c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 670,
+        "y": 2445,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "d286e908.53cd68",
+                "6c9cc97c.0f7638"
+            ]
+        ]
+    },
+    {
+        "id": "49cef9bf.0a62e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 572,
+        "y": 2564,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "99bb505e.aea4d",
+                "1a3d11cb.c21c6e"
+            ]
+        ]
+    },
+    {
+        "id": "79bcc46a.422fdc",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 966,
+        "y": 2115,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cc056ff9.228ea",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 973,
+        "y": 2273,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "93cf8bc1.5dacb8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 934,
+        "y": 2384,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6c9cc97c.0f7638",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 869,
+        "y": 2491,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1a3d11cb.c21c6e",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 746,
+        "y": 2627,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c0951d6c.a967f",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 946,
+        "y": 2788,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9d11608f.d4f13",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 938,
+        "y": 2930,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fbbe414c.78665",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 915,
+        "y": 3046,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e8ac631c.1e37",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 873,
+        "y": 3163,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "44c3bcb0.5e6ad4",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 817,
+        "y": 3284,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7b44fdae.dba374",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 751,
+        "y": 2753,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "b6bdc28d.0a9d1",
+                "c0951d6c.a967f"
+            ]
+        ]
+    },
+    {
+        "id": "a1a1153c.aaf6a8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 760,
+        "y": 2898,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "37f02bd6.a3bc34",
+                "9d11608f.d4f13"
+            ]
+        ]
+    },
+    {
+        "id": "9682ea99.385bb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 714,
+        "y": 3000,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "5fa94b20.fa80a4",
+                "fbbe414c.78665"
+            ]
+        ]
+    },
+    {
+        "id": "d48499c7.7a7708",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 663,
+        "y": 3116,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "48180881.455f58",
+                "e8ac631c.1e37"
+            ]
+        ]
+    },
+    {
+        "id": "984049b4.f3f768",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 563,
+        "y": 3243,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "194a38c2.ba5f17",
+                "44c3bcb0.5e6ad4"
+            ]
+        ]
+    },
+    {
+        "id": "f63ce118.af64a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 680,
+        "y": 80,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "1dc3bc82.c95123",
+                "e749c854.0dc6c8"
+            ]
+        ]
+    },
+    {
+        "id": "30b73784.022928",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 598,
+        "y": 667,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "57d6620f.6163cc",
+                "c4b29e77.0b02a"
+            ]
+        ]
+    },
+    {
+        "id": "61e4c74f.7d0068",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 372,
+        "y": 1313,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "99a06c04.fc087",
+                "3f1ddc4f.602e34"
+            ]
+        ]
+    },
+    {
+        "id": "c2791d26.93119",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 301,
+        "y": 1959,
+        "z": "cf306303.ef4a7",
+        "wires": [
+            [
+                "89ba325e.4bc83",
+                "7726f454.56bf9c"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update.json b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update.json
new file mode 100644
index 00000000..4a83b131
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_bandwidth-update.json
@@ -0,0 +1,535 @@
+[
+    {
+        "id": "18085ebe.2080b1",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 491,
+        "y": 263,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "18152330.c91add"
+            ]
+        ]
+    },
+    {
+        "id": "18152330.c91add",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 612,
+        "y": 162,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "c668a8ef.03ace8",
+                "d1cff404.96b3b8"
+            ]
+        ]
+    },
+    {
+        "id": "66893dd3.7d6d44",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 974,
+        "y": 344,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "81ac4ffe.df305"
+            ]
+        ]
+    },
+    {
+        "id": "81ac4ffe.df305",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1097,
+        "y": 339,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "3c2d54e2.97184c"
+            ]
+        ]
+    },
+    {
+        "id": "915a7aed.6d9c68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n",
+        "comments": "",
+        "x": 1029,
+        "y": 243,
+        "z": "ad8c454f.e636c8",
+        "wires": []
+    },
+    {
+        "id": "3133f444.5a5e1c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`0`' />\n",
+        "comments": "",
+        "x": 1371,
+        "y": 313,
+        "z": "ad8c454f.e636c8",
+        "wires": []
+    },
+    {
+        "id": "6b05b797.6dcc48",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1423,
+        "y": 372,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "da084d00.a23f5",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 897,
+        "y": 187,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "632c39.072c73c8"
+            ]
+        ]
+    },
+    {
+        "id": "c668a8ef.03ace8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 770,
+        "y": 187,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "da084d00.a23f5"
+            ]
+        ]
+    },
+    {
+        "id": "632c39.072c73c8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 781,
+        "y": 294,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "47c4c7c8.0b4c88"
+            ]
+        ]
+    },
+    {
+        "id": "97eda245.3bd94",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$pin.speed-value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 258,
+        "y": 277,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "18085ebe.2080b1",
+                "6336ec43.215354",
+                "4af01397.f0721c",
+                "13671476.30978c",
+                "8fdcca3.ccd1438"
+            ]
+        ]
+    },
+    {
+        "id": "6336ec43.215354",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 535,
+        "y": 377,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "2ac5f263.9388fe"
+            ]
+        ]
+    },
+    {
+        "id": "4af01397.f0721c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 514,
+        "y": 479,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "4c19e4dc.f77c2c"
+            ]
+        ]
+    },
+    {
+        "id": "13671476.30978c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 457,
+        "y": 578,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "8fbd05d3.328318"
+            ]
+        ]
+    },
+    {
+        "id": "8fdcca3.ccd1438",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 321,
+        "y": 705,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "89103495.e05898"
+            ]
+        ]
+    },
+    {
+        "id": "2ac5f263.9388fe",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 691,
+        "y": 378,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "5316c08.338af4",
+                "e98e80e5.101d1"
+            ]
+        ]
+    },
+    {
+        "id": "4c19e4dc.f77c2c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 684,
+        "y": 482,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "50c6b9ba.7e87b8",
+                "5d79d201.e7950c"
+            ]
+        ]
+    },
+    {
+        "id": "8fbd05d3.328318",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 641,
+        "y": 576,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "c6c0c526.a7b418",
+                "ca06e916.be11d8"
+            ]
+        ]
+    },
+    {
+        "id": "89103495.e05898",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 478,
+        "y": 707,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "153b1907.652237",
+                "b455fb41.56e658"
+            ]
+        ]
+    },
+    {
+        "id": "5316c08.338af4",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside bandwidth odu1 calculation\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 870,
+        "y": 384,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "50c6b9ba.7e87b8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside bandwidth odu2 calculation\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 861,
+        "y": 481,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c6c0c526.a7b418",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside bandwidth odu3 calculation\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 807,
+        "y": 576,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "153b1907.652237",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside bandwidth odu4 calculation\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 650,
+        "y": 676,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d1cff404.96b3b8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside bandwidth odu0 calculation\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 789,
+        "y": 125,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ca06e916.be11d8",
+        "type": "call",
+        "name": "call bandwidth-update-odu3",
+        "xml": "<call module='optical-service' rpc='bandwidth-update-odu3' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 847,
+        "y": 629,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b455fb41.56e658",
+        "type": "call",
+        "name": "call bandwidth-update-odu4",
+        "xml": "<call module='optical-service' rpc='bandwidth-update-odu4' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 697,
+        "y": 739,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e98e80e5.101d1",
+        "type": "call",
+        "name": "call bandwidth-update-odu1",
+        "xml": "<call module='optical-service' rpc='bandwidth-update-odu1' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 921,
+        "y": 430,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5d79d201.e7950c",
+        "type": "call",
+        "name": "call bandwidth-update-odu2",
+        "xml": "<call module='optical-service' rpc='bandwidth-update-odu2' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 907,
+        "y": 533,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "24d31db6.2991f2",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 107.5,
+        "y": 96,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "e91758dd.a9f1e8"
+            ]
+        ]
+    },
+    {
+        "id": "e91758dd.a9f1e8",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 134.5,
+        "y": 166,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "9d59d2a1.9e885"
+            ]
+        ]
+    },
+    {
+        "id": "9d59d2a1.9e885",
+        "type": "method",
+        "name": "method bandwidth-update",
+        "xml": "<method rpc='bandwidth-update' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 321.5,
+        "y": 59,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "2cba60b2.bce73"
+            ]
+        ]
+    },
+    {
+        "id": "2cba60b2.bce73",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 369,
+        "y": 203,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "97eda245.3bd94"
+            ]
+        ]
+    },
+    {
+        "id": "3c2d54e2.97184c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1242,
+        "y": 329,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "3133f444.5a5e1c",
+                "6b05b797.6dcc48"
+            ]
+        ]
+    },
+    {
+        "id": "47c4c7c8.0b4c88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 903,
+        "y": 290,
+        "z": "ad8c454f.e636c8",
+        "wires": [
+            [
+                "915a7aed.6d9c68",
+                "66893dd3.7d6d44"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_call-bandwidth-update-pinterface.json b/platform-logic/optical-service/src/main/json/optical-service_call-bandwidth-update-pinterface.json
new file mode 100644
index 00000000..120045ba
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_call-bandwidth-update-pinterface.json
@@ -0,0 +1,263 @@
+[
+    {
+        "id": "eea3e631.4d9b68",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 186,
+        "y": 126,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "cb6680a1.3045c"
+            ]
+        ]
+    },
+    {
+        "id": "cb6680a1.3045c",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 199,
+        "y": 186,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "fe24bdb7.c56f2"
+            ]
+        ]
+    },
+    {
+        "id": "fe24bdb7.c56f2",
+        "type": "method",
+        "name": "method call-bandwidth-update-pinterface",
+        "xml": "<method rpc='call-bandwidth-update-pinterface' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 219,
+        "y": 266,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "f4138d82.af408"
+            ]
+        ]
+    },
+    {
+        "id": "f4138d82.af408",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 465.5,
+        "y": 265,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "644acd06.205cc4",
+                "9946b93e.6bd4e8",
+                "35af83ac.5dff5c"
+            ]
+        ]
+    },
+    {
+        "id": "644acd06.205cc4",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/test.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$div`\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 621,
+        "y": 105,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f55c6dd9.5cdaa",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`0`' />\n",
+        "comments": "",
+        "x": 1768,
+        "y": 299,
+        "z": "75b8fd05.797274",
+        "wires": []
+    },
+    {
+        "id": "79209df4.edd3e4",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1823,
+        "y": 353,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9946b93e.6bd4e8",
+        "type": "get-resource",
+        "name": "find if interface is uni or nni or enni",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND depth = 'all'\"\npfx='pin'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 754,
+        "y": 179,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "35af83ac.5dff5c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$pin.network-interface-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 644,
+        "y": 262,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "e2e8e64.ad89518",
+                "2d42a8a.f473958"
+            ]
+        ]
+    },
+    {
+        "id": "60b2bda3.41fbd4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 951,
+        "y": 250,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "301928f8.f38eb8",
+                "64426912.b5d438"
+            ]
+        ]
+    },
+    {
+        "id": "301928f8.f38eb8",
+        "type": "call",
+        "name": "call bandwidth update",
+        "xml": "<call module='optical-service' rpc='bandwidth-update' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1160,
+        "y": 249,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e2e8e64.ad89518",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='UNI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 756,
+        "y": 360,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "97cc233d.bc8a6"
+            ]
+        ]
+    },
+    {
+        "id": "97cc233d.bc8a6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 926,
+        "y": 365,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "7a8337c7.492958",
+                "118d5528.b1e21b"
+            ]
+        ]
+    },
+    {
+        "id": "7a8337c7.492958",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name' \n      local-only='false'>\n<parameter name='available-capacity' value='0' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1161,
+        "y": 399,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "64426912.b5d438",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Port is NNI\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1092,
+        "y": 191,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "118d5528.b1e21b",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Port is UNI\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1110,
+        "y": 308,
+        "z": "75b8fd05.797274",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2d42a8a.f473958",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 790,
+        "y": 264,
+        "z": "75b8fd05.797274",
+        "wires": [
+            [
+                "60b2bda3.41fbd4"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json b/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json
new file mode 100644
index 00000000..6926f79a
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json
@@ -0,0 +1,325 @@
+[
+    {
+        "id": "ef271e98.1343d",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 225.5555419921875,
+        "y": 244.44442749023438,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "69929ea4.2407d"
+            ]
+        ]
+    },
+    {
+        "id": "69929ea4.2407d",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 412.5555419921875,
+        "y": 193.44442749023438,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "926e362a.257c68"
+            ]
+        ]
+    },
+    {
+        "id": "926e362a.257c68",
+        "type": "method",
+        "name": "method",
+        "xml": "<method rpc='create-service-async' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 266.5555419921875,
+        "y": 367.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "1e677fcc.18edb"
+            ]
+        ]
+    },
+    {
+        "id": "1e677fcc.18edb",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 439.5555419921875,
+        "y": 366.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "570787b6.c60918",
+                "8b32ac88.06a0b",
+                "d11ad8e1.0343c8"
+            ]
+        ]
+    },
+    {
+        "id": "570787b6.c60918",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Create Service Async\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 612.5555419921875,
+        "y": 277.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "28c538c4.2302f8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Finished updating service in AAI and DB to CREATED\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1140.5555419921875,
+        "y": 359.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5e382c44.972184",
+        "type": "update",
+        "name": "update AAI service 'CREATED'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='service-instance'\n     key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $output.service-instance-id' \n      local-only='false'>\n<parameter name='orchestration-status' value='CREATED' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1163.5555419921875,
+        "y": 227.44442749023438,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "11f258cf.0cfbe7",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='200'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 744.5555419921875,
+        "y": 328.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "6823decd.1c0f4"
+            ]
+        ]
+    },
+    {
+        "id": "1f9398a1.9403f7",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 735.5555419921875,
+        "y": 440.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "a0d9ffaf.322a"
+            ]
+        ]
+    },
+    {
+        "id": "6823decd.1c0f4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 914.5555419921875,
+        "y": 306.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "28c538c4.2302f8",
+                "5e382c44.972184",
+                "8124c756.1dde88",
+                "15476d01.4a1043"
+            ]
+        ]
+    },
+    {
+        "id": "a0d9ffaf.322a",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 907.5555419921875,
+        "y": 443.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "20546055.63c8f",
+                "7353aa4c.564df4"
+            ]
+        ]
+    },
+    {
+        "id": "8b32ac88.06a0b",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$response-code`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 613.5555419921875,
+        "y": 366.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "11f258cf.0cfbe7",
+                "1f9398a1.9403f7"
+            ]
+        ]
+    },
+    {
+        "id": "8124c756.1dde88",
+        "type": "save",
+        "name": "update DB 'CREATED'",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $request-id'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1177.5555419921875,
+        "y": 299.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "20546055.63c8f",
+        "type": "call",
+        "name": "call",
+        "xml": "<call module='optical-service' rpc='aai-delete-service-handling' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1058.5555419921875,
+        "y": 471.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d11ad8e1.0343c8",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.template.so.response.filename`\" />\n<parameter name=\"restapiUrl\" value=\"`$output.notification-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.so.username`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.so.password`\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"so-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 600.5555419921875,
+        "y": 501.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "7c0eb31b.04d7bc",
+                "f4076cb2.329c4"
+            ]
+        ]
+    },
+    {
+        "id": "7c0eb31b.04d7bc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 762.5555419921875,
+        "y": 494.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "d698b0bd.4bbda"
+            ]
+        ]
+    },
+    {
+        "id": "f4076cb2.329c4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 764.5555419921875,
+        "y": 564.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            [
+                "43f03cc3.9bf324"
+            ]
+        ]
+    },
+    {
+        "id": "d698b0bd.4bbda",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Send to SO fails for service create\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 904.5555419921875,
+        "y": 494.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "43f03cc3.9bf324",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Send to SO Success for service create\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 904.5555419921875,
+        "y": 564.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "15476d01.4a1043",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-message' value='SUCCESS' />\n",
+        "comments": "",
+        "x": 1073.5555419921875,
+        "y": 146.44442749023438,
+        "z": "d7735114.f6066",
+        "wires": []
+    },
+    {
+        "id": "7353aa4c.564df4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-message' value='FAILURE' />\n",
+        "comments": "",
+        "x": 1052.5555419921875,
+        "y": 401.4444274902344,
+        "z": "d7735114.f6066",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu1.json b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu1.json
new file mode 100644
index 00000000..d9ec517c
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu1.json
@@ -0,0 +1,454 @@
+[
+    {
+        "id": "14cf1df4.f54662",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 993.5,
+        "y": 264,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "4b4c9586.60ad3c",
+                "50fa7b63.da3bc4"
+            ]
+        ]
+    },
+    {
+        "id": "4b4c9586.60ad3c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1126.5,
+        "y": 233,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "306779ca.c7fe56"
+            ]
+        ]
+    },
+    {
+        "id": "9426ab97.b5f1b8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n",
+        "comments": "",
+        "x": 998.5,
+        "y": 186,
+        "z": "9d563055.a9c91",
+        "wires": []
+    },
+    {
+        "id": "932a9498.ee5f98",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='mul' value='`$odu-number * 1.25`' />\n<parameter name='add' value='`$new-rate + $mul + 1.25`' />\n<parameter name='new-odu-number' value='`$add / 1.25`' />\n\n",
+        "comments": "",
+        "x": 1360.5,
+        "y": 161,
+        "z": "9d563055.a9c91",
+        "wires": []
+    },
+    {
+        "id": "2c328c57.512f64",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 717.5,
+        "y": 210,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "f515e19a.c4eb9"
+            ]
+        ]
+    },
+    {
+        "id": "147a7157.aff1bf",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 641.5,
+        "y": 328,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "2c328c57.512f64",
+                "6b124827.5aa0d8"
+            ]
+        ]
+    },
+    {
+        "id": "f515e19a.c4eb9",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 855.5,
+        "y": 217,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "14cf1df4.f54662",
+                "9426ab97.b5f1b8",
+                "540fc918.04e698"
+            ]
+        ]
+    },
+    {
+        "id": "50fa7b63.da3bc4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1125.5,
+        "y": 348,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "3aa7a5af.1f725a"
+            ]
+        ]
+    },
+    {
+        "id": "98ca9a7a.b1da28",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1400.5,
+        "y": 316,
+        "z": "9d563055.a9c91",
+        "wires": []
+    },
+    {
+        "id": "bcd896ea.134ef8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1007.5,
+        "y": 544,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "734120af.333b1",
+                "e334adc6.74e18"
+            ]
+        ]
+    },
+    {
+        "id": "734120af.333b1",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1148.5,
+        "y": 536,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "dcf100f.11c2f"
+            ]
+        ]
+    },
+    {
+        "id": "dedfd85.da6a228",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n",
+        "comments": "",
+        "x": 1012.5,
+        "y": 466,
+        "z": "9d563055.a9c91",
+        "wires": []
+    },
+    {
+        "id": "759d5016.edc78",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1350.5,
+        "y": 469,
+        "z": "9d563055.a9c91",
+        "wires": []
+    },
+    {
+        "id": "6b124827.5aa0d8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 718.5,
+        "y": 490,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "6b0aeeeb.a0e81"
+            ]
+        ]
+    },
+    {
+        "id": "6b0aeeeb.a0e81",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 869.5,
+        "y": 497,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "bcd896ea.134ef8",
+                "dedfd85.da6a228"
+            ]
+        ]
+    },
+    {
+        "id": "e334adc6.74e18",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1132.5,
+        "y": 667,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "d26ccdca.365ae"
+            ]
+        ]
+    },
+    {
+        "id": "cf4ea28f.11fc6",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='1' />\n",
+        "comments": "",
+        "x": 1377.5,
+        "y": 623,
+        "z": "9d563055.a9c91",
+        "wires": []
+    },
+    {
+        "id": "27d03218.2c866e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 484.5,
+        "y": 319,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "147a7157.aff1bf"
+            ]
+        ]
+    },
+    {
+        "id": "2abadb85.1dc3d4",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 201,
+        "y": 268,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "bec96b67.883f28"
+            ]
+        ]
+    },
+    {
+        "id": "bec96b67.883f28",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 214,
+        "y": 328,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "78d1d1d9.cb848"
+            ]
+        ]
+    },
+    {
+        "id": "78d1d1d9.cb848",
+        "type": "method",
+        "name": "method delete bandwidth-update-odu1",
+        "xml": "<method rpc='delete-bandwidth-update-odu1' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 398,
+        "y": 221,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "27d03218.2c866e"
+            ]
+        ]
+    },
+    {
+        "id": "351de7e6.d55ea8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1363.5,
+        "y": 228,
+        "z": "9d563055.a9c91",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6aa1cc4f.711764",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1376.5,
+        "y": 371,
+        "z": "9d563055.a9c91",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "97686f7.b4f569",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396.5,
+        "y": 525,
+        "z": "9d563055.a9c91",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ddeda7ad.8f0998",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1327.5,
+        "y": 694,
+        "z": "9d563055.a9c91",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "306779ca.c7fe56",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1233.5,
+        "y": 161,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "932a9498.ee5f98",
+                "351de7e6.d55ea8"
+            ]
+        ]
+    },
+    {
+        "id": "3aa7a5af.1f725a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1256.5,
+        "y": 312,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "98ca9a7a.b1da28",
+                "6aa1cc4f.711764"
+            ]
+        ]
+    },
+    {
+        "id": "dcf100f.11c2f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1230.5,
+        "y": 459,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "759d5016.edc78",
+                "97686f7.b4f569"
+            ]
+        ]
+    },
+    {
+        "id": "d26ccdca.365ae",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1250.5,
+        "y": 626,
+        "z": "9d563055.a9c91",
+        "wires": [
+            [
+                "cf4ea28f.11fc6",
+                "ddeda7ad.8f0998"
+            ]
+        ]
+    },
+    {
+        "id": "540fc918.04e698",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 946,
+        "y": 104,
+        "z": "9d563055.a9c91",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu2.json b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu2.json
new file mode 100644
index 00000000..656b3652
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu2.json
@@ -0,0 +1,860 @@
+[
+    {
+        "id": "b084fa89.f01ea8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 438,
+        "y": 232,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "4a97ff4f.bfd68"
+            ]
+        ]
+    },
+    {
+        "id": "96e5a34.59f306",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1079,
+        "y": 277,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "3237c518.883aea",
+                "17eeb3ce.47776c",
+                "f581aa2a.165e38"
+            ]
+        ]
+    },
+    {
+        "id": "3237c518.883aea",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1155,
+        "y": 243,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "8941d396.ae578"
+            ]
+        ]
+    },
+    {
+        "id": "4d4152ec.e45f7c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 1061,
+        "y": 181,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "90fbbfdf.89335",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 1.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1443,
+        "y": 211,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "7de90141.291c1",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 736,
+        "y": 231,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "2095e985.399556"
+            ]
+        ]
+    },
+    {
+        "id": "4a97ff4f.bfd68",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 592,
+        "y": 231,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "7de90141.291c1",
+                "ab83f93d.af31c8",
+                "8918a3a1.0f4c3"
+            ]
+        ]
+    },
+    {
+        "id": "bbd68719.94eee8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 919,
+        "y": 219,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "96e5a34.59f306",
+                "4d4152ec.e45f7c"
+            ]
+        ]
+    },
+    {
+        "id": "17eeb3ce.47776c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1168,
+        "y": 379,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "cd9a6f0d.03ece"
+            ]
+        ]
+    },
+    {
+        "id": "998f566b.d4d9e8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1467,
+        "y": 332,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "790b63ef.5c774c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 960,
+        "y": 90,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "f581aa2a.165e38",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1132,
+        "y": 482,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "dfcbed36.411bf"
+            ]
+        ]
+    },
+    {
+        "id": "39a8fb6b.0b40a4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1436,
+        "y": 454,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "12b025be.1f759a",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1007,
+        "y": 667,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "3061fe37.c208d2",
+                "2365bc21.8d3944",
+                "725b3549.24459c"
+            ]
+        ]
+    },
+    {
+        "id": "3061fe37.c208d2",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1129,
+        "y": 621,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "c7c40fab.6345"
+            ]
+        ]
+    },
+    {
+        "id": "96e86968.dc5e98",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 998,
+        "y": 576,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "a3c6d00a.fa619",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.5 + 2.5`' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1452,
+        "y": 593,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "ab83f93d.af31c8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 710,
+        "y": 609,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "b066df18.02cae"
+            ]
+        ]
+    },
+    {
+        "id": "98be1322.5dbe2",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 884,
+        "y": 640,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "12b025be.1f759a",
+                "96e86968.dc5e98"
+            ]
+        ]
+    },
+    {
+        "id": "2365bc21.8d3944",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1142,
+        "y": 757,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "68cdb2e2.1beadc"
+            ]
+        ]
+    },
+    {
+        "id": "4a7b0de3.f782f4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1450,
+        "y": 709,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "9c6b03eb.4ea26",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 928,
+        "y": 502,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "725b3549.24459c",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1106,
+        "y": 860,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "421b157.4c954ec"
+            ]
+        ]
+    },
+    {
+        "id": "ddc39868.09efe8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />",
+        "comments": "",
+        "x": 1367,
+        "y": 826,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "1bd73569.83c83b",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 975,
+        "y": 1078,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "d2d3fe29.bb8c5",
+                "7053f4c5.cb96fc",
+                "e891798c.221d78"
+            ]
+        ]
+    },
+    {
+        "id": "d2d3fe29.bb8c5",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1195,
+        "y": 1029,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "65623413.b6a16c"
+            ]
+        ]
+    },
+    {
+        "id": "e5799259.1501c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 965,
+        "y": 995,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "bc2d2f17.5283e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1468,
+        "y": 993,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "8918a3a1.0f4c3",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 483,
+        "y": 1046,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "9bd6ab5e.2aa3f8"
+            ]
+        ]
+    },
+    {
+        "id": "9bd6ab5e.2aa3f8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 767,
+        "y": 1068,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "1bd73569.83c83b",
+                "e5799259.1501c"
+            ]
+        ]
+    },
+    {
+        "id": "7053f4c5.cb96fc",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1207,
+        "y": 1139,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "4fbc165e.af8b28"
+            ]
+        ]
+    },
+    {
+        "id": "5ec7cd6b.270684",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='0' />\n",
+        "comments": "",
+        "x": 1489,
+        "y": 1134,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "e891798c.221d78",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1172,
+        "y": 1268,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "ad049b10.0853d8"
+            ]
+        ]
+    },
+    {
+        "id": "7954d64.7fafd28",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='1' />\n",
+        "comments": "",
+        "x": 1467,
+        "y": 1232,
+        "z": "a05b184c.d06448",
+        "wires": []
+    },
+    {
+        "id": "f31d8438.407118",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 154.5,
+        "y": 181,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "a3c96eae.dff1a"
+            ]
+        ]
+    },
+    {
+        "id": "a3c96eae.dff1a",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 167.5,
+        "y": 241,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "38a440d1.a85fc"
+            ]
+        ]
+    },
+    {
+        "id": "38a440d1.a85fc",
+        "type": "method",
+        "name": "method bandwidth-update-odu2",
+        "xml": "<method rpc='delete-bandwidth-update-odu2' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351.5,
+        "y": 134,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "b084fa89.f01ea8"
+            ]
+        ]
+    },
+    {
+        "id": "6ee205eb.afea4c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1507,
+        "y": 273,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "73d5ca4b.b372c4",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1533,
+        "y": 406,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd46f3c0.e51ed",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1510,
+        "y": 500,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3eb9c961.16b566",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1522,
+        "y": 642,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5662332b.e46ebc",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1525,
+        "y": 769,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d29d5b74.ba8d28",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1440,
+        "y": 873,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "37487968.375e66",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1545,
+        "y": 1049,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "80e964ca.f77f08",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1551,
+        "y": 1177,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c2b35aea.618608",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1537,
+        "y": 1304,
+        "z": "a05b184c.d06448",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8941d396.ae578",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1291,
+        "y": 241,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "90fbbfdf.89335",
+                "6ee205eb.afea4c"
+            ]
+        ]
+    },
+    {
+        "id": "cd9a6f0d.03ece",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1316,
+        "y": 377,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "998f566b.d4d9e8",
+                "73d5ca4b.b372c4"
+            ]
+        ]
+    },
+    {
+        "id": "dfcbed36.411bf",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1282,
+        "y": 482,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "39a8fb6b.0b40a4",
+                "fd46f3c0.e51ed"
+            ]
+        ]
+    },
+    {
+        "id": "c7c40fab.6345",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1280,
+        "y": 620,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "a3c6d00a.fa619",
+                "3eb9c961.16b566"
+            ]
+        ]
+    },
+    {
+        "id": "68cdb2e2.1beadc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1282,
+        "y": 753,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "4a7b0de3.f782f4",
+                "5662332b.e46ebc"
+            ]
+        ]
+    },
+    {
+        "id": "421b157.4c954ec",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1245,
+        "y": 855,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "ddc39868.09efe8",
+                "d29d5b74.ba8d28"
+            ]
+        ]
+    },
+    {
+        "id": "65623413.b6a16c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1329,
+        "y": 1028,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "bc2d2f17.5283e",
+                "37487968.375e66"
+            ]
+        ]
+    },
+    {
+        "id": "4fbc165e.af8b28",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1343,
+        "y": 1139,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "5ec7cd6b.270684",
+                "80e964ca.f77f08"
+            ]
+        ]
+    },
+    {
+        "id": "ad049b10.0853d8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1329,
+        "y": 1265,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "7954d64.7fafd28",
+                "c2b35aea.618608"
+            ]
+        ]
+    },
+    {
+        "id": "2095e985.399556",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 847,
+        "y": 139,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "790b63ef.5c774c",
+                "bbd68719.94eee8"
+            ]
+        ]
+    },
+    {
+        "id": "b066df18.02cae",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 783,
+        "y": 524,
+        "z": "a05b184c.d06448",
+        "wires": [
+            [
+                "9c6b03eb.4ea26",
+                "98be1322.5dbe2"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu3.json b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu3.json
new file mode 100644
index 00000000..7d7bf571
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu3.json
@@ -0,0 +1,1369 @@
+[
+    {
+        "id": "8d41b76e.8319d8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 988,
+        "y": 236,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "d69353a4.24ec8",
+                "15df8587.d012ba",
+                "e34c472c.7e9bf8",
+                "245e3f1e.5d3a"
+            ]
+        ]
+    },
+    {
+        "id": "d69353a4.24ec8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127,
+        "y": 195,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "dad51fb1.76c5"
+            ]
+        ]
+    },
+    {
+        "id": "df03b509.c3f478",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 996,
+        "y": 150,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "3609827f.fcb6ce",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 1.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1420,
+        "y": 166,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "eebdd00f.806a1",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 708,
+        "y": 183,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "1626d84d.ac5288"
+            ]
+        ]
+    },
+    {
+        "id": "c473b1.dfd6cc5",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 577,
+        "y": 239,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "eebdd00f.806a1",
+                "57db244d.168dec",
+                "e47d3f3c.c7eee",
+                "9d8b96fe.e35c18"
+            ]
+        ]
+    },
+    {
+        "id": "d6696470.4af878",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 852,
+        "y": 201,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "8d41b76e.8319d8",
+                "df03b509.c3f478"
+            ]
+        ]
+    },
+    {
+        "id": "15df8587.d012ba",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1157,
+        "y": 284,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "9aebc906.7ec828"
+            ]
+        ]
+    },
+    {
+        "id": "7af77373.08ef3c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1424,
+        "y": 269,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "f8bfac2.36eb75",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 940,
+        "y": 110,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "e34c472c.7e9bf8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1126,
+        "y": 384,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "320538e5.459798"
+            ]
+        ]
+    },
+    {
+        "id": "49d2e14a.e0831",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1412,
+        "y": 381,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "245e3f1e.5d3a",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1053.5,
+        "y": 492,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "15c7f37b.3ce5cd"
+            ]
+        ]
+    },
+    {
+        "id": "a44f2f93.e33ee",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 1340.5,
+        "y": 477,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "4f82d59f.d7878c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 928.5,
+        "y": 761,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "63ef2910.e15ea8",
+                "13e7fbbe.8224c4",
+                "545acf83.d977a",
+                "e76578e3.fa2b68"
+            ]
+        ]
+    },
+    {
+        "id": "63ef2910.e15ea8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1067.5,
+        "y": 720,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "2eed2013.3103b"
+            ]
+        ]
+    },
+    {
+        "id": "2ce84401.de74fc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 936.5,
+        "y": 675,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "5d046c24.a94904",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 2.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1344.5,
+        "y": 680,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "57db244d.168dec",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 648.5,
+        "y": 708,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "1d988fc7.aaa8d"
+            ]
+        ]
+    },
+    {
+        "id": "9af7bf20.b6eca",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 835.5,
+        "y": 705,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "4f82d59f.d7878c",
+                "2ce84401.de74fc"
+            ]
+        ]
+    },
+    {
+        "id": "13e7fbbe.8224c4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1102.5,
+        "y": 813,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "de8e79cb.6adff8"
+            ]
+        ]
+    },
+    {
+        "id": "34140f7a.d40ac",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1375.5,
+        "y": 797,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "a1d8630c.b5301",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 868.5,
+        "y": 602,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "545acf83.d977a",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1060.5,
+        "y": 904,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "cd07167a.fb6828"
+            ]
+        ]
+    },
+    {
+        "id": "c2cf346e.d8f528",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1365.5,
+        "y": 903,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "e76578e3.fa2b68",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 967,
+        "y": 1074,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "d55a158d.d18d78"
+            ]
+        ]
+    },
+    {
+        "id": "8a05435f.d4353",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n\n",
+        "comments": "",
+        "x": 1233,
+        "y": 1042,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "adf37b81.78f9d8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 791.5,
+        "y": 1299,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "123b2c6c.87d394",
+                "764640ee.5307a",
+                "640e28ad.70c758",
+                "199e7d83.d11602"
+            ]
+        ]
+    },
+    {
+        "id": "123b2c6c.87d394",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 978.5,
+        "y": 1239,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "163bb21d.b7402e"
+            ]
+        ]
+    },
+    {
+        "id": "dfe59ec0.7b47f",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 817.5,
+        "y": 1193,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "a5ceaad0.7b2e98",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 10 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1278.5,
+        "y": 1202,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "e47d3f3c.c7eee",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 498.5,
+        "y": 1244,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "94b9cb3e.7a7908"
+            ]
+        ]
+    },
+    {
+        "id": "e4dfd94a.f3f8a8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 670.5,
+        "y": 1238,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "adf37b81.78f9d8",
+                "dfe59ec0.7b47f"
+            ]
+        ]
+    },
+    {
+        "id": "764640ee.5307a",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1000.5,
+        "y": 1330,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "6db1b75e.333138"
+            ]
+        ]
+    },
+    {
+        "id": "70caefc5.35b37",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1291.5,
+        "y": 1317,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "42aeb489.01833c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 709.5,
+        "y": 1040,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "640e28ad.70c758",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 994.5,
+        "y": 1430,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "e683a53a.2cb798"
+            ]
+        ]
+    },
+    {
+        "id": "bce56334.cef35",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1297.5,
+        "y": 1415,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "199e7d83.d11602",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 941,
+        "y": 1553,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "b2417e73.3411e"
+            ]
+        ]
+    },
+    {
+        "id": "c33b36cc.bdba48",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n\n",
+        "comments": "",
+        "x": 1253,
+        "y": 1523,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "661a2b7a.180074",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 680.5,
+        "y": 1825,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "dd12f2f0.8a68a",
+                "66a31a3b.1c8154",
+                "b0413d9c.7600e",
+                "96922755.f96fc8"
+            ]
+        ]
+    },
+    {
+        "id": "dd12f2f0.8a68a",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 819.5,
+        "y": 1784,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "9abceb9d.617848"
+            ]
+        ]
+    },
+    {
+        "id": "8601a47a.8c3ed8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 688.5,
+        "y": 1739,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "2d4dab4.8c6e454",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='32' />\n",
+        "comments": "",
+        "x": 1146.5,
+        "y": 1752,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "e01f4ec9.b4c58",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1158.5,
+        "y": 1810,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9d8b96fe.e35c18",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 250.5,
+        "y": 1802,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "e6692338.1522b"
+            ]
+        ]
+    },
+    {
+        "id": "e6692338.1522b",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 496.5,
+        "y": 1801,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "661a2b7a.180074",
+                "8601a47a.8c3ed8"
+            ]
+        ]
+    },
+    {
+        "id": "66a31a3b.1c8154",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 832.5,
+        "y": 1920,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "12a7c275.a1dfbe"
+            ]
+        ]
+    },
+    {
+        "id": "4d62119c.036fc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='16' />",
+        "comments": "",
+        "x": 1102.5,
+        "y": 1886,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "33303232.af288e",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1173.5,
+        "y": 1940,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b0413d9c.7600e",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 796.5,
+        "y": 2023,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "d89df4a1.349488"
+            ]
+        ]
+    },
+    {
+        "id": "d03beaa6.c50d48",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='4' />",
+        "comments": "",
+        "x": 1113.5,
+        "y": 1991,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "ec61d318.4a068",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1165.5,
+        "y": 2071,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "96922755.f96fc8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 719,
+        "y": 2138,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "e8da0845.d7dd68"
+            ]
+        ]
+    },
+    {
+        "id": "d0f4bd54.3df3c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='1' />",
+        "comments": "",
+        "x": 1012,
+        "y": 2104,
+        "z": "8a2f58b1.303d78",
+        "wires": []
+    },
+    {
+        "id": "93d95bab.ebebf8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $aend-pnf-name AND\n     p-interface.interface-name = $aend-nep AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1068,
+        "y": 2178,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8787e989.ccd598",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 203,
+        "y": 196,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "3c964252.555eae"
+            ]
+        ]
+    },
+    {
+        "id": "3c964252.555eae",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 216,
+        "y": 256,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "e7c3d6b.cd1a228"
+            ]
+        ]
+    },
+    {
+        "id": "e7c3d6b.cd1a228",
+        "type": "method",
+        "name": "method delete-bandwidth-update-odu3",
+        "xml": "<method rpc='delete-bandwidth-update-odu3' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 403,
+        "y": 149,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "da1e03d2.0ead3"
+            ]
+        ]
+    },
+    {
+        "id": "da1e03d2.0ead3",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 450.5,
+        "y": 293,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "c473b1.dfd6cc5"
+            ]
+        ]
+    },
+    {
+        "id": "7004d549.5cff0c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1465.5,
+        "y": 224,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "22d5f51.6d8c50a",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1478.5,
+        "y": 323,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3a656ecb.418852",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1457.5,
+        "y": 427,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9cf809fa.4e86d8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1401.5,
+        "y": 527,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9b5fea7b.ea5c58",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1311.5,
+        "y": 1095,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d90c61bd.7df73",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1395.5,
+        "y": 949,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e86a4f54.8b60c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1424.5,
+        "y": 847,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d30a43c5.05e1",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1410.5,
+        "y": 737,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "15df0c5e.685b84",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1338.5,
+        "y": 1255,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c63d1802.0a2cc8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1345.5,
+        "y": 1363,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c14fd025.9a0ba",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1325.5,
+        "y": 1473,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c3320388.be5e4",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1319.5,
+        "y": 1586,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dad51fb1.76c5",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1269.5,
+        "y": 195,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "3609827f.fcb6ce",
+                "7004d549.5cff0c"
+            ]
+        ]
+    },
+    {
+        "id": "9aebc906.7ec828",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1286.5,
+        "y": 281,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "7af77373.08ef3c",
+                "22d5f51.6d8c50a"
+            ]
+        ]
+    },
+    {
+        "id": "320538e5.459798",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1276.5,
+        "y": 386,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "49d2e14a.e0831",
+                "3a656ecb.418852"
+            ]
+        ]
+    },
+    {
+        "id": "15c7f37b.3ce5cd",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1188.5,
+        "y": 489,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "a44f2f93.e33ee",
+                "9cf809fa.4e86d8"
+            ]
+        ]
+    },
+    {
+        "id": "2eed2013.3103b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1210.5,
+        "y": 718,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "5d046c24.a94904",
+                "d30a43c5.05e1"
+            ]
+        ]
+    },
+    {
+        "id": "de8e79cb.6adff8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1236.5,
+        "y": 814,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "34140f7a.d40ac",
+                "e86a4f54.8b60c"
+            ]
+        ]
+    },
+    {
+        "id": "cd07167a.fb6828",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1206.5,
+        "y": 903,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "c2cf346e.d8f528",
+                "d90c61bd.7df73"
+            ]
+        ]
+    },
+    {
+        "id": "d55a158d.d18d78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1102.5,
+        "y": 1072,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "8a05435f.d4353",
+                "9b5fea7b.ea5c58"
+            ]
+        ]
+    },
+    {
+        "id": "163bb21d.b7402e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1120.5,
+        "y": 1236,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "a5ceaad0.7b2e98",
+                "15df0c5e.685b84"
+            ]
+        ]
+    },
+    {
+        "id": "6db1b75e.333138",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1145.5,
+        "y": 1330,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "70caefc5.35b37",
+                "c63d1802.0a2cc8"
+            ]
+        ]
+    },
+    {
+        "id": "e683a53a.2cb798",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1145.5,
+        "y": 1425,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "bce56334.cef35",
+                "c14fd025.9a0ba"
+            ]
+        ]
+    },
+    {
+        "id": "b2417e73.3411e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1082.5,
+        "y": 1550,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "c33b36cc.bdba48",
+                "c3320388.be5e4"
+            ]
+        ]
+    },
+    {
+        "id": "9abceb9d.617848",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 968.5,
+        "y": 1778,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "2d4dab4.8c6e454",
+                "e01f4ec9.b4c58"
+            ]
+        ]
+    },
+    {
+        "id": "12a7c275.a1dfbe",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 972.5,
+        "y": 1917,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "4d62119c.036fc",
+                "33303232.af288e"
+            ]
+        ]
+    },
+    {
+        "id": "d89df4a1.349488",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 942.5,
+        "y": 2020,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "d03beaa6.c50d48",
+                "ec61d318.4a068"
+            ]
+        ]
+    },
+    {
+        "id": "e8da0845.d7dd68",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 850.5,
+        "y": 2134,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "d0f4bd54.3df3c",
+                "93d95bab.ebebf8"
+            ]
+        ]
+    },
+    {
+        "id": "1626d84d.ac5288",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 793.5,
+        "y": 117,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "f8bfac2.36eb75",
+                "d6696470.4af878"
+            ]
+        ]
+    },
+    {
+        "id": "1d988fc7.aaa8d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 734.5,
+        "y": 614,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "a1d8630c.b5301",
+                "9af7bf20.b6eca"
+            ]
+        ]
+    },
+    {
+        "id": "94b9cb3e.7a7908",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 609.5,
+        "y": 1102,
+        "z": "8a2f58b1.303d78",
+        "wires": [
+            [
+                "42aeb489.01833c",
+                "e4dfd94a.f3f8a8"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu4.json b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu4.json
new file mode 100644
index 00000000..dd24ec2e
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_delete-bandwidth-update-odu4.json
@@ -0,0 +1,1998 @@
+[
+    {
+        "id": "cc88740a.d18858",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 906.5,
+        "y": 234,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "ec6a20fb.4d35",
+                "dadcc749.b32938",
+                "ddd6d57c.9ced78",
+                "7bbf1a7c.4bd704",
+                "b6932950.974d38"
+            ]
+        ]
+    },
+    {
+        "id": "ec6a20fb.4d35",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1045.5,
+        "y": 193,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "71b54a1e.76d464"
+            ]
+        ]
+    },
+    {
+        "id": "fdb469ba.aea598",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 914.5,
+        "y": 148,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "31a50a41.c4f296",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 1.25 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1348.5,
+        "y": 131,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "29663dcb.c50a22",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 626.5,
+        "y": 181,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "f6326386.3110b"
+            ]
+        ]
+    },
+    {
+        "id": "fda877ca.d8efd8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 495.5,
+        "y": 237,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "29663dcb.c50a22",
+                "61e3284a.786fc8",
+                "65399e41.006f5",
+                "8331c6db.d82208",
+                "6866fd25.085604"
+            ]
+        ]
+    },
+    {
+        "id": "83b38caf.77a65",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 816.5,
+        "y": 185,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "cc88740a.d18858",
+                "fdb469ba.aea598"
+            ]
+        ]
+    },
+    {
+        "id": "dadcc749.b32938",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1058.5,
+        "y": 329,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "cc0ff801.9a2c88"
+            ]
+        ]
+    },
+    {
+        "id": "abfe89e5.77de78",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1315.5,
+        "y": 284,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "c8150f72.a6ddb",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 783.5,
+        "y": 85,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "ddd6d57c.9ced78",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1022.5,
+        "y": 432,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "55f9b5d1.30b88c"
+            ]
+        ]
+    },
+    {
+        "id": "9b8a271c.f86558",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1319.5,
+        "y": 404,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "7bbf1a7c.4bd704",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 945,
+        "y": 547,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "19f2ff00.f00971"
+            ]
+        ]
+    },
+    {
+        "id": "fe790a3c.9a15a8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 1247,
+        "y": 519,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "30e9996b.2eae46",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.5,
+        "y": 194,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "56814f30.ccf4f"
+            ]
+        ]
+    },
+    {
+        "id": "56814f30.ccf4f",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 134.5,
+        "y": 254,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "34f5e2a6.0519ce"
+            ]
+        ]
+    },
+    {
+        "id": "34f5e2a6.0519ce",
+        "type": "method",
+        "name": "method delete bandwidth-update-odu4",
+        "xml": "<method rpc='delete-bandwidth-update-odu4' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 318.5,
+        "y": 147,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "2a403491.3f102c"
+            ]
+        ]
+    },
+    {
+        "id": "2a403491.3f102c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 369,
+        "y": 291,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "fda877ca.d8efd8"
+            ]
+        ]
+    },
+    {
+        "id": "b6932950.974d38",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 854.5,
+        "y": 678,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "33ef2100.94a93"
+            ]
+        ]
+    },
+    {
+        "id": "4d44cfa3.e1f37",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 100`' />\n",
+        "comments": "",
+        "x": 1189.5,
+        "y": 653,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "f2e5ec12.72084",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 699.5,
+        "y": 875,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "66ff3db3.558494",
+                "166020fb.4fc2ff",
+                "5d58dc53.9a5524",
+                "56d61ee2.93f6f",
+                "6214d8db.707218"
+            ]
+        ]
+    },
+    {
+        "id": "66ff3db3.558494",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 838.5,
+        "y": 834,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "ee090cfa.47d82"
+            ]
+        ]
+    },
+    {
+        "id": "6b5e27ff.1e1a68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 707.5,
+        "y": 789,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "2e500448.b3e17c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 2.5 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 1118.5,
+        "y": 811,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "61e3284a.786fc8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 419.5,
+        "y": 822,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "18e66372.38fbfd"
+            ]
+        ]
+    },
+    {
+        "id": "ab02c8a.fb9e538",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 607.5,
+        "y": 832,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "f2e5ec12.72084",
+                "6b5e27ff.1e1a68"
+            ]
+        ]
+    },
+    {
+        "id": "166020fb.4fc2ff",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 851.5,
+        "y": 970,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "93138ec2.21291"
+            ]
+        ]
+    },
+    {
+        "id": "c90177ab.d9e9e8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 1165.5,
+        "y": 944,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "bd2246c4.c9d9d8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 710.5,
+        "y": 659,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "5d58dc53.9a5524",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 815.5,
+        "y": 1073,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "fcf70703.de8018"
+            ]
+        ]
+    },
+    {
+        "id": "7b7bb736.873f58",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 1113.5,
+        "y": 1061,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "56d61ee2.93f6f",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 738,
+        "y": 1188,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "187f78f0.1f0e47"
+            ]
+        ]
+    },
+    {
+        "id": "59ab82e8.b2d06c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 991,
+        "y": 1189,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "6214d8db.707218",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 647.5,
+        "y": 1319,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "db42f47f.bab0a8"
+            ]
+        ]
+    },
+    {
+        "id": "10540582.e5e31a",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 100`' />\n",
+        "comments": "",
+        "x": 910.5,
+        "y": 1298,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "2894aeeb.098f92",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 550.5,
+        "y": 1522,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "bb22ab08.091558",
+                "75052fc5.0c7e5",
+                "5061896a.175198",
+                "835735a8.f975c8",
+                "60b9cb5b.d389f4"
+            ]
+        ]
+    },
+    {
+        "id": "bb22ab08.091558",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 689.5,
+        "y": 1481,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "d78b1e27.6807d"
+            ]
+        ]
+    },
+    {
+        "id": "3cd7515f.85632e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 558.5,
+        "y": 1436,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "79dc39fc.d92468",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 10 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 956.5,
+        "y": 1483,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "65399e41.006f5",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 270.5,
+        "y": 1469,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "27260d94.bdce02"
+            ]
+        ]
+    },
+    {
+        "id": "f27c3bdd.40a7d8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 414.5,
+        "y": 1487,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "2894aeeb.098f92",
+                "3cd7515f.85632e"
+            ]
+        ]
+    },
+    {
+        "id": "75052fc5.0c7e5",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 702.5,
+        "y": 1617,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "a64dd5fd.979978"
+            ]
+        ]
+    },
+    {
+        "id": "4a8b4f9c.99a4f",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 964.5,
+        "y": 1592,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "ae596d23.ffcbe",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 493.5,
+        "y": 1352,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "5061896a.175198",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 666.5,
+        "y": 1720,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "d3f23744.959668"
+            ]
+        ]
+    },
+    {
+        "id": "708f1f3.59cc6e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 948.5,
+        "y": 1692,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "835735a8.f975c8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 589,
+        "y": 1835,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "9c31fdd3.8019"
+            ]
+        ]
+    },
+    {
+        "id": "4e74b995.080ac8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 870,
+        "y": 1830,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "60b9cb5b.d389f4",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 498.5,
+        "y": 1966,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "e13be75e.0ed828"
+            ]
+        ]
+    },
+    {
+        "id": "6e46ae81.a94fb",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 100`' />\n",
+        "comments": "",
+        "x": 776.5,
+        "y": 1960,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "1344723c.62dc8e",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 480.5,
+        "y": 2176,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "63adf83d.fa8608",
+                "8f6d26d0.a90738",
+                "1c4b4a71.f99166",
+                "88a94576.a532f8",
+                "197bee79.743762"
+            ]
+        ]
+    },
+    {
+        "id": "63adf83d.fa8608",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 619.5,
+        "y": 2135,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "bb8717d.98063e8"
+            ]
+        ]
+    },
+    {
+        "id": "c68fdd6d.064e2",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 488.5,
+        "y": 2090,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "2813c51b.3b520a",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 40 `' />\n<parameter name='new-odu-number' value='`$new-rate / 1.25`' />\n",
+        "comments": "",
+        "x": 886.5,
+        "y": 2112,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "8331c6db.d82208",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 200.5,
+        "y": 2123,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "968f3953.080178"
+            ]
+        ]
+    },
+    {
+        "id": "6440a99f.61bf28",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 381.5,
+        "y": 2116,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "1344723c.62dc8e",
+                "c68fdd6d.064e2"
+            ]
+        ]
+    },
+    {
+        "id": "8f6d26d0.a90738",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 632.5,
+        "y": 2271,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "5da983c3.e1d2ec"
+            ]
+        ]
+    },
+    {
+        "id": "6da5650d.a39a7c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 2.5`' />\n",
+        "comments": "",
+        "x": 884.5,
+        "y": 2267,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "4964d358.105f0c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-rate' value='' />\n",
+        "comments": "",
+        "x": 431.5,
+        "y": 2030,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "1c4b4a71.f99166",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 596.5,
+        "y": 2374,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "b0f60bb.3262cf8"
+            ]
+        ]
+    },
+    {
+        "id": "2ff4f8f6.86a188",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 10`' />\n",
+        "comments": "",
+        "x": 882.5,
+        "y": 2372,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "88a94576.a532f8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 519,
+        "y": 2489,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "cc232935.3f9f08"
+            ]
+        ]
+    },
+    {
+        "id": "ad946015.e587d",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 40`' />\n",
+        "comments": "",
+        "x": 790,
+        "y": 2483,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "197bee79.743762",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 428.5,
+        "y": 2620,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "7c05d82.d12ef28"
+            ]
+        ]
+    },
+    {
+        "id": "1275394e.236567",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='`$new-rate / 100`' />\n",
+        "comments": "",
+        "x": 736.5,
+        "y": 2612,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "72dd2cf4.351f54",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$odu-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 462.5,
+        "y": 2849,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "18416ef2.ba5491",
+                "3f9e5c53.79ce24",
+                "8387bf46.cfc03",
+                "86469ccf.d4a69",
+                "703bcbd8.ccaa24"
+            ]
+        ]
+    },
+    {
+        "id": "18416ef2.ba5491",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 601.5,
+        "y": 2808,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "e620b730.716308"
+            ]
+        ]
+    },
+    {
+        "id": "ca7bfd42.04981",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />\n<parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />\n\n",
+        "comments": "",
+        "x": 470.5,
+        "y": 2763,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "302523c5.0f8d8c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='80' />\n",
+        "comments": "",
+        "x": 873.5,
+        "y": 2786,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "6866fd25.085604",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 182.5,
+        "y": 2796,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "7ea41c4e.513904"
+            ]
+        ]
+    },
+    {
+        "id": "7ea41c4e.513904",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 326.5,
+        "y": 2814,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "72dd2cf4.351f54",
+                "ca7bfd42.04981"
+            ]
+        ]
+    },
+    {
+        "id": "3f9e5c53.79ce24",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 614.5,
+        "y": 2944,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "130aaf8d.b9dfc"
+            ]
+        ]
+    },
+    {
+        "id": "1f3050bc.f5300f",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='40' />",
+        "comments": "",
+        "x": 869.5,
+        "y": 2918,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "8387bf46.cfc03",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 578.5,
+        "y": 3047,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "dae1085f.bbf3d8"
+            ]
+        ]
+    },
+    {
+        "id": "626c25fe.549ccc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='10' />",
+        "comments": "",
+        "x": 851.5,
+        "y": 3047,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "86469ccf.d4a69",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 501,
+        "y": 3162,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "635d7956.0a1708"
+            ]
+        ]
+    },
+    {
+        "id": "1a636bfd.78de84",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='2' />",
+        "comments": "",
+        "x": 846,
+        "y": 3159,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "703bcbd8.ccaa24",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='ODU4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 410.5,
+        "y": 3293,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "567ca1e0.2a9b8"
+            ]
+        ]
+    },
+    {
+        "id": "c248fb50.5e9388",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='new-odu-number' value='1' />",
+        "comments": "",
+        "x": 727.5,
+        "y": 3272,
+        "z": "5d7ed3a9.6228ec",
+        "wires": []
+    },
+    {
+        "id": "bd09ca1f.383d68",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1391.5,
+        "y": 202,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "71b54a1e.76d464",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1178.5,
+        "y": 189,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "31a50a41.c4f296",
+                "bd09ca1f.383d68"
+            ]
+        ]
+    },
+    {
+        "id": "cc0ff801.9a2c88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186.5,
+        "y": 328,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "abfe89e5.77de78",
+                "e979a386.df595"
+            ]
+        ]
+    },
+    {
+        "id": "55f9b5d1.30b88c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1147.5,
+        "y": 430,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "9b8a271c.f86558",
+                "48073d25.db9f14"
+            ]
+        ]
+    },
+    {
+        "id": "19f2ff00.f00971",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1084.5,
+        "y": 546,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "fe790a3c.9a15a8",
+                "8ed3505f.cc695"
+            ]
+        ]
+    },
+    {
+        "id": "33ef2100.94a93",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 995.5,
+        "y": 675,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "4d44cfa3.e1f37",
+                "1dc0e5b7.0c161a"
+            ]
+        ]
+    },
+    {
+        "id": "e979a386.df595",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1386.5,
+        "y": 341,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "48073d25.db9f14",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1342.5,
+        "y": 464,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8ed3505f.cc695",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1294.5,
+        "y": 581,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1dc0e5b7.0c161a",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1247.5,
+        "y": 710,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ee090cfa.47d82",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 969.5,
+        "y": 837,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "2e500448.b3e17c",
+                "90a042a7.aabef"
+            ]
+        ]
+    },
+    {
+        "id": "93138ec2.21291",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 990.5,
+        "y": 963,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "c90177ab.d9e9e8",
+                "79fe4e64.bfbc8"
+            ]
+        ]
+    },
+    {
+        "id": "fcf70703.de8018",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 954.5,
+        "y": 1068,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "7b7bb736.873f58",
+                "5305fd9.d71ef04"
+            ]
+        ]
+    },
+    {
+        "id": "187f78f0.1f0e47",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 872.5,
+        "y": 1188,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "59ab82e8.b2d06c",
+                "5a68e84d.f32638"
+            ]
+        ]
+    },
+    {
+        "id": "db42f47f.bab0a8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 787.5,
+        "y": 1312,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "10540582.e5e31a",
+                "8f58142a.864268"
+            ]
+        ]
+    },
+    {
+        "id": "90a042a7.aabef",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1171.5,
+        "y": 866,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "79fe4e64.bfbc8",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1212.5,
+        "y": 998,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5305fd9.d71ef04",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1181.5,
+        "y": 1109,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5a68e84d.f32638",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1098.5,
+        "y": 1240,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8f58142a.864268",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 974.5,
+        "y": 1343,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d78b1e27.6807d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 826.5,
+        "y": 1482,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "79dc39fc.d92468",
+                "a1897bb9.653598"
+            ]
+        ]
+    },
+    {
+        "id": "a64dd5fd.979978",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 835.5,
+        "y": 1615,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "4a8b4f9c.99a4f",
+                "cbf4e316.c0ca2"
+            ]
+        ]
+    },
+    {
+        "id": "d3f23744.959668",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 801.5,
+        "y": 1718,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "708f1f3.59cc6e",
+                "fa009921.006868"
+            ]
+        ]
+    },
+    {
+        "id": "9c31fdd3.8019",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 734.5,
+        "y": 1833,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "4e74b995.080ac8",
+                "267e668.24a139a"
+            ]
+        ]
+    },
+    {
+        "id": "e13be75e.0ed828",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 638.5,
+        "y": 1961,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "6e46ae81.a94fb",
+                "b78e12a0.1a95c"
+            ]
+        ]
+    },
+    {
+        "id": "a1897bb9.653598",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1013.5,
+        "y": 1534,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cbf4e316.c0ca2",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1036.5,
+        "y": 1645,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fa009921.006868",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 991.5,
+        "y": 1752,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "267e668.24a139a",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 945.5,
+        "y": 1890,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b78e12a0.1a95c",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 865.5,
+        "y": 2009,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bb8717d.98063e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 761.5,
+        "y": 2112,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "2813c51b.3b520a",
+                "7ff69d68.ab21b4"
+            ]
+        ]
+    },
+    {
+        "id": "5da983c3.e1d2ec",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 761.5,
+        "y": 2271,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "6da5650d.a39a7c",
+                "b5b12f9b.59f5b"
+            ]
+        ]
+    },
+    {
+        "id": "b0f60bb.3262cf8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 721.5,
+        "y": 2375,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "2ff4f8f6.86a188",
+                "d438523d.2ad33"
+            ]
+        ]
+    },
+    {
+        "id": "cc232935.3f9f08",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 665.5,
+        "y": 2491,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "ad946015.e587d",
+                "79f90431.6699bc"
+            ]
+        ]
+    },
+    {
+        "id": "7c05d82.d12ef28",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 567.5,
+        "y": 2610,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "1275394e.236567",
+                "9879906b.d8a7a"
+            ]
+        ]
+    },
+    {
+        "id": "7ff69d68.ab21b4",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 961.5,
+        "y": 2161,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b5b12f9b.59f5b",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 968.5,
+        "y": 2319,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d438523d.2ad33",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 929.5,
+        "y": 2430,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "79f90431.6699bc",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 864.5,
+        "y": 2537,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9879906b.d8a7a",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 741.5,
+        "y": 2673,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f9ec2030.df9cf",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 941.5,
+        "y": 2834,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dd357b79.64c228",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 933.5,
+        "y": 2976,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f9fb9dba.4badb",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 910.5,
+        "y": 3092,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4d474ed3.c62d4",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 868.5,
+        "y": 3209,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "334c0710.add048",
+        "type": "update",
+        "name": "update available bandwdth'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='available-bandwidth'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name AND\n     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND\n     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' \n      local-only='false'>\n<parameter name='number' value='`$new-odu-number`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 812.5,
+        "y": 3330,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e620b730.716308",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 746.5,
+        "y": 2799,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "302523c5.0f8d8c",
+                "f9ec2030.df9cf"
+            ]
+        ]
+    },
+    {
+        "id": "130aaf8d.b9dfc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 755.5,
+        "y": 2944,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "1f3050bc.f5300f",
+                "dd357b79.64c228"
+            ]
+        ]
+    },
+    {
+        "id": "dae1085f.bbf3d8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 709.5,
+        "y": 3046,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "626c25fe.549ccc",
+                "f9fb9dba.4badb"
+            ]
+        ]
+    },
+    {
+        "id": "635d7956.0a1708",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 658.5,
+        "y": 3162,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "1a636bfd.78de84",
+                "4d474ed3.c62d4"
+            ]
+        ]
+    },
+    {
+        "id": "567ca1e0.2a9b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 558.5,
+        "y": 3289,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "c248fb50.5e9388",
+                "334c0710.add048"
+            ]
+        ]
+    },
+    {
+        "id": "f6326386.3110b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 675.5,
+        "y": 126,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "c8150f72.a6ddb",
+                "83b38caf.77a65"
+            ]
+        ]
+    },
+    {
+        "id": "18e66372.38fbfd",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 593.5,
+        "y": 713,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "bd2246c4.c9d9d8",
+                "ab02c8a.fb9e538"
+            ]
+        ]
+    },
+    {
+        "id": "27260d94.bdce02",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 367.5,
+        "y": 1359,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "ae596d23.ffcbe",
+                "f27c3bdd.40a7d8"
+            ]
+        ]
+    },
+    {
+        "id": "968f3953.080178",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 296.5,
+        "y": 2005,
+        "z": "5d7ed3a9.6228ec",
+        "wires": [
+            [
+                "4964d358.105f0c",
+                "6440a99f.61bf28"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_delete-service-async.json b/platform-logic/optical-service/src/main/json/optical-service_delete-service-async.json
new file mode 100644
index 00000000..b63fca09
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_delete-service-async.json
@@ -0,0 +1,310 @@
+[
+    {
+        "id": "8cc3da66.4f40d8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 207.77777099609375,
+        "y": 274.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "1e550516.1038fb"
+            ]
+        ]
+    },
+    {
+        "id": "1e550516.1038fb",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 394.77777099609375,
+        "y": 223.33332633972168,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "8bf17f5d.611f3"
+            ]
+        ]
+    },
+    {
+        "id": "8bf17f5d.611f3",
+        "type": "method",
+        "name": "method",
+        "xml": "<method rpc='delete-service-async' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 248.77777099609375,
+        "y": 397.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "b44c3e44.1bd1b"
+            ]
+        ]
+    },
+    {
+        "id": "b44c3e44.1bd1b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 421.77777099609375,
+        "y": 396.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "6d08e4a5.fe6bac",
+                "11020991.7c7d86",
+                "9db1a4b5.47b0b8"
+            ]
+        ]
+    },
+    {
+        "id": "6d08e4a5.fe6bac",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Delete Service Async\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 594.7777709960938,
+        "y": 307.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "11020991.7c7d86",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$response-code`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 595.7777709960938,
+        "y": 396.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "25e55ab4.b92da6",
+                "b0822e31.3769c"
+            ]
+        ]
+    },
+    {
+        "id": "25e55ab4.b92da6",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='200'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 763.7777709960938,
+        "y": 339.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "4a5e5e93.4bb0a"
+            ]
+        ]
+    },
+    {
+        "id": "26f00225.07a6ee",
+        "type": "call",
+        "name": "call",
+        "xml": "<call module='optical-service' rpc='aai-delete-service-handling' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1110.7777709960938,
+        "y": 340.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4a5e5e93.4bb0a",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 939.7777709960938,
+        "y": 339.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "26f00225.07a6ee",
+                "bfe4da6d.23bff8"
+            ]
+        ]
+    },
+    {
+        "id": "e2afd11c.20c8",
+        "type": "update",
+        "name": "update AAI service 'CREATED'",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='service-instance'\n     key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $output.service-instance-id' \n      local-only='false'>\n<parameter name='orchestration-status' value='CREATED' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1164.1110534667969,
+        "y": 459.2222137451172,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b0822e31.3769c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 738.7777709960938,
+        "y": 410.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "7741584b.61db58"
+            ]
+        ]
+    },
+    {
+        "id": "7741584b.61db58",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 901.7777709960938,
+        "y": 412.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "e2afd11c.20c8",
+                "80fddf5d.9a9f2",
+                "e0a008e3.38d8a8"
+            ]
+        ]
+    },
+    {
+        "id": "9db1a4b5.47b0b8",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/async-response-so.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$output.notification-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.so.username`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.so.password`\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"so-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 596.7777709960938,
+        "y": 483.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "e497ea1c.ea2f88",
+                "d8b75d43.49a72"
+            ]
+        ]
+    },
+    {
+        "id": "e497ea1c.ea2f88",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 758.7777709960938,
+        "y": 476.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "18019049.2a70d"
+            ]
+        ]
+    },
+    {
+        "id": "d8b75d43.49a72",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 760.7777709960938,
+        "y": 546.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            [
+                "9194dca2.b34f"
+            ]
+        ]
+    },
+    {
+        "id": "18019049.2a70d",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Send to SO fails for service delete\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 904.7777709960938,
+        "y": 476.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9194dca2.b34f",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Send to SO fails for service delete\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 900.7777709960938,
+        "y": 546.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bfe4da6d.23bff8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-message' value='SUCCESS' />\n",
+        "comments": "",
+        "x": 1093.7777709960938,
+        "y": 276.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": []
+    },
+    {
+        "id": "80fddf5d.9a9f2",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-message' value='FAILURE' />\n",
+        "comments": "",
+        "x": 1103.7777709960938,
+        "y": 397.3333263397217,
+        "z": "cd7e2d57.0833e",
+        "wires": []
+    },
+    {
+        "id": "e0a008e3.38d8a8",
+        "type": "save",
+        "name": "update DB 'CREATED'",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $request-id'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127.7777404785156,
+        "y": 515.5554885864258,
+        "z": "cd7e2d57.0833e",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_handle-async-notif.json b/platform-logic/optical-service/src/main/json/optical-service_handle-async-notif.json
new file mode 100644
index 00000000..a71017eb
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_handle-async-notif.json
@@ -0,0 +1,286 @@
+[
+    {
+        "id": "6f3be679.102eb8",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 326.6666564941406,
+        "y": 225.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "af4b79a2.a55f08"
+            ]
+        ]
+    },
+    {
+        "id": "af4b79a2.a55f08",
+        "type": "method",
+        "name": "method",
+        "xml": "<method rpc='handle-async-notif' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 180.66665649414062,
+        "y": 399.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "86d5028d.c5258"
+            ]
+        ]
+    },
+    {
+        "id": "86d5028d.c5258",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 368.6666564941406,
+        "y": 399.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "d24a17f7.d6a648",
+                "2faf78f7.30e068",
+                "ffe6e86b.e5f058"
+            ]
+        ]
+    },
+    {
+        "id": "d24a17f7.d6a648",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Reached async graph\"/>\n<parameter name=\"field2\" value=\"`$request-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 495.6666564941406,
+        "y": 281.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2faf78f7.30e068",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$ack-final-indicator`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 504.6666564941406,
+        "y": 469.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "7b60ff0d.907ce",
+                "1bcf360f.7e976a"
+            ]
+        ]
+    },
+    {
+        "id": "7b60ff0d.907ce",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='N'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 674.6666564941406,
+        "y": 392.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "b40d70d0.112e5"
+            ]
+        ]
+    },
+    {
+        "id": "a88f7bf8.d91d78",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Ack indicator in 'N'\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1025.6666564941406,
+        "y": 238.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b40d70d0.112e5",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 849.6666564941406,
+        "y": 239.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "a88f7bf8.d91d78"
+            ]
+        ]
+    },
+    {
+        "id": "1bcf360f.7e976a",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='Y'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 658.6666564941406,
+        "y": 533.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "d1db50fc.60a86"
+            ]
+        ]
+    },
+    {
+        "id": "d1db50fc.60a86",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 812.6666564941406,
+        "y": 481.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "920fb578.d225d8",
+                "199a9ce9.ce53b3"
+            ]
+        ]
+    },
+    {
+        "id": "ffe6e86b.e5f058",
+        "type": "execute",
+        "name": "execute: read properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n<parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />\n<parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 614.6666564941406,
+        "y": 337.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "920fb578.d225d8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$output.status`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 987.6666564941406,
+        "y": 527.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "13be4531.42948b",
+                "db9a79a3.a1b058"
+            ]
+        ]
+    },
+    {
+        "id": "199a9ce9.ce53b3",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\npfx='output'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n     \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1003.6666564941406,
+        "y": 434.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "13be4531.42948b",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='CREATING'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1141.6666564941406,
+        "y": 476.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "f57cf67a.bbe098"
+            ]
+        ]
+    },
+    {
+        "id": "db9a79a3.a1b058",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='DELETING'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1161.6666564941406,
+        "y": 561.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "2940e810.23a048"
+            ]
+        ]
+    },
+    {
+        "id": "f57cf67a.bbe098",
+        "type": "call",
+        "name": "call",
+        "xml": "<call module='optical-service' rpc='create-service-async' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1300.6666564941406,
+        "y": 475.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2940e810.23a048",
+        "type": "call",
+        "name": "call",
+        "xml": "<call module='optical-service' rpc='delete-service-async' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1307.6666564941406,
+        "y": 561.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "74552b51.5e6134",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 149.66665649414062,
+        "y": 275.5555419921875,
+        "z": "115af5b6.4cef8a",
+        "wires": [
+            [
+                "6f3be679.102eb8"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
new file mode 100644
index 00000000..9a2ee7af
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
@@ -0,0 +1,1702 @@
+[
+    {
+        "id": "96e558c1.171928",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 174,
+        "y": 96,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "ba6338c5.40bd88"
+            ]
+        ]
+    },
+    {
+        "id": "ba6338c5.40bd88",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 187,
+        "y": 156,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "3857a42a.6b4cdc"
+            ]
+        ]
+    },
+    {
+        "id": "3857a42a.6b4cdc",
+        "type": "method",
+        "name": "method service-create-tapi",
+        "xml": "<method rpc='service-create-tapi' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 207,
+        "y": 236,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "bca1514.f1c7bb"
+            ]
+        ]
+    },
+    {
+        "id": "bca1514.f1c7bb",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 416.5,
+        "y": 241,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "83c30d61.39881",
+                "28460541.766c1a",
+                "58f1dbe7.901a34",
+                "72b2db54.6e2944",
+                "b90929e.4a985d8",
+                "65a74a39.a4d774",
+                "cc0f04eb.f41858",
+                "c7ace3b2.11081",
+                "3ff768b5.f99338",
+                "2995b56c.890f5a",
+                "bf3d0d8f.af5f6"
+            ]
+        ]
+    },
+    {
+        "id": "83c30d61.39881",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside optical service create tapi\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 416,
+        "y": 39,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "28460541.766c1a",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\npfx='db-aend'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 614.9999389648438,
+        "y": 90.99998474121094,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "40e83861.7ed4d8"
+            ]
+        ]
+    },
+    {
+        "id": "58f1dbe7.901a34",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-zend.port-id'\npfx='db-zend'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 635.9999389648438,
+        "y": 155.99996948242188,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "428896b5.e069b8"
+            ]
+        ]
+    },
+    {
+        "id": "40e83861.7ed4d8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 774.9999389648438,
+        "y": 92.99998474121094,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "eccba7dd.6944a8"
+            ]
+        ]
+    },
+    {
+        "id": "428896b5.e069b8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 784.9999389648438,
+        "y": 153.99996948242188,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "37897f34.5ca9"
+            ]
+        ]
+    },
+    {
+        "id": "eccba7dd.6944a8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-node-uuid' value='`$db-aend.pnf-name`' />\n<parameter name='aend-pnf-name' value='`$db-aend.pnf-id`' />\n<parameter name='aend-cep-list' value='`$db-aend.connection-point`' />\n<parameter name='aend-nep' value='`$db-aend.interface-name`' />\n<parameter name='aend-rate' value='`$db-aend.rate`' />\n",
+        "comments": "",
+        "x": 940.9999389648438,
+        "y": 93.99996948242188,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "37897f34.5ca9",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-node-uuid' value='`$db-zend.pnf-name`' />\n<parameter name='zend-pnf-name' value='`$db-zend.pnf-id`' />\n<parameter name='zend-cep-list' value='`$db-zend.connection-point`' />\n<parameter name='zend-nep' value='`$db-zend.interface-name`' />\n<parameter name='zend-rate' value='`$db-zend.rate`' />\n",
+        "comments": "",
+        "x": 934,
+        "y": 153,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "72b2db54.6e2944",
+        "type": "execute",
+        "name": "execute: read properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n<parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />\n<parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 604,
+        "y": 45,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b90929e.4a985d8",
+        "type": "get-resource",
+        "name": "find if aend is uni or nni or enni",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $aend-node-uuid AND\n     p-interface.interface-name = $aend-nep\"\npfx='aend'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 700,
+        "y": 237,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "65a74a39.a4d774",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$aend.network-interface-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 615,
+        "y": 333,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "4a9b044a.0f3ccc",
+                "ea6d56a1.b032a8"
+            ]
+        ]
+    },
+    {
+        "id": "4a9b044a.0f3ccc",
+        "type": "outcome",
+        "name": "UNI",
+        "xml": "<outcome value='UNI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 740,
+        "y": 282,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "c9780ca0.f5f71"
+            ]
+        ]
+    },
+    {
+        "id": "4b0b12c9.238b4c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-cep' value='`$aend-cep-list`' />\n<parameter name='aend-new' value='' />\n<parameter name='aend-new-rate' value='0' />\n",
+        "comments": "",
+        "x": 1115,
+        "y": 131,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "8b8d35a4.ce05f8",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$aend-cep-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1102,
+        "y": 373,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c9780ca0.f5f71",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 878,
+        "y": 281,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "4b0b12c9.238b4c",
+                "72c16e75.1a562",
+                "bd108f1e.ab488"
+            ]
+        ]
+    },
+    {
+        "id": "2ea274d9.8036ac",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 898,
+        "y": 396,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "8b8d35a4.ce05f8",
+                "e25b0e67.09bb4",
+                "a1b81fea.edbde",
+                "514a609b.d74c"
+            ]
+        ]
+    },
+    {
+        "id": "3109f9ae.76da66",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $param-prefix[$idx]`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"aend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1229.1111221313477,
+        "y": 457.22221660614014,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "11b6c81d.28de98",
+                "599fbaf2.e79674"
+            ]
+        ]
+    },
+    {
+        "id": "11b6c81d.28de98",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1346.77779006958,
+        "y": 411.0000057220459,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "d3f94b37.cc4268"
+            ]
+        ]
+    },
+    {
+        "id": "599fbaf2.e79674",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1356.2221794128418,
+        "y": 480.7777805328369,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "14aab0b3.9d34ff"
+            ]
+        ]
+    },
+    {
+        "id": "d3f94b37.cc4268",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get Aend cep details\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1504,
+        "y": 411,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7102ebf7.57bb74",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Sucessfully retrieved aend cep\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1643,
+        "y": 433,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e25b0e67.09bb4",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='`$param-prefix_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1090,
+        "y": 422,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "46da2f38.8c645"
+            ]
+        ]
+    },
+    {
+        "id": "14aab0b3.9d34ff",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1494,
+        "y": 483,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7102ebf7.57bb74",
+                "4004dd00.d10474"
+            ]
+        ]
+    },
+    {
+        "id": "d11a7c1c.7e732",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2100.5552864074707,
+        "y": 532.1110572814941,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "a50c2dd5.e9535",
+        "type": "set",
+        "name": "set aend-local-id",
+        "xml": "<set>\n<parameter name='aend-local-id' value=\"`$aend-local-id + '/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`\" />\n<parameter name='aend-cep' value='`$param-prefix[$idx]`'/>\n\n\n",
+        "comments": "",
+        "x": 2128.3332290649414,
+        "y": 461.1111087799072,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "7c05f290.3530ac",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1922,
+        "y": 498,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "a50c2dd5.e9535",
+                "d11a7c1c.7e732"
+            ]
+        ]
+    },
+    {
+        "id": "46da2f38.8c645",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1099,
+        "y": 483,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "3109f9ae.76da66"
+            ]
+        ]
+    },
+    {
+        "id": "a1b81fea.edbde",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value='' />\n<parameter name='aend-local-id' value='' />\n\n",
+        "comments": "",
+        "x": 1066,
+        "y": 326,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "cc0f04eb.f41858",
+        "type": "get-resource",
+        "name": "find if zend is uni or nni or enni",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $zend-node-uuid AND\n     p-interface.interface-name = $zend-nep\"\npfx='zend'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 719,
+        "y": 779,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c7ace3b2.11081",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$zend.network-interface-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 488,
+        "y": 1128,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "c85fd988.301698",
+                "9efb19c3.6da618"
+            ]
+        ]
+    },
+    {
+        "id": "c85fd988.301698",
+        "type": "outcome",
+        "name": "UNI",
+        "xml": "<outcome value='UNI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 614,
+        "y": 1048,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "b4f379c1.c24888"
+            ]
+        ]
+    },
+    {
+        "id": "7c3f18e8.1c0b18",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-cep' value='`$zend-cep-list`' />\n<parameter name='zend-new' value='' />\n<parameter name='zend-new-rate' value='0' />\n",
+        "comments": "",
+        "x": 1035,
+        "y": 769,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "3e6ef851.b14d38",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$zend-cep-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 986,
+        "y": 1188,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b4f379c1.c24888",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 894,
+        "y": 827,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7c3f18e8.1c0b18",
+                "f950d837.cb97f8",
+                "ccff2354.5c8d6"
+            ]
+        ]
+    },
+    {
+        "id": "2ae39741.d1c3c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 776,
+        "y": 1245,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "3e6ef851.b14d38",
+                "f903e0d6.863cf",
+                "9bced74d.d072a8",
+                "943fe233.c96d1"
+            ]
+        ]
+    },
+    {
+        "id": "f903e0d6.863cf",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value='' />\n<parameter name='zend-local-id' value='' />\n",
+        "comments": "",
+        "x": 987,
+        "y": 1136,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "ea6d56a1.b032a8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 752,
+        "y": 398,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "2ea274d9.8036ac"
+            ]
+        ]
+    },
+    {
+        "id": "9efb19c3.6da618",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 610,
+        "y": 1243,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "2ae39741.d1c3c8"
+            ]
+        ]
+    },
+    {
+        "id": "3ff768b5.f99338",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-create-tapi.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/tapi/v2/connectivities/tapi-services'`\"/>\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"tapi-service-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 227.00006103515625,
+        "y": 1569,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "f2fbbd03.f2906",
+                "bebd84e7.a3b248"
+            ]
+        ]
+    },
+    {
+        "id": "f2fbbd03.f2906",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 368.00006103515625,
+        "y": 1517,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "dcee484.0427eb8"
+            ]
+        ]
+    },
+    {
+        "id": "bebd84e7.a3b248",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 382.00006103515625,
+        "y": 1631,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "87a25e6a.1b2d"
+            ]
+        ]
+    },
+    {
+        "id": "dcee484.0427eb8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 533.0000610351562,
+        "y": 1516,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "58ea97a5.b3e618"
+            ]
+        ]
+    },
+    {
+        "id": "87a25e6a.1b2d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 558.0000610351562,
+        "y": 1631,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "df77f71.8f24908",
+                "e14a80e1.1f5b7",
+                "9510207c.71682",
+                "6da24e58.717bb",
+                "71928460.ed14cc",
+                "5a15ce33.45154"
+            ]
+        ]
+    },
+    {
+        "id": "58ea97a5.b3e618",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Service creation failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "comments": "",
+        "x": 725.0000610351562,
+        "y": 1517,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "df77f71.8f24908",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service created successfully' />\n<parameter name='ack-final-indicator' value=\"Y\" />\n",
+        "comments": "",
+        "x": 734.5556030273438,
+        "y": 1874.4443359375,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "4a0bc718.a962f8",
+        "type": "call",
+        "name": "call",
+        "xml": "<call module='optical-service' rpc='success-aai-update-tapi' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1271,
+        "y": 2002,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2995b56c.890f5a",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-create-input.payload.service-name`\" />\n<parameter name='svc-action' value=\"CREATE\" />\n",
+        "comments": "",
+        "x": 327,
+        "y": 1371,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "bf3d0d8f.af5f6",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A end local-id\"/>\n<parameter name=\"field2\" value=\"`$aend-local-id`\"/>\n<parameter name=\"field3\" value=\"Z end local-id\"/>\n<parameter name=\"field4\" value=\"`$zend-local-id`\"/>\n<parameter name=\"field5\" value=\"Service name\"/>\n<parameter name=\"field6\" value=\"`$service-name`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 291,
+        "y": 1454,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8f662c6.88da9d",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idl' start='0' end='`$param-prefix1_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1258,
+        "y": 1490,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "b907a417.722e98"
+            ]
+        ]
+    },
+    {
+        "id": "ba640497.6998e8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl]`\" />\n",
+        "comments": "",
+        "x": 1710,
+        "y": 1421,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "b907a417.722e98",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$idl`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1393,
+        "y": 1491,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "91e17725.73caf8",
+                "c2c37dd4.88b1e",
+                "84a33271.66a7e"
+            ]
+        ]
+    },
+    {
+        "id": "91e17725.73caf8",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='`$param-prefix1_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1573,
+        "y": 1423,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "ba640497.6998e8"
+            ]
+        ]
+    },
+    {
+        "id": "c2c37dd4.88b1e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1580,
+        "y": 1498,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7e15b45a.f1185c"
+            ]
+        ]
+    },
+    {
+        "id": "7e15b45a.f1185c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl] + ','`\" />\n",
+        "comments": "",
+        "x": 1736,
+        "y": 1500,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "84a33271.66a7e",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='`$idk`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1564,
+        "y": 1558,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "2fb07baa.dd5174"
+            ]
+        ]
+    },
+    {
+        "id": "2fb07baa.dd5174",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value='`$zend-new`' />\n",
+        "comments": "",
+        "x": 1741,
+        "y": 1556,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "9510207c.71682",
+        "type": "save",
+        "name": "update pinterface cep DB Zend",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 857.2222900390625,
+        "y": 1697.666748046875,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e14a80e1.1f5b7",
+        "type": "save",
+        "name": "update pinterface cep DB Aend",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 875,
+        "y": 1631,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "72c16e75.1a562",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Aend uni\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1118,
+        "y": 195,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f950d837.cb97f8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Zend uni\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1054,
+        "y": 816,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6da24e58.717bb",
+        "type": "save",
+        "name": "save service db",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATED' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , null );\"> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 877,
+        "y": 1573,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c27a69f2.0ddb38",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1793,
+        "y": 466,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7c05f290.3530ac"
+            ]
+        ]
+    },
+    {
+        "id": "7b435c8d.3fd214",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1822.222116470337,
+        "y": 593.3333568572998,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "d092daa9.9a37d8"
+            ]
+        ]
+    },
+    {
+        "id": "d092daa9.9a37d8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No service interface points could be found for A end ' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "comments": "",
+        "x": 1966.6666259765625,
+        "y": 593.3333129882812,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "71928460.ed14cc",
+        "type": "save",
+        "name": "save service aai",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $aend-node-uuid + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-aend.port-id `\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$aend-node-uuid`\" /> \n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $zend-node-uuid + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-zend.port-id `\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$zend-node-uuid`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 765.9999389648438,
+        "y": 1818.111083984375,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5a15ce33.45154",
+        "type": "save",
+        "name": "save",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' >\n<parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\n<parameter name='service-type' value='Domain-Service' />\n<parameter name='orchestration-status' value='CREATED' />\n<parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\n<parameter name='service-layer' value='ODU' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 758.9999389648438,
+        "y": 1758,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bd108f1e.ab488",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $aend-cep`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"aend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1116,
+        "y": 256,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "6b2a855d.23024c",
+                "f3b11a4b.2344f8"
+            ]
+        ]
+    },
+    {
+        "id": "6b2a855d.23024c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1274,
+        "y": 216,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "eef404ec.f0bb08"
+            ]
+        ]
+    },
+    {
+        "id": "f3b11a4b.2344f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1283.4443893432617,
+        "y": 285.777774810791,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "d15a3398.6ced1"
+            ]
+        ]
+    },
+    {
+        "id": "eef404ec.f0bb08",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get Aend cep details\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1431.22220993042,
+        "y": 215.9999942779541,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d15a3398.6ced1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1449.22216796875,
+        "y": 284,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "afd9ff21.3fd56"
+            ]
+        ]
+    },
+    {
+        "id": "afd9ff21.3fd56",
+        "type": "set",
+        "name": "set aend-local-id",
+        "xml": "<set>\n<parameter name='aend-local-id' value=\"`'/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`\" />\n\n\n",
+        "comments": "",
+        "x": 1643,
+        "y": 284,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "b74dbdb.822994",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $param-prefix1[$idk]`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"zend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1341,
+        "y": 1242,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "e8c33d42.33806",
+                "d05bc068.08527"
+            ]
+        ]
+    },
+    {
+        "id": "e8c33d42.33806",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1462,
+        "y": 1203,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "431138f7.d0a218"
+            ]
+        ]
+    },
+    {
+        "id": "d05bc068.08527",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1480,
+        "y": 1297,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "f244762f.d3c018"
+            ]
+        ]
+    },
+    {
+        "id": "431138f7.d0a218",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get zend cep details\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1610,
+        "y": 1200,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7e69d1da.c8582",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Sucessfully retrieved zend cep\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1779,
+        "y": 1250,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9bced74d.d072a8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idk' start='0' end='`$param-prefix1_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 987,
+        "y": 1243,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "1b2a920e.3e410e"
+            ]
+        ]
+    },
+    {
+        "id": "f244762f.d3c018",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1635,
+        "y": 1300,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7e69d1da.c8582",
+                "efc25f0c.a1d2c"
+            ]
+        ]
+    },
+    {
+        "id": "efc25f0c.a1d2c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$zend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1789,
+        "y": 1314,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "c32606e1.58b168",
+                "4ea93db7.c01e74"
+            ]
+        ]
+    },
+    {
+        "id": "1b2a920e.3e410e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1139,
+        "y": 1245,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "b74dbdb.822994"
+            ]
+        ]
+    },
+    {
+        "id": "a62b46a5.e1b858",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2177,
+        "y": 1325,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "e5a3a6b1.5eb5b8",
+        "type": "set",
+        "name": "set zend-local-id",
+        "xml": "<set>\n<parameter name='zend-local-id' value=\"`$zend-local-id + '/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`\" />\n<parameter name='zend-cep' value='`$param-prefix1[$idk]`'/>\n\n\n\n",
+        "comments": "",
+        "x": 2210,
+        "y": 1215,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "5608122b.ab9f6c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2059,
+        "y": 1271,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "e5a3a6b1.5eb5b8",
+                "a62b46a5.e1b858"
+            ]
+        ]
+    },
+    {
+        "id": "c32606e1.58b168",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1927.9998779296875,
+        "y": 1275.6666259765625,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "5608122b.ab9f6c"
+            ]
+        ]
+    },
+    {
+        "id": "4ea93db7.c01e74",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1927.8887939453125,
+        "y": 1380.1109619140625,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "e720f2d5.77fdb"
+            ]
+        ]
+    },
+    {
+        "id": "e720f2d5.77fdb",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No service interface points could be found for Z end ' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "comments": "",
+        "x": 2107.22216796875,
+        "y": 1383.111083984375,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "943fe233.c96d1",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$param-prefix1_length == 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 941,
+        "y": 1395,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7c8d1f90.d20f8",
+                "59bf8efe.e5d3"
+            ]
+        ]
+    },
+    {
+        "id": "7c8d1f90.d20f8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1081,
+        "y": 1349,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "5a2d4b65.e557b4"
+            ]
+        ]
+    },
+    {
+        "id": "5a2d4b65.e557b4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",
+        "comments": "",
+        "x": 1216,
+        "y": 1349,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "59bf8efe.e5d3",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1083,
+        "y": 1489,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "8f662c6.88da9d"
+            ]
+        ]
+    },
+    {
+        "id": "4004dd00.d10474",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$aend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1652,
+        "y": 501,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "c27a69f2.0ddb38",
+                "7b435c8d.3fd214"
+            ]
+        ]
+    },
+    {
+        "id": "514a609b.d74c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$param-prefix_length == 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1071,
+        "y": 550,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "191fbb7.2a4b845",
+                "1cd1ef71.14acd1"
+            ]
+        ]
+    },
+    {
+        "id": "191fbb7.2a4b845",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1225,
+        "y": 551,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "a558f9eb.613c58"
+            ]
+        ]
+    },
+    {
+        "id": "a558f9eb.613c58",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",
+        "comments": "",
+        "x": 1387,
+        "y": 551,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "1cd1ef71.14acd1",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1229,
+        "y": 602,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "93a39454.c21878"
+            ]
+        ]
+    },
+    {
+        "id": "93a39454.c21878",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idy' start='0' end='`$param-prefix_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1353,
+        "y": 626,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "6e31bfde.e9a2b"
+            ]
+        ]
+    },
+    {
+        "id": "12b9813c.84c17f",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy]`\" />\n",
+        "comments": "",
+        "x": 1803,
+        "y": 642,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "6e31bfde.e9a2b",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$idy`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1518,
+        "y": 691,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "48d2ce69.6ccad",
+                "735daaac.0a3344",
+                "2e826606.462a6a"
+            ]
+        ]
+    },
+    {
+        "id": "48d2ce69.6ccad",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='`$param-prefix_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1660,
+        "y": 642,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "12b9813c.84c17f"
+            ]
+        ]
+    },
+    {
+        "id": "735daaac.0a3344",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1690,
+        "y": 716,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "5f658cca.768614"
+            ]
+        ]
+    },
+    {
+        "id": "5f658cca.768614",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy] + ','`\" />\n",
+        "comments": "",
+        "x": 1807,
+        "y": 726,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "2e826606.462a6a",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='`$idx`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1669,
+        "y": 797,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "4869b073.d45ad"
+            ]
+        ]
+    },
+    {
+        "id": "4869b073.d45ad",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value='`$aend-new`' />\n",
+        "comments": "",
+        "x": 1807,
+        "y": 793,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    },
+    {
+        "id": "ccff2354.5c8d6",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $zend-cep`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"zend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1036,
+        "y": 902,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "f30e06ef.3ea158",
+                "7c8fb487.808e3c"
+            ]
+        ]
+    },
+    {
+        "id": "f30e06ef.3ea158",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1196,
+        "y": 861,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "7aa077ea.c86438"
+            ]
+        ]
+    },
+    {
+        "id": "7c8fb487.808e3c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1205.4443893432617,
+        "y": 930.777774810791,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "a6409b41.3875a8"
+            ]
+        ]
+    },
+    {
+        "id": "7aa077ea.c86438",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get Aend cep details\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1353.22220993042,
+        "y": 860.9999942779541,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a6409b41.3875a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1371.22216796875,
+        "y": 929,
+        "z": "4efb9c4a.945e04",
+        "wires": [
+            [
+                "c469b431.4e03c8"
+            ]
+        ]
+    },
+    {
+        "id": "c469b431.4e03c8",
+        "type": "set",
+        "name": "set zend-local-id",
+        "xml": "<set>\n<parameter name='zend-local-id' value=\"`'/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`\" />\n\n\n",
+        "comments": "",
+        "x": 1565,
+        "y": 929,
+        "z": "4efb9c4a.945e04",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
new file mode 100644
index 00000000..cef6bc48
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
@@ -0,0 +1,674 @@
+[
+    {
+        "id": "22cb0f8b.7a936",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 276,
+        "y": 233,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "899fe88f.8b0f18"
+            ]
+        ]
+    },
+    {
+        "id": "899fe88f.8b0f18",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 289,
+        "y": 293,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "8c11d44e.febba8"
+            ]
+        ]
+    },
+    {
+        "id": "8c11d44e.febba8",
+        "type": "method",
+        "name": "method service-delete-tapi",
+        "xml": "<method rpc='service-delete-tapi' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 309,
+        "y": 373,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "4251fc90.7d3354"
+            ]
+        ]
+    },
+    {
+        "id": "4251fc90.7d3354",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 556.5,
+        "y": 373,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "fa22a868.cbac88",
+                "61c8204a.2cec1",
+                "613af82c.220508"
+            ]
+        ]
+    },
+    {
+        "id": "fa22a868.cbac88",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside optical service delete tapi\"/>\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 653,
+        "y": 196,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "61c8204a.2cec1",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\n",
+        "comments": "",
+        "x": 729,
+        "y": 245,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "613af82c.220508",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"services-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 759.9999351501465,
+        "y": 378.8888759613037,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "6682edb5.3e9d24",
+                "894f9664.c6abc8"
+            ]
+        ]
+    },
+    {
+        "id": "ddeadbca.081d98",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-nep' value=\"`$services-response.service[0].end-point[0].connection-end-point[0].node-edge-point-uuid`\" />\n<parameter name='zend-nep' value=\"`$services-response.service[0].end-point[1].connection-end-point[0].node-edge-point-uuid`\" />\n<parameter name='aend-cep' value=\"`$services-response.service[0].end-point[0].connection-end-point[0].connection-end-point-uuid`\" />\n<parameter name='zend-cep' value=\"`$services-response.service[0].end-point[1].connection-end-point[0].connection-end-point-uuid`\" />\n",
+        "comments": "",
+        "x": 1492.2221755981445,
+        "y": 305.555513381958,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "6682edb5.3e9d24",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 963.3332595825195,
+        "y": 353.33330249786377,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "894f9664.c6abc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 939.999885559082,
+        "y": 435.55552768707275,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "dafe166a.8b36d8"
+            ]
+        ]
+    },
+    {
+        "id": "dafe166a.8b36d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1135.5554733276367,
+        "y": 446.6666831970215,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "ddeadbca.081d98",
+                "2801b4f8.38386c",
+                "3cf51d10.896032",
+                "a44318ce.afad08"
+            ]
+        ]
+    },
+    {
+        "id": "2801b4f8.38386c",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $aend-nep'\npfx='db-aend'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1545.5556449890137,
+        "y": 367.77777004241943,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3cf51d10.896032",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $zend-nep'\npfx='db-zend'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1545.555549621582,
+        "y": 422.2222137451172,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "852e3fe3.e39dd",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value='`$aend-cep`' />\n",
+        "comments": "",
+        "x": 1931.221923828125,
+        "y": 647.22216796875,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "4644be9d.89b97",
+        "type": "get-resource",
+        "name": "find if aend is uni or nni or enni",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $db-aend.pnf-name AND\n     p-interface.interface-name = $aend-nep\"\npfx='aend'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1719.1107177734375,
+        "y": 562.8888549804688,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a44318ce.afad08",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"tapi-service-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1283.3331146240234,
+        "y": 514.4444074630737,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "58946d75.cedfa4",
+                "e7cecf42.399a6"
+            ]
+        ]
+    },
+    {
+        "id": "58946d75.cedfa4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252.3331146240234,
+        "y": 656.4444074630737,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "1e4a35c6.1c31ca"
+            ]
+        ]
+    },
+    {
+        "id": "1e4a35c6.1c31ca",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1406.5553512573242,
+        "y": 610.666627407074,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "4644be9d.89b97",
+                "652250d1.df0d6",
+                "29655b58.ca1ca4",
+                "aad55652.80ccf8",
+                "82da300b.4f57c",
+                "2082255.0c982da",
+                "9f9c7a46.ce0ff8",
+                "70a0ebe0.92bcd4",
+                "33fa91ea.5695ce",
+                "425e8f1f.07ad6"
+            ]
+        ]
+    },
+    {
+        "id": "e7cecf42.399a6",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1409.9998016357422,
+        "y": 498.88880443573,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "ea3eca27.8a59e8"
+            ]
+        ]
+    },
+    {
+        "id": "ea3eca27.8a59e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1576.9998016357422,
+        "y": 497.88880443573,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "e7be8bd4.b55258"
+            ]
+        ]
+    },
+    {
+        "id": "e7be8bd4.b55258",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Service Deletion failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "comments": "",
+        "x": 1744.8886985778809,
+        "y": 496.66657543182373,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "652250d1.df0d6",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service deleted successfully' />\n<parameter name='ack-final-indicator' value=\"Y\" />\n",
+        "comments": "",
+        "x": 1297.7775955200195,
+        "y": 1231.1110696792603,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "29655b58.ca1ca4",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$aend.network-interface-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1641.1108856201172,
+        "y": 665.5554914474487,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "aea6fbc6.1505d8",
+                "2d663d56.1e55d2"
+            ]
+        ]
+    },
+    {
+        "id": "aea6fbc6.1505d8",
+        "type": "outcome",
+        "name": "UNI",
+        "xml": "<outcome value='UNI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1805.888671875,
+        "y": 647.22216796875,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "852e3fe3.e39dd"
+            ]
+        ]
+    },
+    {
+        "id": "2d663d56.1e55d2",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1808.1108779907227,
+        "y": 720.5555419921875,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "af008805.61eae8"
+            ]
+        ]
+    },
+    {
+        "id": "aad55652.80ccf8",
+        "type": "save",
+        "name": "update pinterface cep DB Aend",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1671.1108856201172,
+        "y": 763.3332624435425,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "82da300b.4f57c",
+        "type": "get-resource",
+        "name": "find if zend is uni or nni or enni",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $db-zend.pnf-name AND\n     p-interface.interface-name = $zend-nep\"\npfx='zend'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1647.7772598266602,
+        "y": 846.6665992736816,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2082255.0c982da",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$zend.network-interface-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1549.9998149871826,
+        "y": 915.55544090271,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "3a6cd376.4295ac",
+                "86c6217d.bed2a"
+            ]
+        ]
+    },
+    {
+        "id": "3a6cd376.4295ac",
+        "type": "outcome",
+        "name": "UNI",
+        "xml": "<outcome value='UNI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1740.3330764770508,
+        "y": 903.2221584320068,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "b35b94b1.940ff8"
+            ]
+        ]
+    },
+    {
+        "id": "86c6217d.bed2a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1742.5553359985352,
+        "y": 970.5555419921875,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "e1b5d596.201438"
+            ]
+        ]
+    },
+    {
+        "id": "9f9c7a46.ce0ff8",
+        "type": "save",
+        "name": "update pinterface cep DB Zend",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1571.1112060546875,
+        "y": 1009.9999141693115,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "74642edb.088ea",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-cep`\" />\n",
+        "comments": "",
+        "x": 2139.999885559082,
+        "y": 972.2221412658691,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "b35b94b1.940ff8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value='`$zend-cep`' />\n",
+        "comments": "",
+        "x": 1866.6664352416992,
+        "y": 902.2221622467041,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "33fa91ea.5695ce",
+        "type": "delete",
+        "name": "delete service instance AAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1466.6664199829102,
+        "y": 1124.4443254470825,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "70a0ebe0.92bcd4",
+        "type": "get-resource",
+        "name": "get service db",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\npfx='output'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n     \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1487.7775344848633,
+        "y": 1067.7777080535889,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e1b5d596.201438",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$db-zend.connection-point`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1884.4444444444443,
+        "y": 973.3333333333333,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "1ff79f49.8fba61",
+                "54376f65.aa57"
+            ]
+        ]
+    },
+    {
+        "id": "1ff79f49.8fba61",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2012.2222061157227,
+        "y": 974.4444217681885,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "74642edb.088ea"
+            ]
+        ]
+    },
+    {
+        "id": "f9bfc410.022418",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='zend-new' value=\"`$db-zend.connection-point + ',' + $zend-cep`\" />\n",
+        "comments": "",
+        "x": 2142.221981048584,
+        "y": 1038.8887939453125,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "54376f65.aa57",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2024.4444444444443,
+        "y": 1037.7777777777778,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "f9bfc410.022418"
+            ]
+        ]
+    },
+    {
+        "id": "af008805.61eae8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$db-aend.connection-point`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1935.5554428100586,
+        "y": 723.3333148956299,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "fdc21e7c.da331",
+                "ede7f03e.32c01"
+            ]
+        ]
+    },
+    {
+        "id": "6ca90d2f.d086e4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-cep`\" />\n",
+        "comments": "",
+        "x": 2210,
+        "y": 712.22216796875,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "fdc21e7c.da331",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2082.2223205566406,
+        "y": 714.4444484710693,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "6ca90d2f.d086e4"
+            ]
+        ]
+    },
+    {
+        "id": "f35c33d.adfbfd",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='aend-new' value=\"`$db-aend.connection-point + ',' + $aend-cep`\" />\n",
+        "comments": "",
+        "x": 2212.222095489502,
+        "y": 778.8888206481934,
+        "z": "ecded786.86d6f8",
+        "wires": []
+    },
+    {
+        "id": "ede7f03e.32c01",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2094.4445588853623,
+        "y": 777.7778044806587,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            [
+                "f35c33d.adfbfd"
+            ]
+        ]
+    },
+    {
+        "id": "425e8f1f.07ad6",
+        "type": "delete",
+        "name": "delete from db",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",
+        "comments": "",
+        "outputs": 1,
+        "x": 1377.7776336669922,
+        "y": 1185.5554809570312,
+        "z": "ecded786.86d6f8",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_success-aai-update-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_success-aai-update-tapi.json
new file mode 100644
index 00000000..497a75c8
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_success-aai-update-tapi.json
@@ -0,0 +1,156 @@
+[
+    {
+        "id": "257d2596.c5ecca",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 571,
+        "y": 662,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            [
+                "5432b538.633ffc",
+                "7695aa94.c622d4",
+                "ebe3ff74.b36dd"
+            ]
+        ]
+    },
+    {
+        "id": "1cc69ab0.52e865",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 101.5,
+        "y": 597,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            [
+                "d088abd2.9587b8"
+            ]
+        ]
+    },
+    {
+        "id": "d088abd2.9587b8",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<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='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 249.5,
+        "y": 654,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            [
+                "ddbd4624.086548"
+            ]
+        ]
+    },
+    {
+        "id": "ddbd4624.086548",
+        "type": "method",
+        "name": "method success-aai-update-tapi",
+        "xml": "<method rpc='success-aai-update-tapi' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 439.5,
+        "y": 589,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            [
+                "257d2596.c5ecca"
+            ]
+        ]
+    },
+    {
+        "id": "5432b538.633ffc",
+        "type": "save",
+        "name": "save",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $aend-node-uuid + '/p-interfaces/p-interface/' + $aend-nep `\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$aend-node-uuid`\" /> \n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $zend-node-uuid + '/p-interfaces/p-interface/' + $zend-nep `\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$zend-node-uuid`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 729,
+        "y": 607,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7695aa94.c622d4",
+        "type": "get-resource",
+        "name": "Get service from AAI",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id'  \npfx='aai.service'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 788,
+        "y": 661,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ebe3ff74.b36dd",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idy' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 700,
+        "y": 733,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            [
+                "50909009.4a074"
+            ]
+        ]
+    },
+    {
+        "id": "50909009.4a074",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 847,
+        "y": 733,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            [
+                "65d0b7bd.e13a18",
+                "9f8f4fb.cc3cbb"
+            ]
+        ]
+    },
+    {
+        "id": "65d0b7bd.e13a18",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />\n<parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />\n\n",
+        "comments": "",
+        "x": 991,
+        "y": 637,
+        "z": "2ef02d36.ca2f92",
+        "wires": []
+    },
+    {
+        "id": "9f8f4fb.cc3cbb",
+        "type": "call",
+        "name": "call call-bandwidth-update-pinterface",
+        "xml": "<call module='optical-service' rpc='call-bandwidth-update-pinterface' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127,
+        "y": 732,
+        "z": "2ef02d36.ca2f92",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/resources/graph.versions b/platform-logic/optical-service/src/main/resources/graph.versions
index 026c2ea3..16546853 100644
--- a/platform-logic/optical-service/src/main/resources/graph.versions
+++ b/platform-logic/optical-service/src/main/resources/graph.versions
@@ -3,3 +3,20 @@ optical-service optical-service-create ${project.version} sync
 optical-service optical-service-create-sync-success ${project.version} sync
 optical-service service-create-msa ${project.version} sync
 optical-service optical-service-delete ${project.version} sync
+optical-service optical-service_aai-delete-service-handling ${project.version} sync
+optical-service optical-service_bandwidth-update ${project.version} sync
+optical-service optical-service_bandwidth-update-odu1 ${project.version} sync
+optical-service optical-service_bandwidth-update-odu2 ${project.version} sync
+optical-service optical-service_bandwidth-update-odu3 ${project.version} sync
+optical-service optical-service_bandwidth-update-odu4 ${project.version} sync
+optical-service optical-service_call-bandwidth-update-pinterface ${project.version} sync
+optical-service optical-service_create-service-async ${project.version} sync
+optical-service optical-service_delete-service-async ${project.version} sync
+optical-service optical-service_handle-async-notif ${project.version} sync
+optical-service optical-service_service-create-tapi ${project.version} sync
+optical-service optical-service_service-delete-tapi ${project.version} sync
+optical-service optical-service_success-aai-update-tapi ${project.version} sync
+optical-service optical-service_delete-bandwidth-update-odu1 ${project.version} sync
+optical-service optical-service_delete-bandwidth-update-odu2 ${project.version} sync
+optical-service optical-service_delete-bandwidth-update-odu3 ${project.version} sync
+optical-service optical-service_delete-bandwidth-update-odu4 ${project.version} sync
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
new file mode 100644
index 00000000..0f3e967b
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
@@ -0,0 +1,69 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='aai-delete-service-handling' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Inside Revert PInterface details"/>
+            </record>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="service-instance"
+ key='customer.global-customer-id = $output.global-customer-id AND
+     service-subscription.service-type = $output.service-type AND
+     service-instance.service-instance-id = $output.service-instance-id' 
+pfx='aai.service'      local-only='false'></get-resource>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Inside Revert PInterface details"/>
+                <parameter name="field2" value="`$aai.service.orchestration-status`"/>
+                <parameter name="field3" value="`$aai.service.relationship-list.relationship_length`"/>
+            </record>
+            <for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >
+                <block atomic='true'>
+                    <set>
+                        <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
+                        <parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />
+                    </set>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Inside Revert PInterface details"/>
+                        <parameter name="field2" value="`$pnf-name`"/>
+                        <parameter name="field3" value="`$pinterface-name`"/>
+                    </record>
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="p-interface"
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name ' 
+pfx='p.in.details'      local-only='false'></get-resource>
+                    <set>
+                        <parameter name='new-rate' value='`$p.in.details.speed-value`' />
+                    </set>
+                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='p-interface'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name '
+      local-only='false'>
+                        <parameter name='available-capacity' value='`$new-rate`' />
+                    </update>
+                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '
+force='true' pfx='save-result'></save>
+                </block>
+            </for>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="service-instance"
+key='customer.global-customer-id = $output.global-customer-id AND
+service-subscription.service-type = $output.service-type AND
+service-instance.service-instance-id = $output.service-instance-id'></delete>
+            <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+    resource="SQL"
+    key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu1.xml b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu1.xml
new file mode 100644
index 00000000..5ea2571e
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu1.xml
@@ -0,0 +1,100 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='bandwidth-update-odu1' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='mul' value='`$odu-number * 1.25`' />
+                                        <parameter name='sub' value='`$mul - 1.25`' />
+                                        <parameter name='new-odu-number' value='`$sub / 1.25`' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+                <outcome value='ODU1'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu2.xml b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu2.xml
new file mode 100644
index 00000000..60ed0a47
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu2.xml
@@ -0,0 +1,205 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='bandwidth-update-odu2' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 1.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.5 - 2.5`' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU2'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu3.xml b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu3.xml
new file mode 100644
index 00000000..b527056c
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu3.xml
@@ -0,0 +1,340 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='bandwidth-update-odu3' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 1.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 2.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 2.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU3'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU2'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU3'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu4.xml b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu4.xml
new file mode 100644
index 00000000..1847f769
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update-odu4.xml
@@ -0,0 +1,509 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='bandwidth-update-odu4' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 1.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 2.5 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 10 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU3'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 - 40 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU4'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU2'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU3'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU4'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update.xml b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update.xml
new file mode 100644
index 00000000..d46ca2ef
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_bandwidth-update.xml
@@ -0,0 +1,90 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='bandwidth-update' mode='sync'>
+        <block atomic="true">
+            <switch test='`$pin.speed-value`'>
+                <outcome value='ODU0'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Inside bandwidth odu0 calculation"/>
+                        </record>
+                        <switch test='`$optical-service-create-input.payload.service-rate`'>
+                            <outcome value='ODU0'>
+                                <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                                    <block>
+                                        <set>
+                                            <parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                            <parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                                        </set>
+                                        <switch test='`$odu-name`'>
+                                            <outcome value='ODU0'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='new-odu-number' value='`0`' />
+                                                    </set>
+                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                                        <parameter name='number' value='`$new-odu-number`' />
+                                                    </update>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </block>
+                                </for>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Inside bandwidth odu1 calculation"/>
+                        </record>
+                        <call module='optical-service' rpc='bandwidth-update-odu1' mode='sync' ></call>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Inside bandwidth odu2 calculation"/>
+                        </record>
+                        <call module='optical-service' rpc='bandwidth-update-odu2' mode='sync' ></call>
+                    </block>
+                </outcome>
+                <outcome value='ODU3'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Inside bandwidth odu3 calculation"/>
+                        </record>
+                        <call module='optical-service' rpc='bandwidth-update-odu3' mode='sync' ></call>
+                    </block>
+                </outcome>
+                <outcome value='ODU4'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Inside bandwidth odu4 calculation"/>
+                        </record>
+                        <call module='optical-service' rpc='bandwidth-update-odu4' mode='sync' ></call>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_call-bandwidth-update-pinterface.xml b/platform-logic/optical-service/src/main/xml/optical-service_call-bandwidth-update-pinterface.xml
new file mode 100644
index 00000000..1a39aa6b
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_call-bandwidth-update-pinterface.xml
@@ -0,0 +1,47 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='call-bandwidth-update-pinterface' mode='sync'>
+        <block atomic="true">
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/test.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="`$div`"/>
+            </record>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="p-interface"
+ key="pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND depth = 'all'"
+pfx='pin'      local-only='false'></get-resource>
+            <switch test='`$pin.network-interface-type`'>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Port is NNI"/>
+                        </record>
+                        <call module='optical-service' rpc='bandwidth-update' mode='sync' ></call>
+                    </block>
+                </outcome>
+                <outcome value='UNI'>
+                    <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Port is UNI"/>
+                        </record>
+                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name' 
+      local-only='false'>
+                            <parameter name='available-capacity' value='0' />
+                        </update>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml b/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml
new file mode 100644
index 00000000..db55f387
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml
@@ -0,0 +1,72 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='create-service-async' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Inside Create Service Async"/>
+            </record>
+            <switch test='`$response-code`'>
+                <outcome value='200'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='response-message' value='SUCCESS' />
+                        </set>
+                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='service-instance'
+     key='customer.global-customer-id = $output.global-customer-id AND
+     service-subscription.service-type = $output.service-type AND
+     service-instance.service-instance-id = $output.service-instance-id' 
+      local-only='false'>
+                            <parameter name='orchestration-status' value='CREATED' />
+                        </update>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $request-id'
+force='true' pfx='save-result'></save>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Finished updating service in AAI and DB to CREATED"/>
+                        </record>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='response-message' value='FAILURE' />
+                        </set>
+                        <call module='optical-service' rpc='aai-delete-service-handling' mode='sync' ></call>
+                    </block>
+                </outcome>
+            </switch>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.template.so.response.filename`" />
+                <parameter name="restapiUrl" value="`$output.notification-url`"/>
+                <parameter name="restapiUser" value="`$prop.so.username`" />
+                <parameter name="restapiPassword" value="`$prop.so.password`"/>
+                <parameter name="httpMethod" value="POST"/>
+                <parameter name="responsePrefix" value="so-response"/>
+                <parameter name='contentType' value='application/json' />
+                <parameter name='format' value='json' />
+                <outcome value='failure'>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Send to SO fails for service create"/>
+                    </record>
+                </outcome>
+                <outcome value='success'>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Send to SO Success for service create"/>
+                    </record>
+                </outcome>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu1.xml b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu1.xml
new file mode 100644
index 00000000..a3ca82ba
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu1.xml
@@ -0,0 +1,103 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='delete-bandwidth-update-odu1' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <set>
+                            <parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='mul' value='`$odu-number * 1.25`' />
+                                        <parameter name='add' value='`$new-rate + $mul + 1.25`' />
+                                        <parameter name='new-odu-number' value='`$add / 1.25`' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+                <outcome value='ODU1'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='1' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu2.xml b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu2.xml
new file mode 100644
index 00000000..0841388f
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu2.xml
@@ -0,0 +1,205 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='delete-bandwidth-update-odu2' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 1.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='0' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.5 + 2.5`' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='0' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU2'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='1' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu3.xml b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu3.xml
new file mode 100644
index 00000000..6ae20655
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu3.xml
@@ -0,0 +1,340 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='delete-bandwidth-update-odu3' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 1.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 2.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 10 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU3'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='32' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='16' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU2'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='4' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU3'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='1' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $aend-pnf-name AND
+     p-interface.interface-name = $aend-nep AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu4.xml b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu4.xml
new file mode 100644
index 00000000..d73a89db
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_delete-bandwidth-update-odu4.xml
@@ -0,0 +1,509 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='delete-bandwidth-update-odu4' mode='sync'>
+        <block atomic="true">
+            <switch test='`$optical-service-create-input.payload.service-rate`'>
+                <outcome value='ODU0'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 1.25 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 100`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU1'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 2.5 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 100`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU2'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 10 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 100`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU3'>
+                    <block>
+                        <set>
+                            <parameter name='new-rate' value='' />
+                        </set>
+                        <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                            <set>
+                                <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                                <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                            </set>
+                            <switch test='`$odu-name`'>
+                                <outcome value='ODU0'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-rate' value='`$new-rate + $odu-number * 1.25 + 40 `' />
+                                            <parameter name='new-odu-number' value='`$new-rate / 1.25`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU1'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 2.5`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU2'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 10`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU3'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 40`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                                <outcome value='ODU4'>
+                                    <block>
+                                        <set>
+                                            <parameter name='new-odu-number' value='`$new-rate / 100`' />
+                                        </set>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                            <parameter name='number' value='`$new-odu-number`' />
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='ODU4'>
+                    <for index='idx' start='0' end='pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth_length' >
+                        <set>
+                            <parameter name='odu-name' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].odu-type`' />
+                            <parameter name='odu-number' value='`$pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[$idx].number`' />
+                        </set>
+                        <switch test='`$odu-name`'>
+                            <outcome value='ODU0'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='80' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU1'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='40' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU2'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='10' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU3'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='2' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                            <outcome value='ODU4'>
+                                <block>
+                                    <set>
+                                        <parameter name='new-odu-number' value='1' />
+                                    </set>
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='available-bandwidth'
+     key='pnf.pnf-name = $pnf-name AND
+     p-interface.interface-name = $pinterface-name AND
+     bandwidth-attribute.id = $pin.bandwidth-attributes.bandwidth-attribute[0].id AND
+     available-bandwidth.id = $pin.bandwidth-attributes.bandwidth-attribute[0].available-bandwidth-map.available-bandwidth[0].id' 
+      local-only='false'>
+                                        <parameter name='number' value='`$new-odu-number`' />
+                                    </update>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_delete-service-async.xml b/platform-logic/optical-service/src/main/xml/optical-service_delete-service-async.xml
new file mode 100644
index 00000000..f00f00ce
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_delete-service-async.xml
@@ -0,0 +1,67 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='delete-service-async' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Inside Delete Service Async"/>
+            </record>
+            <switch test='`$response-code`'>
+                <outcome value='200'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='response-message' value='SUCCESS' />
+                        </set>
+                        <call module='optical-service' rpc='aai-delete-service-handling' mode='sync' ></call>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='response-message' value='FAILURE' />
+                        </set>
+                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='service-instance'
+     key='customer.global-customer-id = $output.global-customer-id AND
+     service-subscription.service-type = $output.service-type AND
+     service-instance.service-instance-id = $output.service-instance-id' 
+      local-only='false'>
+                            <parameter name='orchestration-status' value='CREATED' />
+                        </update>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $request-id'
+force='true' pfx='save-result'></save>
+                    </block>
+                </outcome>
+            </switch>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/async-response-so.json'`" />
+                <parameter name="restapiUrl" value="`$output.notification-url`"/>
+                <parameter name="restapiUser" value="`$prop.so.username`" />
+                <parameter name="restapiPassword" value="`$prop.so.password`"/>
+                <parameter name="httpMethod" value="POST"/>
+                <parameter name="responsePrefix" value="so-response"/>
+                <parameter name='contentType' value='application/json' />
+                <parameter name='format' value='json' />
+                <outcome value='failure'>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Send to SO fails for service delete"/>
+                    </record>
+                </outcome>
+                <outcome value='success'>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Send to SO fails for service delete"/>
+                    </record>
+                </outcome>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_handle-async-notif.xml b/platform-logic/optical-service/src/main/xml/optical-service_handle-async-notif.xml
new file mode 100644
index 00000000..bcae1f4f
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_handle-async-notif.xml
@@ -0,0 +1,44 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='handle-async-notif' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Reached async graph"/>
+                <parameter name="field2" value="`$request-id`"/>
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <switch test='`$ack-final-indicator`'>
+                <outcome value='N'>
+                    <block atomic='true'>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Ack indicator in 'N'"/>
+                        </record>
+                    </block>
+                </outcome>
+                <outcome value='Y'>
+                    <block atomic='true'>
+                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
+key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '
+pfx='output'></get-resource>
+                        <switch test='`$output.status`'>
+                            <outcome value='CREATING'>
+                                <call module='optical-service' rpc='create-service-async' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='DELETING'>
+                                <call module='optical-service' rpc='delete-service-async' mode='sync' ></call>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
new file mode 100644
index 00000000..f35446d8
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
@@ -0,0 +1,406 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='service-create-tapi' mode='sync'>
+        <block atomic="true">
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Inside optical service create tapi"/>
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'
+pfx='db-aend'>
+                <outcome value='success'>
+                    <set>
+                        <parameter name='aend-node-uuid' value='`$db-aend.pnf-name`' />
+                        <parameter name='aend-pnf-name' value='`$db-aend.pnf-id`' />
+                        <parameter name='aend-cep-list' value='`$db-aend.connection-point`' />
+                        <parameter name='aend-nep' value='`$db-aend.interface-name`' />
+                        <parameter name='aend-rate' value='`$db-aend.rate`' />
+                    </set>
+                </outcome>
+            </get-resource>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $optical-service-create-input.payload.service-zend.port-id'
+pfx='db-zend'>
+                <outcome value='success'>
+                    <set>
+                        <parameter name='zend-node-uuid' value='`$db-zend.pnf-name`' />
+                        <parameter name='zend-pnf-name' value='`$db-zend.pnf-id`' />
+                        <parameter name='zend-cep-list' value='`$db-zend.connection-point`' />
+                        <parameter name='zend-nep' value='`$db-zend.interface-name`' />
+                        <parameter name='zend-rate' value='`$db-zend.rate`' />
+                    </set>
+                </outcome>
+            </get-resource>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="p-interface"
+ key="pnf.pnf-name = $aend-node-uuid AND
+     p-interface.interface-name = $aend-nep"
+pfx='aend'      local-only='false'></get-resource>
+            <switch test='`$aend.network-interface-type`'>
+                <outcome value='UNI'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='aend-cep' value='`$aend-cep-list`' />
+                            <parameter name='aend-new' value='' />
+                            <parameter name='aend-new-rate' value='0' />
+                        </set>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Aend uni"/>
+                        </record>
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.cep.details.url + $aend-cep`" />
+                            <parameter name="restapiUser" value="admin"/>
+                            <parameter name="restapiPassword" value="admin"/>
+                            <parameter name="httpMethod" value="GET"/>
+                            <parameter name="responsePrefix" value="aend-cep-response"/>
+                            <parameter name='contentType' value='application/json' />
+                            <parameter name='format' value='json' />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                            <parameter name="trustStorePassword" value="adminadmin"/>
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                            <parameter name="keyStorePassword" value="adminadmin"/>
+                            <outcome value='failure'>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="Failed to get Aend cep details"/>
+                                </record>
+                            </outcome>
+                            <outcome value='success'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='aend-local-id' value="`'/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`" />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </execute>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='aend-new' value='' />
+                            <parameter name='aend-local-id' value='' />
+                        </set>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <parameter name="original_string" value='`$aend-cep-list`'/>
+                            <parameter name="regex" value=","/>
+                            <parameter name="ctx_memory_result_key" value="param-prefix"/>
+                        </execute>
+                        <for index='idx' start='0' end='`$param-prefix_length`' >
+                            <block atomic="true">
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.cep.details.url + $param-prefix[$idx]`" />
+                                    <parameter name="restapiUser" value="admin"/>
+                                    <parameter name="restapiPassword" value="admin"/>
+                                    <parameter name="httpMethod" value="GET"/>
+                                    <parameter name="responsePrefix" value="aend-cep-response"/>
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Failed to get Aend cep details"/>
+                                        </record>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block atomic="true">
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                                                <parameter name="level" value="info" />
+                                                <parameter name="field1" value="Sucessfully retrieved aend cep"/>
+                                            </record>
+                                            <switch test='`$aend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>
+                                                <outcome value='true'>
+                                                    <block atomic='true'>
+                                                        <set>
+                                                            <parameter name='aend-local-id' value="`$aend-local-id + '/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`" />
+                                                            <parameter name='aend-cep' value='`$param-prefix[$idx]`'/>
+                                                        </set>
+                                                        <break/>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='false'>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value='No service interface points could be found for A end ' />
+                                                        <parameter name='ack-final-indicator' value="Y" />
+                                                    </return>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </execute>
+                            </block>
+                        </for>
+                        <switch test='`$param-prefix_length == 1`'>
+                            <outcome value='true'>
+                                <set>
+                                    <parameter name='zend-new' value="`$zend-new`" />
+                                </set>
+                            </outcome>
+                            <outcome value='false'>
+                                <for index='idy' start='0' end='`$param-prefix_length`' >
+                                    <switch test='`$idy`'>
+                                        <outcome value='`$param-prefix_length - 1`'>
+                                            <set>
+                                                <parameter name='aend-new' value="`$aend-new + $param-prefix[$idy]`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <set>
+                                                <parameter name='aend-new' value="`$aend-new + $param-prefix[$idy] + ','`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='`$idx`'>
+                                            <set>
+                                                <parameter name='aend-new' value='`$aend-new`' />
+                                            </set>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="p-interface"
+ key="pnf.pnf-name = $zend-node-uuid AND
+     p-interface.interface-name = $zend-nep"
+pfx='zend'      local-only='false'></get-resource>
+            <switch test='`$zend.network-interface-type`'>
+                <outcome value='UNI'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='zend-cep' value='`$zend-cep-list`' />
+                            <parameter name='zend-new' value='' />
+                            <parameter name='zend-new-rate' value='0' />
+                        </set>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Zend uni"/>
+                        </record>
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.cep.details.url + $zend-cep`" />
+                            <parameter name="restapiUser" value="admin"/>
+                            <parameter name="restapiPassword" value="admin"/>
+                            <parameter name="httpMethod" value="GET"/>
+                            <parameter name="responsePrefix" value="zend-cep-response"/>
+                            <parameter name='contentType' value='application/json' />
+                            <parameter name='format' value='json' />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                            <parameter name="trustStorePassword" value="adminadmin"/>
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                            <parameter name="keyStorePassword" value="adminadmin"/>
+                            <outcome value='failure'>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="Failed to get Aend cep details"/>
+                                </record>
+                            </outcome>
+                            <outcome value='success'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='zend-local-id' value="`'/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`" />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </execute>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='zend-new' value='' />
+                            <parameter name='zend-local-id' value='' />
+                        </set>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <parameter name="original_string" value='`$zend-cep-list`'/>
+                            <parameter name="regex" value=","/>
+                            <parameter name="ctx_memory_result_key" value="param-prefix1"/>
+                        </execute>
+                        <for index='idk' start='0' end='`$param-prefix1_length`' >
+                            <block atomic="true">
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.cep.details.url + $param-prefix1[$idk]`" />
+                                    <parameter name="restapiUser" value="admin"/>
+                                    <parameter name="restapiPassword" value="admin"/>
+                                    <parameter name="httpMethod" value="GET"/>
+                                    <parameter name="responsePrefix" value="zend-cep-response"/>
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                    <outcome value='failure'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Failed to get zend cep details"/>
+                                        </record>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block atomic="true">
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                                                <parameter name="level" value="info" />
+                                                <parameter name="field1" value="Sucessfully retrieved zend cep"/>
+                                            </record>
+                                            <switch test='`$zend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>
+                                                <outcome value='true'>
+                                                    <block>
+                                                        <set>
+                                                            <parameter name='zend-local-id' value="`$zend-local-id + '/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`" />
+                                                            <parameter name='zend-cep' value='`$param-prefix1[$idk]`'/>
+                                                        </set>
+                                                        <break/>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='false'>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value='No service interface points could be found for Z end ' />
+                                                        <parameter name='ack-final-indicator' value="Y" />
+                                                    </return>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </execute>
+                            </block>
+                        </for>
+                        <switch test='`$param-prefix1_length == 1`'>
+                            <outcome value='true'>
+                                <set>
+                                    <parameter name='zend-new' value="`$zend-new`" />
+                                </set>
+                            </outcome>
+                            <outcome value='false'>
+                                <for index='idl' start='0' end='`$param-prefix1_length`' >
+                                    <switch test='`$idl`'>
+                                        <outcome value='`$param-prefix1_length - 1`'>
+                                            <set>
+                                                <parameter name='zend-new' value="`$zend-new + $param-prefix1[$idl]`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <set>
+                                                <parameter name='zend-new' value="`$zend-new + $param-prefix1[$idl] + ','`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='`$idk`'>
+                                            <set>
+                                                <parameter name='zend-new' value='`$zend-new`' />
+                                            </set>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name`" />
+                <parameter name='svc-action' value="CREATE" />
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="A end local-id"/>
+                <parameter name="field2" value="`$aend-local-id`"/>
+                <parameter name="field3" value="Z end local-id"/>
+                <parameter name="field4" value="`$zend-local-id`"/>
+                <parameter name="field5" value="Service name"/>
+                <parameter name="field6" value="`$service-name`"/>
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-create-tapi.json'`" />
+                <parameter name="restapiUrl" value="`$controller-ip + '/cxf/tapi/v2/connectivities/tapi-services'`"/>
+                <parameter name="restapiUser" value="admin"/>
+                <parameter name="restapiPassword" value="admin"/>
+                <parameter name="httpMethod" value="POST"/>
+                <parameter name="responsePrefix" value="tapi-service-response"/>
+                <parameter name='contentType' value='application/json' />
+                <parameter name='format' value='json' />
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <return status='failure'>
+                            <parameter name='error-code' value='500' />
+                            <parameter name='error-message' value='Service creation failed' />
+                            <parameter name='ack-final-indicator' value="Y" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='success'>
+                    <block atomic='true'>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATED' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , null );"></save>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'
+force='true' pfx='save-result'></save>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'
+force='true' pfx='save-result'></save>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  
+     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
+     service-subscription.service-type = $optical-service-create-input.service-type AND
+     service-instance.service-instance-id = $optical-service-create-input.service-id' >
+                            <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />
+                            <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />
+                            <parameter name='service-type' value='Domain-Service' />
+                            <parameter name='orchestration-status' value='CREATED' />
+                            <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />
+                            <parameter name='service-layer' value='ODU' />
+                        </save>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  
+     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
+     service-subscription.service-type = $optical-service-create-input.service-type AND
+     service-instance.service-instance-id = $optical-service-create-input.service-id' 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/' + $aend-node-uuid + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-aend.port-id `" />
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$aend-node-uuid`" />
+                            <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
+                            <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $zend-node-uuid + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-zend.port-id `" />
+                            <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+                            <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$zend-node-uuid`" />
+                        </save>
+                        <return status='success'>
+                            <parameter name='error-code' value='200' />
+                            <parameter name='error-message' value='Service created successfully' />
+                            <parameter name='ack-final-indicator' value="Y" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
new file mode 100644
index 00000000..919c5548
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
@@ -0,0 +1,152 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='service-delete-tapi' mode='sync'>
+        <block atomic="true">
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Inside optical service delete tapi"/>
+            </record>
+            <set>
+                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`" />
+                <parameter name="restapiUser" value="admin"/>
+                <parameter name="restapiPassword" value="admin"/>
+                <parameter name="httpMethod" value="GET"/>
+                <parameter name="responsePrefix" value="services-response"/>
+                <parameter name='contentType' value='application/json' />
+                <parameter name='format' value='json' />
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <outcome value='failure'></outcome>
+                <outcome value='success'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='aend-nep' value="`$services-response.service[0].end-point[0].connection-end-point[0].node-edge-point-uuid`" />
+                            <parameter name='zend-nep' value="`$services-response.service[0].end-point[1].connection-end-point[0].node-edge-point-uuid`" />
+                            <parameter name='aend-cep' value="`$services-response.service[0].end-point[0].connection-end-point[0].connection-end-point-uuid`" />
+                            <parameter name='zend-cep' value="`$services-response.service[0].end-point[1].connection-end-point[0].connection-end-point-uuid`" />
+                        </set>
+                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $aend-nep'
+pfx='db-aend'></get-resource>
+                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $zend-nep'
+pfx='db-zend'></get-resource>
+                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`" />
+                            <parameter name="restapiUser" value="admin"/>
+                            <parameter name="restapiPassword" value="admin"/>
+                            <parameter name="httpMethod" value="DELETE"/>
+                            <parameter name="responsePrefix" value="tapi-service-response"/>
+                            <parameter name='contentType' value='application/json' />
+                            <parameter name='format' value='json' />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                            <parameter name="trustStorePassword" value="adminadmin"/>
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                            <parameter name="keyStorePassword" value="adminadmin"/>
+                            <outcome value='failure'>
+                                <block atomic='true'>
+                                    <return status='failure'>
+                                        <parameter name='error-code' value='500' />
+                                        <parameter name='error-message' value='Service Deletion failed' />
+                                        <parameter name='ack-final-indicator' value="Y" />
+                                    </return>
+                                </block>
+                            </outcome>
+                            <outcome value='success'>
+                                <block atomic='true'>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="p-interface"
+ key="pnf.pnf-name = $db-aend.pnf-name AND
+     p-interface.interface-name = $aend-nep"
+pfx='aend'      local-only='false'></get-resource>
+                                    <switch test='`$aend.network-interface-type`'>
+                                        <outcome value='UNI'>
+                                            <set>
+                                                <parameter name='aend-new' value='`$aend-cep`' />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <switch test='`$db-aend.connection-point`'>
+                                                <outcome value=''>
+                                                    <set>
+                                                        <parameter name='aend-new' value="`$aend-cep`" />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <set>
+                                                        <parameter name='aend-new' value="`$db-aend.connection-point + ',' + $aend-cep`" />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'
+force='true' pfx='save-result'></save>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="p-interface"
+ key="pnf.pnf-name = $db-zend.pnf-name AND
+     p-interface.interface-name = $zend-nep"
+pfx='zend'      local-only='false'></get-resource>
+                                    <switch test='`$zend.network-interface-type`'>
+                                        <outcome value='UNI'>
+                                            <set>
+                                                <parameter name='zend-new' value='`$zend-cep`' />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <switch test='`$db-zend.connection-point`'>
+                                                <outcome value=''>
+                                                    <set>
+                                                        <parameter name='zend-new' value="`$zend-cep`" />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <set>
+                                                        <parameter name='zend-new' value="`$db-zend.connection-point + ',' + $zend-cep`" />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'
+force='true' pfx='save-result'></save>
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
+key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '
+pfx='output'></get-resource>
+                                    <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="service-instance"
+key='customer.global-customer-id = $output.global-customer-id AND
+service-subscription.service-type = $output.service-type AND
+service-instance.service-instance-id = $output.service-instance-id'></delete>
+                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+    resource="SQL"
+    key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>
+                                    <return status='success'>
+                                        <parameter name='error-code' value='200' />
+                                        <parameter name='error-message' value='Service deleted successfully' />
+                                        <parameter name='ack-final-indicator' value="Y" />
+                                    </return>
+                                </block>
+                            </outcome>
+                        </execute>
+                    </block>
+                </outcome>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_success-aai-update-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_success-aai-update-tapi.xml
new file mode 100644
index 00000000..c3b9639b
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_success-aai-update-tapi.xml
@@ -0,0 +1,36 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='success-aai-update-tapi' mode='sync'>
+        <block atomic="true">
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  
+     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
+     service-subscription.service-type = $optical-service-create-input.service-type AND
+     service-instance.service-instance-id = $optical-service-create-input.service-id' 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/' + $aend-node-uuid + '/p-interfaces/p-interface/' + $aend-nep `" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$aend-node-uuid`" />
+                <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
+                <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $zend-node-uuid + '/p-interfaces/p-interface/' + $zend-nep `" />
+                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$zend-node-uuid`" />
+            </save>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="service-instance"
+key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
+     service-subscription.service-type = $optical-service-create-input.service-type AND
+     service-instance.service-instance-id = $optical-service-create-input.service-id'  
+pfx='aai.service'      local-only='false'></get-resource>
+            <for index='idy' start='0' end='`$aai.service.relationship-list.relationship_length`' >
+                <block atomic='true'>
+                    <set>
+                        <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
+                        <parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />
+                    </set>
+                    <call module='optical-service' rpc='call-bandwidth-update-pinterface' mode='sync' ></call>
+                </block>
+            </for>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file