From 93b36edae1b14165ebd9c0fc9bbbe916c725790a Mon Sep 17 00:00:00 2001
From: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Date: Thu, 28 Sep 2017 18:23:44 +0530
Subject: [PATCH] Updated DG for network-topology-operation-activate

Following changes are included:
1) Handle l2 and l3 dci.
2) Handle 2 sites data keeping rest node template generic.
3) Fetch 3rd parth controller information using site-id.

Change-Id: I6d075cab2c7850197d91bd4e707c10c579458d48
Issue-Id: SDNC-104
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
---
 dgbuilder/tools/pom.xml_base                       |   79 ++
 ...nnects-network-topology-operation-activate.json | 1125 ++++++++++++++++++++
 ...nnects-network-topology-operation-activate.json |  623 -----------
 ...onnects-network-topology-operation-activate.xml |  218 ++++
 ...onnects-network-topology-operation-activate.xml |  142 ---
 5 files changed, 1422 insertions(+), 765 deletions(-)
 create mode 100644 dgbuilder/tools/pom.xml_base
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
 delete mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
 delete mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.xml

diff --git a/dgbuilder/tools/pom.xml_base b/dgbuilder/tools/pom.xml_base
new file mode 100644
index 00000000..c0708f06
--- /dev/null
+++ b/dgbuilder/tools/pom.xml_base
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openecomp.sdnc.core</groupId>
+                <artifactId>root</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>yangApp-model</artifactId>
+	<packaging>bundle</packaging>
+        <version>1.0.0-SNAPSHOT</version>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Import-Package>*</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.opendaylight.yangtools</groupId>
+				<artifactId>yang-maven-plugin</artifactId>
+				<version>${odl.yangtools.yang.maven.plugin.version}</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.opendaylight.mdsal</groupId>
+						<artifactId>maven-sal-api-gen-plugin</artifactId>
+						<version>${odl.sal.api.gen.plugin.version}</version>
+						<type>jar</type>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<goals>
+							<goal>generate-sources</goal>
+						</goals>
+						<configuration>
+							<yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
+							<codeGenerators>
+								<generator>
+									<codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+									<outputBaseDir>${salGeneratorPath}</outputBaseDir>
+								</generator>
+							</codeGenerators>
+							<inspectDependencies>true</inspectDependencies>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.opendaylight.mdsal</groupId>
+			<artifactId>yang-binding</artifactId>
+			<version>${odl.mdsal.yang.binding.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-common</artifactId>
+			<version>${odl.yangtools.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.mdsal.model</groupId>
+			<artifactId>ietf-inet-types</artifactId>
+			<version>${odl.ietf-inet-types.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.mdsal.model</groupId>
+			<artifactId>ietf-yang-types</artifactId>
+			<version>${odl.ietf-yang-types.version}</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
new file mode 100644
index 00000000..dbd501eb
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
@@ -0,0 +1,1125 @@
+[
+  {
+    "id":"2a040436.290c8c",
+    "type":"dgstart",
+    "name":"DGSTART",
+    "outputs":1,
+    "x":153.515625,
+    "y":124.515625,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "8161f964.80e1c8"
+      ]
+    ]
+  },
+  {
+    "id":"8161f964.80e1c8",
+    "type":"service-logic",
+    "name":"GENERIC-RESOURCE-API ${project.version}",
+    "module":"GENERIC-RESOURCE-API",
+    "version":"${project.version}",
+    "comments":"",
+    "xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs":1,
+    "x":370.015625,
+    "y":187.015625,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "30fee650.ed9d0a"
+      ]
+    ]
+  },
+  {
+    "id":"30fee650.ed9d0a",
+    "type":"method",
+    "name":"method network-topology-operation-activate",
+    "xml":"<method rpc='network-topology-operation-activate' mode='sync'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":278.0156555175781,
+    "y":282.01560974121094,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "20d450e0.f9c5c"
+      ]
+    ]
+  },
+  {
+    "id":"20d450e0.f9c5c",
+    "type":"block",
+    "name":"block : atomic",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "outputs":1,
+    "x":575.8489685058594,
+    "y":289.8489532470703,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "2a5bea3e.9ac986",
+        "69c54932.e08388",
+        "35413b11.2f5d34"
+      ]
+    ]
+  },
+  {
+    "id":"69c54932.e08388",
+    "type":"call",
+    "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters",
+    "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
+    "comments":"",
+    "outputs":1,
+    "x":965.8489685058594,
+    "y":154.8489532470703,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"896ee5a6.83b038",
+    "type":"for",
+    "name":"for each network-input-parameters",
+    "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
+    "comments":"",
+    "outputs":1,
+    "x":1483.8492584228516,
+    "y":427.849014043808,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "af2f5aa0.9db4d8"
+      ]
+    ]
+  },
+  {
+    "id":"af2f5aa0.9db4d8",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1730.8491668701172,
+    "y":425.84898352622986,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "c1ee07c8.a78ae8",
+        "a6b6dbe6.38ccc8",
+        "9e54353d.d1bfc8",
+        "66bffa85.510244",
+        "4785e157.899f7",
+        "663f250e.61399c",
+        "fab15712.1348c8",
+        "586d46f5.85b668",
+        "ec24e74c.17dbe8"
+      ]
+    ]
+  },
+  {
+    "id":"c1ee07c8.a78ae8",
+    "type":"switchNode",
+    "name":"switch id",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2217.84952545166,
+    "y":301.84910011291504,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "327b4262.8149de"
+      ]
+    ]
+  },
+  {
+    "id":"a6b6dbe6.38ccc8",
+    "type":"switchNode",
+    "name":"switch description",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2245.84952545166,
+    "y":355.8490858078003,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "514eeef4.8a908"
+      ]
+    ]
+  },
+  {
+    "id":"9e54353d.d1bfc8",
+    "type":"switchNode",
+    "name":"switch routerId",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2234.8493118286133,
+    "y":486.849045753479,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "53af1349.89045c"
+      ]
+    ]
+  },
+  {
+    "id":"66bffa85.510244",
+    "type":"switchNode",
+    "name":"switch importRT1",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2243.1350479125977,
+    "y":548.1347990036011,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "83930cf2.7360d"
+      ]
+    ]
+  },
+  {
+    "id":"4785e157.899f7",
+    "type":"switchNode",
+    "name":"switch exportRT1",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2244.135108947754,
+    "y":612.1347697973251,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "534f57af.d494e8"
+      ]
+    ]
+  },
+  {
+    "id":"663f250e.61399c",
+    "type":"switchNode",
+    "name":"switch vni",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2215.135078430176,
+    "y":675.134801864624,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "c26455d8.5ef828"
+      ]
+    ]
+  },
+  {
+    "id":"327b4262.8149de",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2432.84952545166,
+    "y":300.84910011291504,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "43d13ebf.45445"
+      ]
+    ]
+  },
+  {
+    "id":"514eeef4.8a908",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2443.84952545166,
+    "y":355.8490858078003,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "a9b60a7b.f654d8"
+      ]
+    ]
+  },
+  {
+    "id":"53af1349.89045c",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2439.8493118286133,
+    "y":485.849045753479,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "9f81d7be.b3b6e8"
+      ]
+    ]
+  },
+  {
+    "id":"83930cf2.7360d",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2445.1350479125977,
+    "y":547.1347990036011,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"534f57af.d494e8",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2440.135108947754,
+    "y":609.1347697973251,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"c26455d8.5ef828",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2421.135078430176,
+    "y":675.134801864624,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "8be01263.8a302"
+      ]
+    ]
+  },
+  {
+    "id":"a9b60a7b.f654d8",
+    "type":"set",
+    "name":"set description",
+    "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2625.84952545166,
+    "y":348.8490858078003,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"9f81d7be.b3b6e8",
+    "type":"set",
+    "name":"set router_id",
+    "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2630.8495330810547,
+    "y":478.8491325378418,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"8be01263.8a302",
+    "type":"set",
+    "name":"set l3_vni",
+    "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2591.135078430176,
+    "y":667.134801864624,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"2a5bea3e.9ac986",
+    "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":798.1347961425781,
+    "y":1130.5633239746094,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"fab15712.1348c8",
+    "type":"switchNode",
+    "name":"switch name",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2229.0160598754883,
+    "y":243.01573181152344,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "5e5a3418.1941bc"
+      ]
+    ]
+  },
+  {
+    "id":"5e5a3418.1941bc",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2427.0160598754883,
+    "y":243.01573181152344,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "5ff1b9ff.668d98"
+      ]
+    ]
+  },
+  {
+    "id":"5ff1b9ff.668d98",
+    "type":"set",
+    "name":"set name",
+    "xml":"<set>\n<parameter name='prop.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2609.0160598754883,
+    "y":236.01573181152344,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"586d46f5.85b668",
+    "type":"switchNode",
+    "name":"switch networkName",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2252.5158462524414,
+    "y":422.0156717300415,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "42b0bf4c.61f81"
+      ]
+    ]
+  },
+  {
+    "id":"42b0bf4c.61f81",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2450.5158462524414,
+    "y":422.0156717300415,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"35413b11.2f5d34",
+    "type":"block",
+    "name":"block : execute",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "comments":"",
+    "outputs":1,
+    "x":799.5155563354492,
+    "y":663.0156707763672,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "44be3858.556028",
+        "82979b1a.ffa758"
+      ]
+    ]
+  },
+  {
+    "id":"44be3858.556028",
+    "type":"block",
+    "name":"block : executeSite1",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "comments":"",
+    "outputs":1,
+    "x":1092.0156173706055,
+    "y":487.5156469345093,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "896ee5a6.83b038",
+        "6a6dccab.683c44"
+      ]
+    ]
+  },
+  {
+    "id":"82979b1a.ffa758",
+    "type":"block",
+    "name":"block : executeSite2",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "comments":"",
+    "outputs":1,
+    "x":1109.0156631469727,
+    "y":1003.5156297683716,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "de7fc2e1.99f1a",
+        "6a6dccab.683c44"
+      ]
+    ]
+  },
+  {
+    "id":"77dd9b7e.75bb04",
+    "type":"switchNode",
+    "name":"switch id",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2203.515869140625,
+    "y":822.5155639648438,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "fa545715.6bc4d8"
+      ]
+    ]
+  },
+  {
+    "id":"cbab9cb6.9af94",
+    "type":"switchNode",
+    "name":"switch description",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2227.5162200927734,
+    "y":881.515570640564,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "eca3282e.6ef838",
+        "e75e638.f112aa"
+      ]
+    ]
+  },
+  {
+    "id":"2b87cf93.6aebd",
+    "type":"switchNode",
+    "name":"switch routerId",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2236.515609741211,
+    "y":1077.5155363082886,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "5395f6bd.9d59d8"
+      ]
+    ]
+  },
+  {
+    "id":"1400dc59.ed1ce4",
+    "type":"switchNode",
+    "name":"switch importRT1",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2244.8013458251953,
+    "y":1138.8012895584106,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "bb1a369b.7663b8"
+      ]
+    ]
+  },
+  {
+    "id":"7f102eb1.e249d",
+    "type":"switchNode",
+    "name":"switch exportRT1",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2245.8014068603516,
+    "y":1202.8012603521347,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "92bb4854.187448"
+      ]
+    ]
+  },
+  {
+    "id":"e8e9faf3.7fedc8",
+    "type":"switchNode",
+    "name":"switch vni",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2216.8013763427734,
+    "y":1265.8012924194336,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "f8be59bd.a42528"
+      ]
+    ]
+  },
+  {
+    "id":"fa545715.6bc4d8",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2418.515869140625,
+    "y":821.5155639648438,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "f8a4213a.dfd9b"
+      ]
+    ]
+  },
+  {
+    "id":"eca3282e.6ef838",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2425.5162200927734,
+    "y":881.515570640564,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "52d4304f.1112c"
+      ]
+    ]
+  },
+  {
+    "id":"5395f6bd.9d59d8",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2441.515609741211,
+    "y":1076.5155363082886,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "6207e038.3cb7a"
+      ]
+    ]
+  },
+  {
+    "id":"bb1a369b.7663b8",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2446.8013458251953,
+    "y":1137.8012895584106,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"92bb4854.187448",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2441.8014068603516,
+    "y":1199.8012603521347,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"f8be59bd.a42528",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2422.8013763427734,
+    "y":1265.8012924194336,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "a6ac757.8e55c88"
+      ]
+    ]
+  },
+  {
+    "id":"52d4304f.1112c",
+    "type":"set",
+    "name":"set description",
+    "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2607.5162200927734,
+    "y":874.515570640564,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"6207e038.3cb7a",
+    "type":"set",
+    "name":"set router_id",
+    "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2632.5158309936523,
+    "y":1069.5156230926514,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"a6ac757.8e55c88",
+    "type":"set",
+    "name":"set l3_vni",
+    "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2592.8013763427734,
+    "y":1257.8012924194336,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"8a2a845c.c20518",
+    "type":"switchNode",
+    "name":"switch networkName",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2254.182144165039,
+    "y":1012.6821622848511,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "cba705fe.7fbd68"
+      ]
+    ]
+  },
+  {
+    "id":"cba705fe.7fbd68",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2452.182144165039,
+    "y":1012.6821622848511,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"7621d3f.20db72c",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1722.5153198242188,
+    "y":944.5155217647552,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "77dd9b7e.75bb04",
+        "cbab9cb6.9af94",
+        "2b87cf93.6aebd",
+        "1400dc59.ed1ce4",
+        "7f102eb1.e249d",
+        "e8e9faf3.7fedc8",
+        "8a2a845c.c20518"
+      ]
+    ]
+  },
+  {
+    "id":"de7fc2e1.99f1a",
+    "type":"for",
+    "name":"for each network-input-parameters",
+    "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
+    "comments":"",
+    "outputs":1,
+    "x":1475.5154113769531,
+    "y":946.5155522823334,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "7621d3f.20db72c"
+      ]
+    ]
+  },
+  {
+    "id":"43d13ebf.45445",
+    "type":"set",
+    "name":"set id",
+    "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2614.5159072875977,
+    "y":294.5156497955322,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"ec24e74c.17dbe8",
+    "type":"switchNode",
+    "name":"switch tunnelType",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":2234.015625,
+    "y":744.5155639648438,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "12f5c8b9.553a97"
+      ]
+    ]
+  },
+  {
+    "id":"12f5c8b9.553a97",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2440.015625,
+    "y":744.5155639648438,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "ea283679.45ebf8"
+      ]
+    ]
+  },
+  {
+    "id":"ea283679.45ebf8",
+    "type":"set",
+    "name":"set tunnelType",
+    "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2610.015625,
+    "y":736.5155639648438,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"6a6dccab.683c44",
+    "type":"block",
+    "name":"block : sendRequest",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "comments":"",
+    "outputs":1,
+    "x":1388.0156440734863,
+    "y":1504.0155696868896,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "689b1559.c8e0ac",
+        "6b04340b.667f8c",
+        "e59ef441.ec3b38"
+      ]
+    ]
+  },
+  {
+    "id":"dc085795.91fbb8",
+    "type":"execute",
+    "name":"execute RestApiCallNode Activate Vxlan Tunnel",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2196.0159187316895,
+    "y":1567.0155248641968,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"ff1f7cdd.1de74",
+    "type":"success",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1881.5154113769531,
+    "y":1356.0150890350342,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "8fb0b02d.400ca"
+      ]
+    ]
+  },
+  {
+    "id":"2e24b7ed.4af348",
+    "type":"not-found",
+    "name":"not-found",
+    "xml":"<outcome value='not-found'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1888.5154113769531,
+    "y":1394.0150890350342,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "eabc77a3.4c68d8"
+      ]
+    ]
+  },
+  {
+    "id":"d482f537.fd1128",
+    "type":"other",
+    "name":"other",
+    "xml":"<outcome value='Other'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1880.5154113769531,
+    "y":1436.0150890350342,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "2834746.db4418c"
+      ]
+    ]
+  },
+  {
+    "id":"8fb0b02d.400ca",
+    "type":"block",
+    "name":"block : atomic",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":2046.5154113769531,
+    "y":1345.0150890350342,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"eabc77a3.4c68d8",
+    "type":"returnFailure",
+    "name":"return failure",
+    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments":"",
+    "x":2045.5154113769531,
+    "y":1398.0150890350342,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"2834746.db4418c",
+    "type":"returnFailure",
+    "name":"return failure",
+    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments":"",
+    "x":2038.5154113769531,
+    "y":1445.0150890350342,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"689b1559.c8e0ac",
+    "type":"get-resource",
+    "name":"get-resource dci-connects",
+    "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
+    "comments":"",
+    "outputs":1,
+    "x":1693.5155334472656,
+    "y":1403.0151081085205,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "ff1f7cdd.1de74",
+        "2e24b7ed.4af348",
+        "d482f537.fd1128"
+      ]
+    ]
+  },
+  {
+    "id":"6b04340b.667f8c",
+    "type":"set",
+    "name":"set controller data",
+    "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
+    "comments":"",
+    "x":1665.0153846740723,
+    "y":1504.5150623321533,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"e59ef441.ec3b38",
+    "type":"switchNode",
+    "name":"switch tunnelType",
+    "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
+    "comments":"",
+    "outputs":1,
+    "x":1659.0153770446777,
+    "y":1591.5150356292725,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "c8be8edd.1a0fe",
+        "22e73278.5a70de"
+      ]
+    ]
+  },
+  {
+    "id":"c8be8edd.1a0fe",
+    "type":"outcomeTrue",
+    "name":"L3-DCI",
+    "xml":"<outcome value='L3-DCI'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1872.0155067443848,
+    "y":1571.5150356292725,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "dc085795.91fbb8"
+      ]
+    ]
+  },
+  {
+    "id":"22e73278.5a70de",
+    "type":"outcomeTrue",
+    "name":"L2-DCI",
+    "xml":"<outcome value='L2-DCI'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1870.0153274536133,
+    "y":1643.5150356292725,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "73fa04bd.92094c"
+      ]
+    ]
+  },
+  {
+    "id":"f8a4213a.dfd9b",
+    "type":"set",
+    "name":"set id",
+    "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments":"",
+    "x":2592.515842437744,
+    "y":816.5156164169312,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"73fa04bd.92094c",
+    "type":"execute",
+    "name":"execute RestApiCallNode Activate Vxlan Tunnel",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2190.0158729553223,
+    "y":1644.0154609680176,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"e75e638.f112aa",
+    "type":"outcomeTrue",
+    "name":"false",
+    "xml":"<outcome value='false'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2424.015800476074,
+    "y":940.5156002044678,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+      [
+        "f56ef97.bc2ee08"
+      ]
+    ]
+  },
+  {
+    "id":"f56ef97.bc2ee08",
+    "type":"set",
+    "name":"set description",
+    "xml":"<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
+    "comments":"",
+    "x":2605.015869140625,
+    "y":935.5155410766602,
+    "z":"17ff3bf3.2a2c24",
+    "wires":[
+
+    ]
+  }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.json
deleted file mode 100644
index 6e402989..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.json
+++ /dev/null
@@ -1,623 +0,0 @@
-[
-  {
-    "id": "13efcea1.ec1031",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 114.9285774230957,
-    "y": 157.85713958740234,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "34d83628.cb27ca"
-      ]
-    ]
-  },
-  {
-    "id": "34d83628.cb27ca",
-    "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API ${project.version}",
-    "module": "GENERIC-RESOURCE-API",
-    "version": "${project.version}",
-    "comments": "",
-    "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-    "outputs": 1,
-    "x": 331.4285774230957,
-    "y": 220.35713958740234,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "4110c5c.fbeef3c"
-      ]
-    ]
-  },
-  {
-    "id": "4110c5c.fbeef3c",
-    "type": "method",
-    "name": "method network-topology-operation-activate",
-    "xml": "<method rpc='network-topology-operation-activate' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 239.42860794067383,
-    "y": 315.3571243286133,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "73d8f049.8c271"
-      ]
-    ]
-  },
-  {
-    "id": "73d8f049.8c271",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 537.2619209289551,
-    "y": 323.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "d7eea4e9.281158",
-        "fc223b1c.03ddc8",
-        "de035b83.21fca8",
-        "7ca75a13.8358a4",
-        "af942bde.506bd8",
-        "fd54671a.02ab98",
-        "ae88a1de.51776",
-        "4b8d739d.b4728c"
-      ]
-    ]
-  },
-  {
-    "id": "fc223b1c.03ddc8",
-    "type": "record",
-    "name": "record",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"Time\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"Method\" value=\"network-topology-operation-activate\"/>\n<parameter name=\"SubMethod\" value=\"l3-dci-connects\"/>\n<parameter name=\"Name\" value=\"`$l3-dci-connects.name`\"/>\n<parameter name=\"Description\" value=\"`$l3-dci-connects.description`\"/>\n<parameter name=\"RouterId\" value=\"`$l3-dci-connects.router_id`\"/>\n<parameter name=\"IsFirewallEnabled\" value=\"`$l3-dci-connects.firewall_enable`\"/>\n<parameter name=\"LocalNetworks\" value=\"`$l3-dci-connects.local_networks`\"/>\n<parameter name=\"LocalNetworksAll\" value=\"`$l3-dci-connects.local_networks_all`\"/>\n<parameter name=\"EvpnIrts\" value=\"`$l3-dci-connects.evpn_irts`\"/>\n<parameter name=\"EvpnErts\" value=\"`$l3-dci-connects.evpn_erts`\"/>\n<parameter name=\"L3Vni\" value=\"`$l3-dci-connects.l3_vni`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 745.2619209289551,
-    "y": 358.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "de035b83.21fca8",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 927.2619209289551,
-    "y": 188.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "7ca75a13.8358a4",
-    "type": "get-resource",
-    "name": "get-resource l3-dci-connects",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-dci-connects\" \n\t\tkey=\"l3-dci-connects.id = $tmp.id AND depth = '1'\"\n        pfx='tmp.aai.l3-dci-connects' local-only='false' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 814.2619209289551,
-    "y": 290.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "76d6d56a.89292c",
-        "b63f5b49.49c0a8",
-        "a9c3f954.563c08"
-      ]
-    ]
-  },
-  {
-    "id": "76d6d56a.89292c",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1063.261920928955,
-    "y": 254.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "75edb6f2.8a1248"
-      ]
-    ]
-  },
-  {
-    "id": "b63f5b49.49c0a8",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1070.261920928955,
-    "y": 292.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "a88ab5e7.577548"
-      ]
-    ]
-  },
-  {
-    "id": "a9c3f954.563c08",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1062.261920928955,
-    "y": 334.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "47bdf2f2.b8420c"
-      ]
-    ]
-  },
-  {
-    "id": "75edb6f2.8a1248",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1228.261920928955,
-    "y": 243.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a88ab5e7.577548",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments": "",
-    "x": 1227.261920928955,
-    "y": 296.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "47bdf2f2.b8420c",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments": "",
-    "x": 1220.261920928955,
-    "y": 343.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "af942bde.506bd8",
-    "type": "set",
-    "name": "set controller data",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
-    "comments": "",
-    "x": 778.2619209289551,
-    "y": 419.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "fd54671a.02ab98",
-    "type": "for",
-    "name": "for each network-input-parameters",
-    "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 830.2619209289551,
-    "y": 475.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "2650269.fd9afda"
-      ]
-    ]
-  },
-  {
-    "id": "2650269.fd9afda",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1064.261920928955,
-    "y": 475.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "eb18473a.14e7b8",
-        "94f8d826.6b0728",
-        "133d2fc3.ecc2d",
-        "60c74a82.9f38b4",
-        "4956f4cc.b6a90c",
-        "8e0378b.f71fc88",
-        "246d821a.db927e"
-      ]
-    ]
-  },
-  {
-    "id": "eb18473a.14e7b8",
-    "type": "switchNode",
-    "name": "switch name",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1368.261920928955,
-    "y": 400.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "77471bff.88b8e4"
-      ]
-    ]
-  },
-  {
-    "id": "94f8d826.6b0728",
-    "type": "switchNode",
-    "name": "switch description",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1383.261920928955,
-    "y": 449.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "b48734fb.4b78c8"
-      ]
-    ]
-  },
-  {
-    "id": "133d2fc3.ecc2d",
-    "type": "switchNode",
-    "name": "switch router_id",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'router_id'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1377.261920928955,
-    "y": 493.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "9cd2fabe.632d08"
-      ]
-    ]
-  },
-  {
-    "id": "60c74a82.9f38b4",
-    "type": "switchNode",
-    "name": "switch local_networks",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'local_networks'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1395.261978149414,
-    "y": 536.9047584533691,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "3f83fc1.fc07c04"
-      ]
-    ]
-  },
-  {
-    "id": "4956f4cc.b6a90c",
-    "type": "switchNode",
-    "name": "switch evpn_irts",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'evpn_irts'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1379.5477485656738,
-    "y": 585.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "c139b32d.3ec65"
-      ]
-    ]
-  },
-  {
-    "id": "8e0378b.f71fc88",
-    "type": "switchNode",
-    "name": "switch evpn_erts",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'evpn_erts'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1381.5477485656738,
-    "y": 632.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "d454e7d7.2bab18"
-      ]
-    ]
-  },
-  {
-    "id": "246d821a.db927e",
-    "type": "switchNode",
-    "name": "switch l3_vni",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'l3_vni'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1371.5477485656738,
-    "y": 675.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "69406c41.96bf94"
-      ]
-    ]
-  },
-  {
-    "id": "77471bff.88b8e4",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1583.261920928955,
-    "y": 399.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "f3ea7971.0c1588"
-      ]
-    ]
-  },
-  {
-    "id": "b48734fb.4b78c8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1581.261920928955,
-    "y": 449.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "e7809c6a.187f6"
-      ]
-    ]
-  },
-  {
-    "id": "9cd2fabe.632d08",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1582.261920928955,
-    "y": 492.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "bc1a0bfb.43e5f8"
-      ]
-    ]
-  },
-  {
-    "id": "3f83fc1.fc07c04",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1580.261978149414,
-    "y": 530.9047584533691,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "7e484c09.81b7b4"
-      ]
-    ]
-  },
-  {
-    "id": "c139b32d.3ec65",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1581.5477485656738,
-    "y": 584.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "7d5558e.f82aaa8"
-      ]
-    ]
-  },
-  {
-    "id": "d454e7d7.2bab18",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1577.5477485656738,
-    "y": 629.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "e1e83f81.1e17c"
-      ]
-    ]
-  },
-  {
-    "id": "69406c41.96bf94",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1577.5477485656738,
-    "y": 675.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "83d7cc2c.7c283"
-      ]
-    ]
-  },
-  {
-    "id": "f3ea7971.0c1588",
-    "type": "set",
-    "name": "set name",
-    "xml": "<set>\n<parameter name='prop.l3-dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1745.261920928955,
-    "y": 397.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "e7809c6a.187f6",
-    "type": "set",
-    "name": "set description",
-    "xml": "<set>\n<parameter name='prop.l3-dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1763.261920928955,
-    "y": 442.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "bc1a0bfb.43e5f8",
-    "type": "set",
-    "name": "set router_id",
-    "xml": "<set>\n<parameter name='prop.l3-dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1755.261920928955,
-    "y": 485.19046783447266,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "7e484c09.81b7b4",
-    "type": "set",
-    "name": "set local_networks",
-    "xml": "<set>\n<parameter name='prop.l3-dci-connects.local_networks' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'' />\n",
-    "comments": "",
-    "x": 1774.261978149414,
-    "y": 531.9047584533691,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "7d5558e.f82aaa8",
-    "type": "set",
-    "name": "set evpn_irts",
-    "xml": "<set>\n<parameter name='prop.l3-dci-connects.evpn_irts' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1757.5477485656738,
-    "y": 580.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "e1e83f81.1e17c",
-    "type": "set",
-    "name": "set evpn_erts",
-    "xml": "<set>\n<parametername='prop.l3-dci-connects.evpn_erts' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1763.5477485656738,
-    "y": 622.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "83d7cc2c.7c283",
-    "type": "set",
-    "name": "set l3_vni",
-    "xml": "<set>\n<parameter name='prop.l3-dci-connects.l3_vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 1747.5477485656738,
-    "y": 667.4761905670166,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "ae88a1de.51776",
-    "type": "execute",
-    "name": "execute l3-dci-connects id",
-    "xml": "<execute plugin='com.att.sdnctl.sli.SliPluginUtils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3-dci-connects.id\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 805.2619209289551,
-    "y": 539.1904678344727,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "52b5b73a.ad4a48"
-      ]
-    ]
-  },
-  {
-    "id": "52b5b73a.ad4a48",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 996.2619209289551,
-    "y": 537.1904678344727,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      [
-        "37ca2219.c835de"
-      ]
-    ]
-  },
-  {
-    "id": "37ca2219.c835de",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments": "",
-    "x": 1146.261920928955,
-    "y": 536.1904678344727,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  },
-  {
-    "id": "4b8d739d.b4728c",
-    "type": "execute",
-    "name": "execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 870.2619209289551,
-    "y": 604.1904678344727,
-    "z": "e5eb985f.1a1468",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d7eea4e9.281158",
-    "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": 769.5476913452148,
-    "y": 705.9047737121582,
-    "z": "e5eb985f.1a1468",
-    "wires": []
-  }
-]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
new file mode 100644
index 00000000..a13d6497
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
+    <method rpc="network-topology-operation-activate" mode="sync">
+        <block atomic="true">
+            <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
+            <block atomic="true">
+                <block atomic="true">
+                    <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+                        <block>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.description" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.router_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </for>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                            <outcome value="success">
+                                <block atomic="true" />
+                            </outcome>
+                            <outcome value="not-found">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                        <set>
+                            <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
+                            <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                            <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
+                            <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
+                        </set>
+                        <switch test="`$prop.dci-connects.tunnelType`">
+                            <outcome value="L3-DCI">
+                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
+                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
+                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="format" value="json" />
+                                    <parameter name="httpMethod" value="post" />
+                                    <parameter name="responsePrefix" value="restapi-result" />
+                                </execute>
+                            </outcome>
+                            <outcome value="L2-DCI">
+                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
+                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
+                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="format" value="json" />
+                                    <parameter name="httpMethod" value="post" />
+                                    <parameter name="responsePrefix" value="restapi-result" />
+                                </execute>
+                            </outcome>
+                        </switch>
+                    </block>
+                </block>
+                <block atomic="true">
+                    <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+                        <block>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.description" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                                <outcome value="false">
+                                    <set>
+                                        <parameter name="prop.dci-connects.description" value="" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.router_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </for>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                            <outcome value="success">
+                                <block atomic="true" />
+                            </outcome>
+                            <outcome value="not-found">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                        <set>
+                            <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
+                            <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                            <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
+                            <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
+                        </set>
+                        <switch test="`$prop.dci-connects.tunnelType`">
+                            <outcome value="L3-DCI">
+                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
+                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
+                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="format" value="json" />
+                                    <parameter name="httpMethod" value="post" />
+                                    <parameter name="responsePrefix" value="restapi-result" />
+                                </execute>
+                            </outcome>
+                            <outcome value="L2-DCI">
+                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
+                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
+                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="format" value="json" />
+                                    <parameter name="httpMethod" value="post" />
+                                    <parameter name="responsePrefix" value="restapi-result" />
+                                </execute>
+                            </outcome>
+                        </switch>
+                    </block>
+                </block>
+            </block>
+            <return status="success">
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.xml
deleted file mode 100644
index 5e907e4d..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_l3-dci-connects-network-topology-operation-activate.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<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='network-topology-operation-activate' mode='sync'>
-        <block atomic='true'>
-            <call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' ></call>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                          resource="l3-dci-connects"
-                          key="l3-dci-connects.id = $tmp.id AND depth = '1'"
-                          pfx='tmp.aai.l3-dci-connects' local-only='false' >
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='error-code' value='' />
-                        <parameter name='error-message' value='' />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='error-code' value='' />
-                        <parameter name='error-message' value='' />
-                    </return>
-                </outcome>
-            </get-resource>
-            <set>
-                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                <parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />
-                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-            </set>
-            <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                <block>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'router_id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'local_networks'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.local_networks' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'evpn_irts'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.evpn_irts' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'evpn_erts'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.evpn_erts' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'l3_vni'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.l3-dci-connects.l3_vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <execute plugin='com.att.sdnctl.sli.SliPluginUtils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="prop.l3-dci-connects.id"/>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='error-code' value='' />
-                        <parameter name='error-message' value='' />
-                    </return>
-                </outcome>
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-            </execute>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                <parameter name="logger" value="message-log"/>
-                <parameter name="field1" value="__TIMESTAMP__"/>
-                <parameter name="field2" value="GENERIC-RESOURCE-API.l3-dci-connects-network-topology-operation-activate"/>
-                <parameter name='field3' value='`$l3-dci-connects.name`' />
-                <parameter name='field3' value='`$l3-dci-connects.id`' />
-                <parameter name='field4' value='`$l3-dci-connects.description`' />
-                <parameter name='field5' value='`$l3-dci-connects.router_id`' />
-                <parameter name='field6' value='`$l3-dci-connects.local_networks`' />
-                <parameter name='field7' value='`$l3-dci-connects.evpn_irts`' />
-                <parameter name='field8' value='`$l3-dci-connects.evpn_erts`' />
-                <parameter name='field9' value='`$l3-dci-connects.l3_vni`' />
-            </record>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'"/>
-                <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'"/>
-                <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user"/>
-                <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password"/>
-                <parameter name="format" value="json"/>
-                <parameter name="httpMethod" value="post"/>
-                <parameter name="responsePrefix" value="restapi-result"/>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for contrail-route-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for contrail-route-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <return status='success'>
-            <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
-- 
2.16.6