Changes in MSA service flow

author Franklin Dsilva <franklin.dsilva@us.fujitsu.com>

Fri, 3 Apr 2020 05:50:12 +0000 (05:50 +0000)

committer Franklin Dsilva <franklin.dsilva@us.fujitsu.com>

Fri, 3 Apr 2020 05:50:29 +0000 (05:50 +0000)
author Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
Fri, 3 Apr 2020 05:50:12 +0000 (05:50 +0000)
committer Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
Fri, 3 Apr 2020 05:50:29 +0000 (05:50 +0000)
diff --git a/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json

index 1dd336e..cb66423 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
@@ -1,6 +1,6 @@
  [\r
      {\r
-        "id": "8b4dcfe.e866f3",\r
+        "id": "104e7d48.f3cf6b",\r
          "type": "service-logic",\r
          "name": "DataChange ${project.version}",\r
          "module": "DataChange",\r
@@ -8,897 +8,897 @@
          "comments": "",\r
          "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='DataChange' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 401,\r
-        "y": 62,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 406.5,\r
+        "y": 79.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "adc1d56c.b72ff"\r
+                "5d813483.feaafc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "adc1d56c.b72ff",\r
+        "id": "5d813483.feaafc",\r
          "type": "method",\r
          "name": "method msa-update-network-to-aai",\r
          "xml": "<method rpc='msa-update-network-to-aai' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 144,\r
-        "y": 136,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 149.5,\r
+        "y": 153.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "106658a8.d884c7"\r
+                "f1373060.5fa1b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "106658a8.d884c7",\r
+        "id": "f1373060.5fa1b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 382.00003814697266,\r
-        "y": 136.00001335144043,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 387.50003814697266,\r
+        "y": 153.5666790008545,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "4b7c5962.7cf4f8"\r
+                "118d904f.a73618"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e1c9818.33b57",\r
+        "id": "5148e490.8887ac",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 123,\r
-        "y": 64,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 128.5,\r
+        "y": 81.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "8b4dcfe.e866f3"\r
+                "104e7d48.f3cf6b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b7c5962.7cf4f8",\r
+        "id": "118d904f.a73618",\r
          "type": "switchNode",\r
          "name": "switch network-id",\r
          "xml": "<switch test=\"`$networks.network-id`\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 178.5104522705078,\r
-        "y": 247.0000114440918,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 184.0104522705078,\r
+        "y": 264.56667709350586,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "b84da364.adfac",\r
-                "3a113c69.68266c"\r
+                "1a591305.fd6b45",\r
+                "315839fb.fe3f4e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b84da364.adfac",\r
+        "id": "1a591305.fd6b45",\r
          "type": "other",\r
          "name": "other: Do Nothing",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 443.5104064941406,\r
-        "y": 469.99993896484375,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 449.0104064941406,\r
+        "y": 487.5666046142578,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3a113c69.68266c",\r
+        "id": "315839fb.fe3f4e",\r
          "type": "outcome",\r
          "name": "otn-topology",\r
          "xml": "<outcome value='otn-topology'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 410,\r
-        "y": 247,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 415.5,\r
+        "y": 264.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "5112d334.33a61c"\r
+                "975d8fa3.881088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5112d334.33a61c",\r
+        "id": "975d8fa3.881088",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 605,\r
-        "y": 247,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 610.5,\r
+        "y": 264.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "4a7e5696.0715b",\r
-                "d2e8624a.31b89",\r
-                "22d90846.8bc5b8",\r
-                "6c4d9e05.4fa72",\r
-                "1587342a.1379dc"\r
+                "68d9f126.b948e",\r
+                "a34b2c50.7ce4f",\r
+                "e99fa34f.55a988",\r
+                "4503a33d.d9bd8c",\r
+                "81e5bdae.f433c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a7e5696.0715b",\r
+        "id": "68d9f126.b948e",\r
          "type": "save",\r
          "name": "save network-resource",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $networks.network-id' >\n<parameter name='network-id' value='`$networks.network-id`' />\n<parameter name='network-type' value='`$networks.network-types`' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 897,\r
-        "y": 100,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 902.5,\r
+        "y": 117.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d2e8624a.31b89",\r
+        "id": "a34b2c50.7ce4f",\r
          "type": "save",\r
          "name": "save network-resource relation with esr-thirdparty-sdnc",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $networks.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$networks.network-id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 987,\r
-        "y": 159,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 992.5,\r
+        "y": 176.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "22d90846.8bc5b8",\r
+        "id": "e99fa34f.55a988",\r
          "type": "for",\r
          "name": "for each node",\r
          "xml": "<for index='nidx' start='0' end='`$networks.node_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 831,\r
-        "y": 301,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 836.5,\r
+        "y": 318.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "f56585e4.72bcc",\r
-                "b3dc81c8.6f70f8"\r
+                "8d4a4f94.782ed",\r
+                "dbb6b256.7c00a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f56585e4.72bcc",\r
+        "id": "8d4a4f94.782ed",\r
          "type": "set",\r
          "name": "set node",\r
          "xml": "<set>\n<parameter name='node.' value='`$networks.node[$nidx].`' />\n",\r
          "comments": "",\r
-        "x": 1013,\r
-        "y": 300,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1018.5,\r
+        "y": 317.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3dc81c8.6f70f8",\r
+        "id": "dbb6b256.7c00a",\r
          "type": "switchNode",\r
          "name": "switch node-type",\r
          "xml": "<switch test=\"`$node.node-type`\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1034,\r
-        "y": 400,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1039.5,\r
+        "y": 417.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "ac532b61.57fca8",\r
-                "a021c2b4.589bc"\r
+                "c77859ef.314a08",\r
+                "34a91f9c.019b1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac532b61.57fca8",\r
+        "id": "c77859ef.314a08",\r
          "type": "outcome",\r
          "name": "SWITCH",\r
          "xml": "<outcome value='SWITCH'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1219,\r
-        "y": 401,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1224.5,\r
+        "y": 418.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "8591e2ec.94b2d8"\r
+                "70a2f008.086aa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a021c2b4.589bc",\r
+        "id": "34a91f9c.019b1",\r
          "type": "other",\r
          "name": "other : Do Nothing",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1262,\r
-        "y": 524,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1267.5,\r
+        "y": 541.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8591e2ec.94b2d8",\r
+        "id": "70a2f008.086aa8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1390,\r
-        "y": 402,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1395.5,\r
+        "y": 419.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "8d6438ce.9a465",\r
-                "7c327396.cf8004",\r
-                "92a0366b.9648d8",\r
-                "506cbe9f.0da148",\r
-                "9a96883c.2c0c6",\r
-                "76be62e9.bf594c"\r
+                "1172ae87.ebdb29",\r
+                "9cec7146.2e6ac",\r
+                "d1692405.c347a",\r
+                "50bbb17d.793c4",\r
+                "869684c2.e7fdb",\r
+                "e310391d.26926"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d6438ce.9a465",\r
+        "id": "1172ae87.ebdb29",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"pnfname\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1569,\r
-        "y": 194,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1574.5,\r
+        "y": 211.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7c327396.cf8004",\r
+        "id": "9cec7146.2e6ac",\r
          "type": "save",\r
          "name": "save pnf details to AAI",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'\nkey='pnf.pnf-name = $pnfname' >\n    <parameter name='pnf-name' value='`$pnfname`' />\n    <parameter name='pnf-id' value='`$node.node-id`' />\n    <parameter name='operational-status' value='`$node.node-status`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='equip-type' value='`$node.node-type`' />\n    \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1624,\r
-        "y": 250,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1629.5,\r
+        "y": 267.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "92a0366b.9648d8",\r
+        "id": "d1692405.c347a",\r
          "type": "save",\r
          "name": "save pnf relationship to network-resource in AAI",\r
          "xml": "\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $pnfname' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $networks.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$networks.network-id`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1727,\r
-        "y": 314,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1732.5,\r
+        "y": 331.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "506cbe9f.0da148",\r
+        "id": "50bbb17d.793c4",\r
          "type": "for",\r
          "name": "for each termination point",\r
          "xml": "<for index='tpidx' start='0' end='`$node.termination-point_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1595,\r
-        "y": 575,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1600.5,\r
+        "y": 592.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "a9a91cea.c7d998",\r
-                "3e218bee.5222ec",\r
-                "763d8580.7328c4",\r
-                "a8ff331a.025d",\r
-                "8e2b2ac1.d11b2",\r
-                "6bb4981.68f2ee8",\r
-                "9bf5664b.07737"\r
+                "7af64957.8fa6b8",\r
+                "f7da9215.3d16c",\r
+                "9a1981e1.920fd8",\r
+                "6b40a855.ff49b",\r
+                "32cd571a.6766f",\r
+                "79c2bf41.e84278",\r
+                "6ab14ba2.b06b3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9a91cea.c7d998",\r
+        "id": "7af64957.8fa6b8",\r
          "type": "set",\r
          "name": "set termination point",\r
          "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tpidx].`' />\n",\r
          "comments": "",\r
-        "x": 1865,\r
-        "y": 606,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1870.5,\r
+        "y": 623.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a8ff331a.025d",\r
+        "id": "6b40a855.ff49b",\r
          "type": "save",\r
          "name": "save p-interface to AAI",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $pnfname\n      AND p-interface.interface-name = $interfaceName' >      \n<parameter name='interface-name' value='`$interfaceName`' />\n<parameter name='port-description' value='`$tp.tp-id`' />\n<parameter name='network-ref' value='`$tp.network-ref`' />\n<parameter name='interface-type' value='`$tp.tp-type`' />\n<parameter name='in-maint' value=\"true\" />\n<parameter name='network-interface-type' value='`$network-interface-type`' />\n<parameter name='speed-units' value=\"Gbps\" />\n<parameter name='speed-value' value='100' />\n<parameter name='available-capacity' value='100' />\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1862,\r
-        "y": 814,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1867.5,\r
+        "y": 831.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "763d8580.7328c4",\r
+        "id": "9a1981e1.920fd8",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"interfaceName\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1839,\r
-        "y": 752,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1844.5,\r
+        "y": 769.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3e218bee.5222ec",\r
+        "id": "f7da9215.3d16c",\r
          "type": "switchNode",\r
          "name": "switch tp-type",\r
          "xml": "<switch test=\"`$tp.tp-type`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1852,\r
-        "y": 674,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1857.5,\r
+        "y": 691.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "88cb4971.2e8588",\r
-                "43b07fb6.69d3f",\r
-                "818ba69d.e74cf8"\r
+                "6b889540.d3439c",\r
+                "6c79f8e4.880e78",\r
+                "22f2d784.911b5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "88cb4971.2e8588",\r
+        "id": "6b889540.d3439c",\r
          "type": "outcome",\r
          "name": "XPONDER-NETWORK",\r
          "xml": "<outcome value='XPONDER-NETWORK'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2090,\r
-        "y": 630,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2095.5,\r
+        "y": 647.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "4bf140e7.df7828"\r
+                "6a2abc7e.072b44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43b07fb6.69d3f",\r
+        "id": "6c79f8e4.880e78",\r
          "type": "outcome",\r
          "name": "XPONDER-CLIENT",\r
          "xml": "<outcome value='XPONDER-CLIENT'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2080,\r
-        "y": 707,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2085.5,\r
+        "y": 724.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "d2a50717.2a1d9"\r
+                "c1e1de7a.899c9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "818ba69d.e74cf8",\r
+        "id": "22f2d784.911b5",\r
          "type": "other",\r
          "name": "other  : Do Nothing",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2090,\r
-        "y": 780,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2095.5,\r
+        "y": 797.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6c4d9e05.4fa72",\r
+        "id": "4503a33d.d9bd8c",\r
          "type": "for",\r
          "name": "for each link",\r
          "xml": "<for index='lidx' start='0' end='`$networks.link_length`' >\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 792,\r
-        "y": 575,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 797.5,\r
+        "y": 592.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "575b0050.f3102",\r
-                "f4b57e4d.f91c18"\r
+                "e267bbc9.6ea998",\r
+                "3d7fd479.ed54bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "575b0050.f3102",\r
+        "id": "e267bbc9.6ea998",\r
          "type": "set",\r
          "name": "set link",\r
          "xml": "<set>\n<parameter name='link.' value='`$networks.link[$lidx].`' />\n",\r
          "comments": "",\r
-        "x": 987,\r
-        "y": 521,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 992.5,\r
+        "y": 538.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f4b57e4d.f91c18",\r
+        "id": "3d7fd479.ed54bc",\r
          "type": "switchNode",\r
          "name": "switch link-type",\r
          "xml": "<switch test=\"`$link.link-type`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 954,\r
-        "y": 661,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 959.5,\r
+        "y": 678.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "c7be7986.f3d7",\r
-                "b81cc555.59f47"\r
+                "73a2e499.1ff214",\r
+                "f6f62047.3cff1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7be7986.f3d7",\r
+        "id": "73a2e499.1ff214",\r
          "type": "outcome",\r
          "name": "OTN-LINK",\r
          "xml": "<outcome value='OTN-LINK'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1167,\r
-        "y": 657,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1172.5,\r
+        "y": 674.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "b99bdbf4.fe7ab8"\r
+                "2630e595.f233aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b81cc555.59f47",\r
+        "id": "f6f62047.3cff1",\r
          "type": "other",\r
          "name": "other : Do Nothing",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1119,\r
-        "y": 761,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1124.5,\r
+        "y": 778.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b99bdbf4.fe7ab8",\r
+        "id": "2630e595.f233aa",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1168,\r
-        "y": 1158,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1173.5,\r
+        "y": 1175.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "eb78e1a4.f6c888",\r
-                "9c6cd27.ce7a0b",\r
-                "8d15fb9d.87f2c8",\r
-                "df343460.1e46a",\r
-                "d885100b.8f343",\r
-                "3c142cb3.61690c",\r
-                "14cce7fe.30486",\r
-                "4284a26f.1ce334"\r
+                "4e7725d2.f582b4",\r
+                "e002d5f0.653908",\r
+                "b0fde3b8.a17ea",\r
+                "f2c0c6e.cf39138",\r
+                "281eb291.a9a1e6",\r
+                "fe4625e.c7038d8",\r
+                "af77ded3.a07b1",\r
+                "f2060323.e44fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb78e1a4.f6c888",\r
+        "id": "4e7725d2.f582b4",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$link.link-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.link-id\"/>\n    <parameter name=\"target\" value=\"#\"/>\n    <parameter name=\"replacement\" value=\"_\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1428,\r
-        "y": 1017,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1433.5,\r
+        "y": 1034.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c6cd27.ce7a0b",\r
+        "id": "e002d5f0.653908",\r
          "type": "save",\r
          "name": "save logical-link details to AAI",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'\nkey='logical-link.link-name = $tmp.link-id' >\n    <parameter name='link-name' value='`$tmp.link-id`' />\n    <parameter name='link-type' value='`$link.link-type`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='speed-value' value='100' />\n    <parameter name='speed-units' value='Gbps' />\n    <parameter name='operational-status' value='`$link.administrative-state`' />\n    <parameter name='available-capacity' value='100' />\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1517,\r
-        "y": 1157,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1522.5,\r
+        "y": 1174.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4bf140e7.df7828",\r
+        "id": "6a2abc7e.072b44",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2304,\r
-        "y": 631,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2309.5,\r
+        "y": 648.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "dd7793ee.4f994"\r
+                "99d1c3f3.3da028"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2a50717.2a1d9",\r
+        "id": "c1e1de7a.899c9",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2291,\r
-        "y": 710,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2296.5,\r
+        "y": 727.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "765312cb.e91374"\r
+                "98775e23.b3ef58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd7793ee.4f994",\r
+        "id": "99d1c3f3.3da028",\r
          "type": "set",\r
          "name": "set network-interface-type as NNI",\r
          "xml": "<set>\n<parameter name='network-interface-type' value='NNI' />\n",\r
          "comments": "",\r
-        "x": 2545,\r
-        "y": 630,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2550.5,\r
+        "y": 647.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "765312cb.e91374",\r
+        "id": "98775e23.b3ef58",\r
          "type": "set",\r
          "name": "set network-interface-type as UNI",\r
          "xml": "<set>\n<parameter name='network-interface-type' value='UNI' />\n",\r
          "comments": "",\r
-        "x": 2548,\r
-        "y": 708,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2553.5,\r
+        "y": 725.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8e2b2ac1.d11b2",\r
+        "id": "32cd571a.6766f",\r
          "type": "set",\r
          "name": "set speed-value as null",\r
          "xml": "<set>\n<parameter name='speed-value' value='' />\n<parameter name='available-capacity' value='' />\n<parameter name='network-interface-type' value='' />\n",\r
          "comments": "",\r
-        "x": 1874,\r
-        "y": 523,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1879.5,\r
+        "y": 540.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d15fb9d.87f2c8",\r
+        "id": "b0fde3b8.a17ea",\r
          "type": "set",\r
          "name": "set link-parameters",\r
          "xml": "<set>\n<parameter name='interface1' value=\"`$link.source.source-tp`\" />\n<parameter name='interface2' value=\"`$link.destination.dest-tp`\" />\n<parameter name='pnf1' value=\"`$link.source.source-node`\" />\n<parameter name='pnf2' value=\"`$link.destination.dest-node`\" />\n",\r
          "comments": "",\r
-        "x": 1489,\r
-        "y": 1066,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1494.5,\r
+        "y": 1083.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "df343460.1e46a",\r
+        "id": "f2c0c6e.cf39138",\r
          "type": "save",\r
          "name": "save logical-link relationship to p-interface",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $tmp.link-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/' + $pnfname1 + '/p-interfaces/p-interface/' + $pinterface1 `\" />\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=\"`$pnfname1`\" /> \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/' + $pnfname2 + '/p-interfaces/p-interface/' + $pinterface2 `\" />\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=\"`$pnfname2`\" /> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1500,\r
-        "y": 1528,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1505.5,\r
+        "y": 1545.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6bb4981.68f2ee8",\r
+        "id": "79c2bf41.e84278",\r
          "type": "save",\r
          "name": "save pnf & p-interface in DB",\r
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , '100' , $clli , null );\">\n\n",\r
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , $controller_id , '100' , $clli , null );\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1788,\r
-        "y": 998,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1793.5,\r
+        "y": 1015.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d885100b.8f343",\r
+        "id": "281eb291.a9a1e6",\r
          "type": "get-resource",\r
          "name": "get source pnf-name and interface-name UUID from DB",\r
          "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT pnf_name, interface_name \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE pnf_id = $link.source.source-node\nAND interface_id = $link.source.source-tp' \npfx='db.source'>\n    \n    \n    \n    \n    \n    \n    \n    \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1613,\r
-        "y": 1308,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1618.5,\r
+        "y": 1325.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "4c55d475.77aecc"\r
+                "20ab3da2.39562a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c142cb3.61690c",\r
+        "id": "fe4625e.c7038d8",\r
          "type": "record",\r
          "name": "record",\r
          "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=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"print direct name\"/>\n<parameter name=\"field2\" value=\"`$pnfname1`\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1468,\r
-        "y": 1366,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1473.5,\r
+        "y": 1383.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4c55d475.77aecc",\r
+        "id": "20ab3da2.39562a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1931,\r
-        "y": 1312,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1936.5,\r
+        "y": 1329.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "2acd3a80.9f5afe"\r
+                "22cab29c.5a4c96"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2acd3a80.9f5afe",\r
+        "id": "22cab29c.5a4c96",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='pnfname1' value='`$db.source.pnf-name`' />\n<parameter name='pinterface1' value='`$db.source.interface-name`' />\n\n\n\n\n\n",\r
          "comments": "",\r
-        "x": 2085,\r
-        "y": 1304,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2090.5,\r
+        "y": 1321.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "14cce7fe.30486",\r
+        "id": "af77ded3.a07b1",\r
          "type": "get-resource",\r
          "name": "get destination pnf-name and interface-name UUID from DB",\r
          "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT pnf_name, interface_name \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE pnf_id = $link.destination.dest-node\nAND interface_id = $link.destination.dest-tp' \npfx='db1.destination'>\n    \n    \n    \n    \n    \n    \n    \n    \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1584,\r
-        "y": 1443,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1589.5,\r
+        "y": 1460.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "2b2056ba.68c06a"\r
+                "de812346.e33968"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b2056ba.68c06a",\r
+        "id": "de812346.e33968",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1917,\r
-        "y": 1436,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1922.5,\r
+        "y": 1453.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "190b0926.27e49f"\r
+                "7c98abe2.520c94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "190b0926.27e49f",\r
+        "id": "7c98abe2.520c94",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='pnfname2' value='`$db1.destination.pnf-name`' />\n<parameter name='pinterface2' value='`$db1.destination.interface-name`' />\n\n\n\n\n\n",\r
          "comments": "",\r
-        "x": 2077,\r
-        "y": 1438,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2082.5,\r
+        "y": 1455.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4284a26f.1ce334",\r
+        "id": "f2060323.e44fc8",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n\n<parameter name=\"field1\" value=\"`$pnf1`\"/>\n<parameter name=\"field2\" value=\"`$interface1`\"/>\n<parameter name=\"field3\" value=\"`$pnf2`\"/>\n<parameter name=\"field4\" value=\"`$interface2`\"/>\n\n\n\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1459,\r
-        "y": 1109,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1464.5,\r
+        "y": 1126.566665649414,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9a96883c.2c0c6",\r
+        "id": "869684c2.e7fdb",\r
          "type": "execute",\r
          "name": "split node-id",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$node.node-id`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1627,\r
-        "y": 370,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1632.5,\r
+        "y": 387.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "76be62e9.bf594c",\r
+        "id": "e310391d.26926",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/openroadm-network/nodes/' + $param-prefix1[0]`\"/>  \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=\"get\"/>  \n    <parameter name=\"responsePrefix\" value=\"cllires\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.msa.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\"/>\n    \n    \n    \n    \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1626,\r
-        "y": 429,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1631.5,\r
+        "y": 446.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "c6fee13e.a22228",\r
-                "4241c0e7.e68e5"\r
+                "e92a74f4.54bde",\r
+                "3cb543e1.cd89e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b707b093.cd8c68",\r
+        "id": "3ae8595f.f2c786",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1941,\r
-        "y": 444,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1946.5,\r
+        "y": 461.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "bfdcc473.e8754"\r
+                "e714cae6.771e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfdcc473.e8754",\r
+        "id": "e714cae6.771e5",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='clli' value='`$cllires.supporting-node[0].node-ref`' />\n",\r
          "comments": "",\r
-        "x": 2123,\r
-        "y": 439,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 2128.5,\r
+        "y": 456.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4241c0e7.e68e5",\r
+        "id": "3cb543e1.cd89e4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1804,\r
-        "y": 376,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1809.5,\r
+        "y": 393.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "8f6ab8.a5f3cd48"\r
+                "db88dbe6.1f184"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6fee13e.a22228",\r
+        "id": "e92a74f4.54bde",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1770,\r
-        "y": 445,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1775.5,\r
+        "y": 462.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              [\r
-                "b707b093.cd8c68"\r
+                "3ae8595f.f2c786"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8f6ab8.a5f3cd48",\r
+        "id": "db88dbe6.1f184",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-delete.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Getting clli failed\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1945,\r
-        "y": 370,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1950.5,\r
+        "y": 387.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9bf5664b.07737",\r
+        "id": "6ab14ba2.b06b3c",\r
          "type": "save",\r
          "name": "save",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='custom-query' \n      key=\"format='resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"data\">      \n<parameter name='interface-name' value='`$interfaceName`' />\n<parameter name='port-description' value='`$tp.tp-id`' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1803.5,\r
-        "y": 886,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 1809,\r
+        "y": 903.5666656494141,\r
+        "z": "8859ea1e.d24268",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1587342a.1379dc",\r
+        "id": "81e5bdae.f433c8",\r
          "type": "set",\r
          "name": "set controller_id",\r
          "xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`\" />\n\n\n\n",\r
          "comments": "",\r
-        "x": 860,\r
-        "y": 218,\r
-        "z": "d8656b08.07aab8",\r
+        "x": 865.5,\r
+        "y": 235.56666564941406,\r
+        "z": "8859ea1e.d24268",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml

index a370575..a4076e5 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
@@ -128,7 +128,7 @@ key='pnf.pnf-name = $pnfname' >
                                                  <parameter name='interface-name' value='`$interfaceName`' />\r
                                                  <parameter name='port-description' value='`$tp.tp-id`' />\r
                                              </save>\r
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , '100' , $clli , null );"></save>\r
+                                            <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , $controller_id , '100' , $clli , null );"></save>\r
                                          </for>\r
                                      </block>\r
                                  </outcome>\r
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

index 6cf5663..a4f65e7 100644 (file)
--- 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
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "168f1b9b.e0d8a4",\r
+        "id": "b2c9d122.8079d",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 290,\r
-        "y": 256.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 279.566650390625,\r
+        "y": 287,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              [\r
-                "69efd249.69fbdc"\r
+                "b624e48.81e8398"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69efd249.69fbdc",\r
+        "id": "b624e48.81e8398",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,235 +22,235 @@
          "comments": "",\r
          "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}'>",\r
          "outputs": 1,\r
-        "x": 477,\r
-        "y": 205.66665649414062,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 466.566650390625,\r
+        "y": 236,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              [\r
-                "7c805408.44c49c"\r
+                "e75c0d8a.68d908"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c805408.44c49c",\r
+        "id": "e75c0d8a.68d908",\r
          "type": "method",\r
          "name": "method",\r
          "xml": "<method rpc='aai-delete-service-handling' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 331,\r
-        "y": 379.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 320.566650390625,\r
+        "y": 410,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              [\r
-                "9d8283a.657188"\r
+                "730df27.f0e4c0c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d8283a.657188",\r
+        "id": "730df27.f0e4c0c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 504,\r
-        "y": 378.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 493.566650390625,\r
+        "y": 409,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              [\r
-                "f165a108.8a699",\r
-                "940496d9.dec278",\r
-                "32c002b0.0f4fce",\r
-                "2caf6515.aa94aa",\r
-                "a8c5a8ab.1bde18",\r
-                "a1d8c39f.8281b"\r
+                "6723ac25.55f13c",\r
+                "eb2abe2d.21c0e8",\r
+                "914875aa.50ff98",\r
+                "7a255a1a.b26164",\r
+                "8dbb40fc.b81ee",\r
+                "c3a4108f.675268"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f165a108.8a699",\r
+        "id": "6723ac25.55f13c",\r
          "type": "record",\r
          "name": "record",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 735,\r
-        "y": 265.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 724.566650390625,\r
+        "y": 296,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "940496d9.dec278",\r
+        "id": "eb2abe2d.21c0e8",\r
          "type": "get-resource",\r
          "name": "Get service from AAI",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 754,\r
-        "y": 381.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 743.566650390625,\r
+        "y": 412,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "32c002b0.0f4fce",\r
+        "id": "914875aa.50ff98",\r
          "type": "record",\r
          "name": "record",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 764,\r
-        "y": 447.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 753.566650390625,\r
+        "y": 478,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2caf6515.aa94aa",\r
+        "id": "7a255a1a.b26164",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 737,\r
-        "y": 510.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 726.566650390625,\r
+        "y": 541,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              [\r
-                "c68f711c.1667a"\r
+                "d1115849.8412c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e030001.bace",\r
+        "id": "9d29a06.61df4e",\r
          "type": "set",\r
          "name": "set",\r
          "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",\r
          "comments": "",\r
-        "x": 1147,\r
-        "y": 197.66665649414062,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 1136.566650390625,\r
+        "y": 228,\r
+        "z": "4d560a72.e4927c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e3a487a2.2e5338",\r
+        "id": "99771c42.d3d4f",\r
          "type": "record",\r
          "name": "record",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1170,\r
-        "y": 266.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 1159.566650390625,\r
+        "y": 297,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a8c5a8ab.1bde18",\r
+        "id": "8dbb40fc.b81ee",\r
          "type": "delete",\r
          "name": "delete service instance AAI",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 757,\r
-        "y": 586.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 746.566650390625,\r
+        "y": 617,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c68f711c.1667a",\r
+        "id": "d1115849.8412c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 921,\r
-        "y": 514.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 910.566650390625,\r
+        "y": 545,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              [\r
-                "1e030001.bace",\r
-                "e3a487a2.2e5338",\r
-                "2c623e61.ef3c52",\r
-                "46559965.50bc28",\r
-                "c493aa8c.c04b68",\r
-                "d87c55e6.d344b8"\r
+                "9d29a06.61df4e",\r
+                "99771c42.d3d4f",\r
+                "d7dc2f90.81174",\r
+                "1e0cbdbd.3ee7f2",\r
+                "d3321d96.966928",\r
+                "d37a6f28.98bec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1d8c39f.8281b",\r
+        "id": "c3a4108f.675268",\r
          "type": "delete",\r
          "name": "delete from db",\r
          "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\">",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 694,\r
-        "y": 643.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 683.566650390625,\r
+        "y": 674,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c493aa8c.c04b68",\r
+        "id": "d3321d96.966928",\r
          "type": "get-resource",\r
          "name": "get p-interface total capacity",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1266.8887939453125,\r
-        "y": 322.77777099609375,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 1256.4554443359375,\r
+        "y": 353.1111145019531,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d87c55e6.d344b8",\r
+        "id": "d37a6f28.98bec",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='new-rate' value='`$p.in.details.speed-value`' />\n",\r
          "comments": "",\r
-        "x": 1207.111083984375,\r
-        "y": 413,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 1196.677734375,\r
+        "y": 443.3333435058594,\r
+        "z": "4d560a72.e4927c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c623e61.ef3c52",\r
+        "id": "d7dc2f90.81174",\r
          "type": "update",\r
          "name": "update p-interface capacity AAI",\r
          "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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1174,\r
-        "y": 518.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 1163.566650390625,\r
+        "y": 549,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "46559965.50bc28",\r
+        "id": "1e0cbdbd.3ee7f2",\r
          "type": "save",\r
          "name": "update pinterface rate DB",\r
          "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'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1165,\r
-        "y": 586.6666564941406,\r
-        "z": "5b091ac8.c4f784",\r
+        "x": 1154.566650390625,\r
+        "y": 617,\r
+        "z": "4d560a72.e4927c",\r
          "wires": [\r
              []\r
          ]\r
diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json

index 34039b4..b99102d 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json
@@ -1,36 +1,36 @@
  [\r
      {\r
-        "id": "27072996.28603e",\r
+        "id": "ed855935.68b9c",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 184,\r
-        "y": 103,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 105.5,\r
+        "y": 109,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              [\r
-                "6ffe569c.fa109"\r
+                "3c249c15.d445ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cc951b5b.220708",\r
+        "id": "aeb9ff8.19b168",\r
          "type": "method",\r
          "name": "method",\r
          "xml": "<method rpc='optical-service-create-sync-success' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 378,\r
-        "y": 75,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 299.5,\r
+        "y": 81,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              [\r
-                "532eb08a.251b5"\r
+                "2bc24e2c.b2707a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ffe569c.fa109",\r
+        "id": "3c249c15.d445ac",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -38,285 +38,173 @@
          "comments": "",\r
          "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}'>",\r
          "outputs": 1,\r
-        "x": 219.5,\r
-        "y": 226,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 141,\r
+        "y": 232,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              [\r
-                "cc951b5b.220708"\r
+                "aeb9ff8.19b168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "532eb08a.251b5",\r
+        "id": "2bc24e2c.b2707a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 481,\r
-        "y": 139,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 402.5,\r
+        "y": 145,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              [\r
-                "59831fea.3da9b8",\r
-                "de3d717d.5418b8",\r
-                "32dae8f5.5da2a",\r
-                "8a15eff0.fb43c8",\r
-                "2407f854.80a4a",\r
-                "4b9498a0.6b56d8",\r
-                "38b45c59.81b3bc",\r
-                "7c78c7d.3f8aeb8",\r
-                "4b5d7c6c.dfedd4"\r
+                "45c29ba0.1a8f6c",\r
+                "8ae2e619.562c8",\r
+                "f8f48edd.64e44",\r
+                "4cef2908.13e6b8",\r
+                "b6ddb6e7.407d88",\r
+                "861e288.ff5a6d8",\r
+                "d66dfe6f.f22d28",\r
+                "3cba8d47.890d8a",\r
+                "9679e92f.973568",\r
+                "4a3b5ff.ccb33a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32dae8f5.5da2a",\r
+        "id": "f8f48edd.64e44",\r
          "type": "save",\r
          "name": "update rate in aend in DB",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $available-bandwidth-aend WHERE \ninterface_name = $optical-service-create-input.payload.service-aend.port-id'\nforce='true' pfx='save-result'>\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    \n    \n    \n\n\n\n\n\n\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 882,\r
-        "y": 183,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 803.5,\r
+        "y": 189,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2407f854.80a4a",\r
+        "id": "b6ddb6e7.407d88",\r
          "type": "update",\r
          "name": "update p-interface a-End in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\nkey = 'pnf.pnf-name = $a-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-aend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-aend`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 806,\r
-        "y": 313,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 727.5,\r
+        "y": 319,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8a15eff0.fb43c8",\r
+        "id": "4cef2908.13e6b8",\r
          "type": "save",\r
          "name": "update rate in azend DB",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $available-bandwidth-zend WHERE \ninterface_name = $optical-service-create-input.payload.service-zend.port-id'\nforce='true' pfx='save-result'>\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    \n    \n    \n\n\n\n\n\n\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 820,\r
-        "y": 257,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 741.5,\r
+        "y": 263,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4b9498a0.6b56d8",\r
+        "id": "861e288.ff5a6d8",\r
          "type": "update",\r
          "name": "update p-interface z-End in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\nkey = 'pnf.pnf-name = $z-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-zend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-zend`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 802,\r
-        "y": 385,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 723.5,\r
+        "y": 391,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "59831fea.3da9b8",\r
+        "id": "45c29ba0.1a8f6c",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside sync success\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 641,\r
-        "y": 86,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 562.5,\r
+        "y": 92,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "de3d717d.5418b8",\r
+        "id": "8ae2e619.562c8",\r
          "type": "set",\r
          "name": "set available rate as 0",\r
          "xml": "<set>\n<parameter name='available-bandwidth-aend' value='0' />\n<parameter name='available-bandwidth-zend' value='0' />\n\n\n\n\n\n\n\n\n\n",\r
          "comments": "",\r
-        "x": 753,\r
-        "y": 136,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 674.5,\r
+        "y": 142,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8efcdbce.63cc68",\r
+        "id": "9679e92f.973568",\r
          "type": "save",\r
          "name": "save Service Request Details in DB",\r
-        "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 , 'CREATING' , $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 , $optical-service-create-input.notification-url );\">\n",\r
+        "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 , $optical-service-create-input.notification-url );\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1245,\r
-        "y": 339,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 667.5,\r
+        "y": 467,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "efcf557d.c3a5f8",\r
+        "id": "4a3b5ff.ccb33a",\r
          "type": "save",\r
          "name": "save service-instance details in AAI",\r
-        "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='CREATING' />\n<parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\n<parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />\n\n",\r
+        "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='`$optical-service-create-input.payload.service-layer`' />\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1255,\r
-        "y": 431,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 636.5,\r
+        "y": 535,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "38b45c59.81b3bc",\r
+        "id": "d66dfe6f.f22d28",\r
          "type": "save",\r
          "name": "save service-instance relation with p-interface",\r
          "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/' + $a-end-pnf-name + '/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=\"`$a-end-pnf-name`\" /> \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/' + $z-end-pnf-name + '/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=\"`$z-end-pnf-name`\" />\n   \n    ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 700,\r
-        "y": 602,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 621.5,\r
+        "y": 608,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7c78c7d.3f8aeb8",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service Creation in Progress' />\n<parameter name='ack-final-indicator' value='N' />\n",\r
+        "id": "3cba8d47.890d8a",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='final-response-code' value='200' />\n",\r
          "comments": "",\r
-        "x": 526,\r
-        "y": 670,\r
-        "z": "7d0d9c37.54e5a4",\r
+        "x": 469.566650390625,\r
+        "y": 703.566650390625,\r
+        "z": "7dd93eb8.cfce58",\r
          "wires": []\r
-    },\r
-    {\r
-        "id": "4b5d7c6c.dfedd4",\r
-        "type": "switchNode",\r
-        "name": "switch domain-type",\r
-        "xml": "<switch test='`$optical-service-create-input.payload.domain-type`'>\n    \n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 705,\r
-        "y": 477,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            [\r
-                "d809de29.7d03f8",\r
-                "c1db711f.fdedc"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d809de29.7d03f8",\r
-        "type": "outcome",\r
-        "name": "MSA",\r
-        "xml": "<outcome value='MSA'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 878,\r
-        "y": 442,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            [\r
-                "4f2bcf28.f836e8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c1db711f.fdedc",\r
-        "type": "outcome",\r
-        "name": "TAPI",\r
-        "xml": "<outcome value='TAPI'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 875,\r
-        "y": 518,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            [\r
-                "1de8f6d7.6e55d9"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4f2bcf28.f836e8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1001,\r
-        "y": 437,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            [\r
-                "8efcdbce.63cc68",\r
-                "efcf557d.c3a5f8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "1de8f6d7.6e55d9",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1008,\r
-        "y": 548,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            [\r
-                "35944f6f.0c2038",\r
-                "a30d1744.eb9978"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "35944f6f.0c2038",\r
-        "type": "save",\r
-        "name": "save Service Request Details in DB",\r
-        "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 , $optical-service-create-input.notification-url );\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1243,\r
-        "y": 514,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "a30d1744.eb9978",\r
-        "type": "save",\r
-        "name": "save service-instance details in AAI",\r
-        "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='`$optical-service-create-input.payload.service-layer`' />\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1245,\r
-        "y": 592,\r
-        "z": "7d0d9c37.54e5a4",\r
-        "wires": [\r
-            []\r
-        ]\r
      }\r
  ]
 \ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json

index 3d5395e..6edd77f 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
@@ -1,36 +1,36 @@
  [\r
      {\r
-        "id": "19b0a312.c6518d",\r
+        "id": "b74a66d5.9bb398",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 304,\r
-        "y": 94,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 295.5000305175781,\r
+        "y": 78.99999237060547,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "81c1d0fa.bcc35"\r
+                "f760250f.2146"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e56e4f2c.7f32c",\r
+        "id": "3de2d7a.f5149a8",\r
          "type": "method",\r
          "name": "method",\r
          "xml": "<method rpc='optical-service-create' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 303,\r
-        "y": 169,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 294.5000305175781,\r
+        "y": 153.99999237060547,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "8a27eddd.8659"\r
+                "a5ce55fe.28ddd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81c1d0fa.bcc35",\r
+        "id": "f760250f.2146",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -38,1045 +38,1089 @@
          "comments": "",\r
          "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}'>",\r
          "outputs": 1,\r
-        "x": 521.5,\r
-        "y": 77,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 513.0000305175781,\r
+        "y": 61.99999237060547,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "e56e4f2c.7f32c"\r
+                "3de2d7a.f5149a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a27eddd.8659",\r
+        "id": "a5ce55fe.28ddd",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 395,\r
-        "y": 250.00000762939453,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 386.5000305175781,\r
+        "y": 235,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "cb83a0f.af4db6",\r
-                "c467f6e9.a09748",\r
-                "27820288.3245de",\r
-                "eb2c1d7a.9bc0f",\r
-                "812b7088.1c2e1",\r
-                "f6999b39.46ee28",\r
-                "faed5cf2.7521c",\r
-                "281e3ae5.c7e156",\r
-                "f4302cf0.c694f",\r
-                "9cecb747.fbb8f8",\r
-                "4ff206b2.2a38f8"\r
+                "2ab36a9f.f1f24e",\r
+                "77ca198e.37e04",\r
+                "68ebe78a.dd3bb",\r
+                "360c94f6.31041c",\r
+                "c21735a0.60eee",\r
+                "13d6217f.3fa927",\r
+                "f6fda81a.c05dd8",\r
+                "52cfcf48.59a01",\r
+                "47962899.7c2",\r
+                "e4b9f8f.0986908",\r
+                "3bfa7a37.3c6426"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cb83a0f.af4db6",\r
+        "id": "2ab36a9f.f1f24e",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >\n    \n    \n    \n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 527.9999694824219,\r
-        "y": 214.00000762939453,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 519.5,\r
+        "y": 199,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "c2bd7688.8306a8",\r
-                "e0cd029e.1c401",\r
-                "c08c879e.8aa398",\r
-                "e5d38e0f.c60ef",\r
-                "e48f435a.a53b1",\r
-                "cd52a71e.a07748",\r
-                "96ffe338.d9102",\r
-                "307d0ddd.cbbf82",\r
-                "6c345065.66388",\r
-                "6b15a6f5.41dc08",\r
-                "708a333d.a59a6c",\r
-                "930d48ba.7db8c8",\r
-                "2bad3261.39a7be"\r
+                "9060c9c5.3504f8",\r
+                "5d6c79de.a3b868",\r
+                "3ef65e63.bc200a",\r
+                "cbdd335e.bb59e8",\r
+                "1e17c676.d6b4d2",\r
+                "e5856afd.4a9d48",\r
+                "7ddb4531.494d44",\r
+                "dc75f16e.caefe8",\r
+                "80d81673.f6bb08",\r
+                "da2fcf8b.57e868",\r
+                "84b92024.42fc4",\r
+                "b3fa14e7.d8f17",\r
+                "ee48055b.43515",\r
+                "27cdd875.835958"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c2bd7688.8306a8",\r
+        "id": "9060c9c5.3504f8",\r
          "type": "switchNode",\r
          "name": "switch uni1",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_id'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 747.9999694824219,\r
-        "y": 112.00001525878906,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 739.5,\r
+        "y": 97.00000762939453,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "e2160d67.6a214"\r
+                "b6665015.8f12d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "930d48ba.7db8c8",\r
+        "id": "b3fa14e7.d8f17",\r
          "type": "set",\r
          "name": "set parameter",\r
          "xml": "<set>\n<parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />\n",\r
          "comments": "",\r
-        "x": 776.9999694824219,\r
-        "y": 62.00000762939453,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 768.5,\r
+        "y": 47,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2160d67.6a214",\r
+        "id": "b6665015.8f12d",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 911.9999694824219,\r
-        "y": 114.00001525878906,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 903.5,\r
+        "y": 99.00000762939453,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "4c25de7b.31204"\r
+                "1e006738.7e7a91"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c25de7b.31204",\r
+        "id": "1e006738.7e7a91",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1051.9999694824219,\r
-        "y": 109.00001525878906,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1043.5,\r
+        "y": 94.00000762939453,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e0cd029e.1c401",\r
+        "id": "5d6c79de.a3b868",\r
          "type": "switchNode",\r
          "name": "switch uni2",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni2_id'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 747.9999694824219,\r
-        "y": 193.00000762939453,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 739.5,\r
+        "y": 178,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "6209659e.61d4fc"\r
+                "589d96ad.decae8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6209659e.61d4fc",\r
+        "id": "589d96ad.decae8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 906.9999694824219,\r
-        "y": 198.00000762939453,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 898.5,\r
+        "y": 183,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "6da07ddf.5b16c4"\r
+                "ec88e67b.e42a78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6da07ddf.5b16c4",\r
+        "id": "ec88e67b.e42a78",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1041.9999694824219,\r
-        "y": 195.00000762939453,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1033.5,\r
+        "y": 180,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c08c879e.8aa398",\r
+        "id": "3ef65e63.bc200a",\r
          "type": "switchNode",\r
          "name": "switch uni1 coding_func",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_coding_func'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 751.9999694824219,\r
-        "y": 289.9999771118164,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 743.5,\r
+        "y": 274.9999694824219,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "a209861e.a84c68"\r
+                "8b10514f.c61f58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a209861e.a84c68",\r
+        "id": "8b10514f.c61f58",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 949.9999694824219,\r
-        "y": 289.9999771118164,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 941.5,\r
+        "y": 274.9999694824219,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "400f8845.d561c8"\r
+                "fef26935.ee43c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "400f8845.d561c8",\r
+        "id": "fef26935.ee43c",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n\n\n\n",\r
          "comments": "",\r
-        "x": 1086.9999694824219,\r
-        "y": 286.9999771118164,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1078.5,\r
+        "y": 271.9999694824219,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5d38e0f.c60ef",\r
+        "id": "cbdd335e.bb59e8",\r
          "type": "switchNode",\r
          "name": "switch uni",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_id'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 720.9999694824219,\r
-        "y": 380.9999465942383,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 709.5,\r
+        "y": 329.99993896484375,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "43b24bcd.988c54"\r
+                "a83d6090.08a4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43b24bcd.988c54",\r
+        "id": "a83d6090.08a4a",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 864.9999694824219,\r
-        "y": 383.9999465942383,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 854.5,\r
+        "y": 334.99993896484375,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "a79c959.2645a68"\r
+                "eec11b63.1ee83"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a79c959.2645a68",\r
+        "id": "eec11b63.1ee83",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1019.9999694824219,\r
-        "y": 381.9999465942383,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1012.5,\r
+        "y": 345.99993896484375,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e48f435a.a53b1",\r
+        "id": "1e17c676.d6b4d2",\r
          "type": "switchNode",\r
          "name": "switch enni",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni_id'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 709.9999694824219,\r
-        "y": 441.9999465942383,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 703.5,\r
+        "y": 383.99993896484375,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "2e88bf81.cdfcc"\r
+                "c1d6057a.bfaba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e88bf81.cdfcc",\r
+        "id": "c1d6057a.bfaba",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 866.9999694824219,\r
-        "y": 449.9999465942383,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 858.5,\r
+        "y": 398.99993896484375,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "6cecdd4e.699c54"\r
+                "6c9b34a9.cdab44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6cecdd4e.699c54",\r
+        "id": "6c9b34a9.cdab44",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1028.9999694824219,\r
-        "y": 461.9999465942383,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1016.5,\r
+        "y": 404.99993896484375,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cd52a71e.a07748",\r
+        "id": "e5856afd.4a9d48",\r
          "type": "switchNode",\r
          "name": "switch uni coding_func",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_coding_func'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 725.9999694824219,\r
-        "y": 498.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 710.5,\r
+        "y": 423.39996337890625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "423b71c7.c87b8"\r
+                "180d2bf0.83ffa4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "423b71c7.c87b8",\r
+        "id": "180d2bf0.83ffa4",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 915.9999694824219,\r
-        "y": 502.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 910.5,\r
+        "y": 460.39996337890625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "48fc9f8f.e1214"\r
+                "b518fbe6.6b3d48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48fc9f8f.e1214",\r
+        "id": "b518fbe6.6b3d48",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1055.9999694824219,\r
-        "y": 508.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1050.5,\r
+        "y": 466.39996337890625,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "96ffe338.d9102",\r
+        "id": "7ddb4531.494d44",\r
          "type": "switchNode",\r
          "name": "switch enni1",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_id'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 701.9999694824219,\r
-        "y": 556.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 689.5,\r
+        "y": 471.4000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "b119e02f.85a12"\r
+                "3f99875.f5fb5f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "307d0ddd.cbbf82",\r
+        "id": "dc75f16e.caefe8",\r
          "type": "switchNode",\r
          "name": "switch enni2",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni2_id'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 697.9999694824219,\r
-        "y": 623.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 682.5,\r
+        "y": 535.4000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "6a8649d8.5b4328"\r
+                "5ff8b6da.c93f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b119e02f.85a12",\r
+        "id": "3f99875.f5fb5f8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 869.9999694824219,\r
-        "y": 559.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 862.5,\r
+        "y": 498.4000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "78577f48.191f5"\r
+                "a1dffc1a.4ca8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a8649d8.5b4328",\r
+        "id": "5ff8b6da.c93f",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 860.9999694824219,\r
-        "y": 627.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 847.5,\r
+        "y": 553.4000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "260a366a.9008da"\r
+                "1195c2b2.9677fd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78577f48.191f5",\r
+        "id": "a1dffc1a.4ca8b8",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1010.9999694824219,\r
-        "y": 558.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1004.5,\r
+        "y": 503.4000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "260a366a.9008da",\r
+        "id": "1195c2b2.9677fd",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 994.9999694824219,\r
-        "y": 631.4000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 971.5,\r
+        "y": 548.4000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6c345065.66388",\r
+        "id": "80d81673.f6bb08",\r
          "type": "switchNode",\r
          "name": "switch uni coding_func",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_coding_func'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 703.9999694824219,\r
-        "y": 667.8000259399414,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 695.5,\r
+        "y": 584.800048828125,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "109cf4b6.34d27b"\r
+                "11aeaa86.32d365"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "109cf4b6.34d27b",\r
+        "id": "11aeaa86.32d365",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 873.9999694824219,\r
-        "y": 671.8000259399414,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 872.5,\r
+        "y": 587.800048828125,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "a04925ba.233548"\r
+                "4ffe3b95.e1db4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a04925ba.233548",\r
+        "id": "4ffe3b95.e1db4c",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 1017.9999694824219,\r
-        "y": 682.8000259399414,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1016.5,\r
+        "y": 588.800048828125,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c467f6e9.a09748",\r
+        "id": "77ca198e.37e04",\r
          "type": "get-resource",\r
          "name": "get controller_id from DB",\r
          "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT controller_id \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id' \npfx='db.source1'>\n    \n    \n    \n    \n    \n    \n    \n    \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 687.9999694824219,\r
-        "y": 761.6000137329102,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 678.5,\r
+        "y": 779.5999755859375,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "ea6ce722.102db8"\r
+                "8351b374.bb829"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27820288.3245de",\r
+        "id": "68ebe78a.dd3bb",\r
          "type": "get-resource",\r
          "name": "get controller_id from DB",\r
          "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT controller_id \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE interface_name = $optical-service-create-input.payload.service-zend.port-id' \npfx='db.source2'>\n    \n    \n    \n    \n    \n    \n    \n    \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 668,\r
-        "y": 846.6000137329102,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 659.5000305175781,\r
+        "y": 831.6000061035156,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "2351ae73.eacf92"\r
+                "b67baa88.7569f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89a07cd5.0252",\r
+        "id": "2aa1562e.df8772",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='controller1' value=\"`$db.source1.controller-id`\"/>\n",\r
          "comments": "",\r
-        "x": 1012.9999694824219,\r
-        "y": 764.6000137329102,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1005.5,\r
+        "y": 779.5999755859375,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9eef6461.fbaa98",\r
+        "id": "723d4991.2456b",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='controller2' value=\"`$db.source2.controller-id`\"/>\n",\r
          "comments": "",\r
-        "x": 1009.9999694824219,\r
-        "y": 853.6000137329102,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1001.5,\r
+        "y": 838.6000061035156,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4ff206b2.2a38f8",\r
+        "id": "3bfa7a37.3c6426",\r
          "type": "switchNode",\r
          "name": "controllers-id check",\r
          "xml": "<switch test='`$controller1==$controller2`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 105.99996948242188,\r
-        "y": 1354.5999755859375,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 97.5,\r
+        "y": 1339.599967956543,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "6d524179.31442",\r
-                "29c9a077.5048"\r
+                "8218e216.269b68",\r
+                "abeeec75.5e0a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d524179.31442",\r
+        "id": "8218e216.269b68",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 373.89996337890625,\r
-        "y": 1285.89990234375,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 278.39996337890625,\r
+        "y": 1278.89990234375,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "77e4cb5c.3ea374"\r
+                "714fe0b3.cbe86"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7fa6e0ba.8dc59",\r
+        "id": "28b59567.3572fa",\r
          "type": "call",\r
          "name": "main-create",\r
          "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 705.9000244140625,\r
-        "y": 1277.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 697.4000549316406,\r
+        "y": 1262.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "a084b4d3.d2ad68"\r
+                "f2170d69.16bd1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29c9a077.5048",\r
+        "id": "abeeec75.5e0a",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 377.89996337890625,\r
-        "y": 1460.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 369.3999938964844,\r
+        "y": 1445.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "3686da83.318ed6"\r
+                "9e125ea0.2b4738"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb2c1d7a.9bc0f",\r
+        "id": "360c94f6.31041c",\r
          "type": "execute",\r
          "name": "split node-id a-end retrieved from DB",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller1`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 679.8999633789062,\r
-        "y": 902.9000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 671.3999938964844,\r
+        "y": 887.8999938964844,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "812b7088.1c2e1",\r
+        "id": "c21735a0.60eee",\r
          "type": "execute",\r
          "name": "split node-id a-end retrieved from DB",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller2`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix2\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 667.8999938964844,\r
-        "y": 950.9000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 659.4000244140625,\r
+        "y": 935.8999938964844,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f6999b39.46ee28",\r
+        "id": "13d6217f.3fa927",\r
          "type": "set",\r
          "name": "set controller-ip",\r
          "xml": "<set>\n<parameter name='controller-ip1' value='`$param-prefix1[1]`' />\n<parameter name='domain-type1' value='`$param-prefix1[0]`' />\n<parameter name='controller-ip2' value='`$param-prefix2[1]`' />\n<parameter name='domain-type2' value='`$param-prefix2[0]`' />\n ",\r
          "comments": "",\r
-        "x": 592.75,\r
-        "y": 998.7499771118164,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 584.2500305175781,\r
+        "y": 983.7499694824219,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3686da83.318ed6",\r
+        "id": "9e125ea0.2b4738",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 519.566650390625,\r
-        "y": 1458.566650390625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 511.0666809082031,\r
+        "y": 1443.5666427612305,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "7f7dd90.ca00828",\r
-                "402e803d.bb4b3",\r
-                "f46024a4.178778",\r
-                "4cfee8aa.5fe5e8",\r
-                "ddc83fd9.94789"\r
+                "cb4e4d03.2320a8",\r
+                "aabebe1e.a2a91",\r
+                "ed06089e.edc54",\r
+                "ee62cd42.65cd58",\r
+                "be3eb75a.fcea9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f7dd90.ca00828",\r
+        "id": "cb4e4d03.2320a8",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='access-aend' value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n<parameter name='access-zend' value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n",\r
          "comments": "",\r
-        "x": 690.6499710083008,\r
-        "y": 1577.6500482559204,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 682.1500015258789,\r
+        "y": 1562.6500406265259,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ddc83fd9.94789",\r
+        "id": "be3eb75a.fcea9",\r
          "type": "call",\r
          "name": "inter-domain DG",\r
          "xml": "<call module='optical-service' rpc='inter-domain-handling' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 682.1499710083008,\r
-        "y": 1692.6500492095947,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 673.6500015258789,\r
+        "y": 1677.6500415802002,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "77e4cb5c.3ea374",\r
+        "id": "714fe0b3.cbe86",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 529.8999633789062,\r
-        "y": 1282.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 521.3999938964844,\r
+        "y": 1267.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "aa333758.2eb158",\r
-                "c56b33b.5b1d4d",\r
-                "dfbe19a.ac6e1e8",\r
-                "9217e91.3f8cc18",\r
-                "7fa6e0ba.8dc59"\r
+                "912b18e0.6fcbc8",\r
+                "ce6f9a2a.d58bc",\r
+                "545d3a33.e4b434",\r
+                "9be241b.73fe74",\r
+                "28b59567.3572fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d28a3ef1.7ab4b",\r
+        "id": "2a30842b.722684",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$final-response-code`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 924.9000244140625,\r
-        "y": 1190.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 916.4000549316406,\r
+        "y": 1175.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "516af1e8.b7429"\r
+                "13543e22.9a274a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "516af1e8.b7429",\r
+        "id": "13543e22.9a274a",\r
          "type": "outcome",\r
          "name": "200",\r
          "xml": "<outcome value='200'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1062.9000244140625,\r
-        "y": 1183.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1054.4000549316406,\r
+        "y": 1168.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "8514f080.cd77"\r
+                "d10726b7.d3d02"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9457262f.dafa78",\r
+        "id": "d44f3957.51ad4",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "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",\r
          "comments": "",\r
-        "x": 1362.9000244140625,\r
-        "y": 1226.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1354.4000549316406,\r
+        "y": 1211.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8514f080.cd77",\r
+        "id": "d10726b7.d3d02",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1200.9000244140625,\r
-        "y": 1179.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1192.4000549316406,\r
+        "y": 1164.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "9457262f.dafa78",\r
-                "d89f6cb.9d2869",\r
-                "90dcc928.7bcbc8"\r
+                "d44f3957.51ad4",\r
+                "16c29993.ab7326",\r
+                "87bdb7fa.7da8d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b15a6f5.41dc08",\r
+        "id": "da2fcf8b.57e868",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 748.8999938964844,\r
-        "y": 152.9000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 740.4000244140625,\r
+        "y": 137.89999389648438,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "708a333d.a59a6c",\r
+        "id": "84b92024.42fc4",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 743.8999938964844,\r
-        "y": 229.9000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 735.4000244140625,\r
+        "y": 214.89999389648438,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2bad3261.39a7be",\r
+        "id": "ee48055b.43515",\r
          "type": "switchNode",\r
          "name": "service-name",\r
          "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'service-name'`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 670.5666809082031,\r
-        "y": 722.5666580200195,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 663.0667114257812,\r
+        "y": 618.566650390625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "8a2bc3a2.8fb3"\r
+                "5a17268d.005fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a2bc3a2.8fb3",\r
+        "id": "5a17268d.005fe8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 851.5666809082031,\r
-        "y": 730.5666580200195,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 840.0667114257812,\r
+        "y": 634.566650390625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "f0ba54a2.8930a8"\r
+                "a2725653.88689"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0ba54a2.8930a8",\r
+        "id": "a2725653.88689",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
          "comments": "",\r
-        "x": 995.5667419433594,\r
-        "y": 728.5666732788086,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 974.0667724609375,\r
+        "y": 636.566650390625,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ea6ce722.102db8",\r
+        "id": "8351b374.bb829",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 867.8999938964844,\r
-        "y": 765.9000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 860.4000244140625,\r
+        "y": 785.9000244140625,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "89a07cd5.0252"\r
+                "2aa1562e.df8772"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2351ae73.eacf92",\r
+        "id": "b67baa88.7569f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 866.8999938964844,\r
-        "y": 850.9000015258789,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 858.4000244140625,\r
+        "y": 835.8999938964844,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "9eef6461.fbaa98"\r
+                "723d4991.2456b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a084b4d3.d2ad68",\r
+        "id": "f2170d69.16bd1",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 861.8999633789062,\r
-        "y": 1277.9000244140625,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 853.3999938964844,\r
+        "y": 1262.900016784668,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              [\r
-                "d28a3ef1.7ab4b"\r
+                "2a30842b.722684"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "faed5cf2.7521c",\r
+        "id": "f6fda81a.c05dd8",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-request-id\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 364,\r
-        "y": 962,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 355.5000305175781,\r
+        "y": 946.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "281e3ae5.c7e156",\r
+        "id": "52cfcf48.59a01",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-svc-instance-id\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 393,\r
-        "y": 876,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 384.5000305175781,\r
+        "y": 860.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f4302cf0.c694f",\r
+        "id": "47962899.7c2",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-svc-instance-id\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 327,\r
-        "y": 1037,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 318.5000305175781,\r
+        "y": 1021.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9cecb747.fbb8f8",\r
+        "id": "e4b9f8f.0986908",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-request-id\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 298,\r
-        "y": 1114,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 289.5000305175781,\r
+        "y": 1098.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d89f6cb.9d2869",\r
+        "id": "16c29993.ab7326",\r
          "type": "call",\r
          "name": "create-service-relationship",\r
          "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1459,\r
-        "y": 1145,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1450.5000305175781,\r
+        "y": 1129.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c56b33b.5b1d4d",\r
+        "id": "ce6f9a2a.d58bc",\r
          "type": "set",\r
          "name": "set acc ser",\r
          "xml": "<set>\n<parameter name='domain-requests' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service1-svc-instance-id`\" />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.service-name + '_' + 'MDONS-OTN'`\" /> \n",\r
          "comments": "",\r
-        "x": 699,\r
-        "y": 1080,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 690.5000305175781,\r
+        "y": 1064.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa333758.2eb158",\r
+        "id": "912b18e0.6fcbc8",\r
          "type": "save",\r
          "name": "save access service db",\r
          "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, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );\"> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 763,\r
-        "y": 1170,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 754.5000305175781,\r
+        "y": 1154.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f46024a4.178778",\r
+        "id": "ed06089e.edc54",\r
          "type": "set",\r
          "name": "set acc ser",\r
          "xml": "<set>\n<parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='domain-requests' value=\"`$service1-request-id + ',' + $service2-request-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 699,\r
-        "y": 1395,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 690.5000305175781,\r
+        "y": 1379.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "402e803d.bb4b3",\r
+        "id": "aabebe1e.a2a91",\r
          "type": "save",\r
          "name": "save access service db",\r
          "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, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );\"> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 761,\r
-        "y": 1522,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 752.5000305175781,\r
+        "y": 1506.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4cfee8aa.5fe5e8",\r
+        "id": "ee62cd42.65cd58",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Service 1 req id---' + $service1-request-id`\"/>\n<parameter name=\"field3\" value=\"`'Service 2 req id---' + $service2-request-id`\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 706.0999755859375,\r
-        "y": 1458.0999755859375,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 697.6000061035156,\r
+        "y": 1443.099967956543,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dfbe19a.ac6e1e8",\r
+        "id": "545d3a33.e4b434",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Access rquest_' + $as-request-id`\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 705.0999755859375,\r
-        "y": 1125.0999755859375,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 696.6000061035156,\r
+        "y": 1110.099967956543,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9217e91.3f8cc18",\r
+        "id": "9be241b.73fe74",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />",\r
          "comments": "",\r
-        "x": 535,\r
-        "y": 1071,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 526.5000305175781,\r
+        "y": 1055.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": []\r
      },\r
      {\r
-        "id": "90dcc928.7bcbc8",\r
+        "id": "87bdb7fa.7da8d8",\r
          "type": "save",\r
          "name": "update acc service db",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $as-request-id'\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1385,\r
-        "y": 1070,\r
-        "z": "6aec8519.596ebc",\r
+        "x": 1376.5000305175781,\r
+        "y": 1054.9999923706055,\r
+        "z": "be119e26.f34f9",\r
          "wires": [\r
              []\r
          ]\r
+    },\r
+    {\r
+        "id": "27cdd875.835958",\r
+        "type": "switchNode",\r
+        "name": "protocol",\r
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_client_proto'`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 646.566650390625,\r
+        "y": 661.566650390625,\r
+        "z": "be119e26.f34f9",\r
+        "wires": [\r
+            [\r
+                "b3f1926e.bdae08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b3f1926e.bdae08",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 770.566650390625,\r
+        "y": 672.566650390625,\r
+        "z": "be119e26.f34f9",\r
+        "wires": [\r
+            [\r
+                "487a398d.1fdfb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "487a398d.1fdfb",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-protocol' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",\r
+        "comments": "",\r
+        "x": 896.566650390625,\r
+        "y": 685.566650390625,\r
+        "z": "be119e26.f34f9",\r
+        "wires": []\r
      }\r
  ]
 \ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-create-msa.json b/platform-logic/optical-service/src/main/json/optical-service_service-create-msa.json

index fd25326..6bd4dad 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_service-create-msa.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-create-msa.json
@@ -1,36 +1,36 @@
  [\r
      {\r
-        "id": "3ea35ee.ad0f6a2",\r
+        "id": "2b9a1424.f485ec",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 116,\r
-        "y": 81,\r
-        "z": "c2959a97.94a74",\r
+        "x": 95,\r
+        "y": 83,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "11cee705.bf2a31"\r
+                "aa23222f.bc76d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d850b04.b54af5",\r
+        "id": "a2e5095f.de7898",\r
          "type": "method",\r
          "name": "method",\r
          "xml": "<method rpc='service-create-msa' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 174,\r
-        "y": 206,\r
-        "z": "c2959a97.94a74",\r
+        "x": 123,\r
+        "y": 175,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "488da689.489b18"\r
+                "d671b0a6.2b1d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11cee705.bf2a31",\r
+        "id": "aa23222f.bc76d8",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -38,408 +38,480 @@
          "comments": "",\r
          "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}'>",\r
          "outputs": 1,\r
-        "x": 360.5,\r
-        "y": 84,\r
-        "z": "c2959a97.94a74",\r
+        "x": 309.5,\r
+        "y": 53,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "d850b04.b54af5"\r
+                "a2e5095f.de7898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d61ef5.90ff99",\r
+        "id": "374ef365.4365d4",\r
          "type": "execute",\r
          "name": "Call MSA Controller",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-create-msa.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/openroadm/openroadm-services'`\"/>\n<parameter name='restapiUser' value='admin' />\n<parameter name='restapiPassword' value='admin' />\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"service-create-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.msa.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\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 809,\r
-        "y": 533,\r
-        "z": "c2959a97.94a74",\r
+        "x": 758,\r
+        "y": 502,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "ccc1ac83.fb8f3",\r
-                "2f9f6425.084e84"\r
+                "e418881c.c81778",\r
+                "213e5cd0.481964"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ccc1ac83.fb8f3",\r
+        "id": "e418881c.c81778",\r
          "type": "outcome",\r
          "name": "Failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1038,\r
-        "y": 508,\r
-        "z": "c2959a97.94a74",\r
+        "x": 987,\r
+        "y": 477,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "a1397508.3503c8"\r
+                "4e6aa919.c49248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f9f6425.084e84",\r
+        "id": "213e5cd0.481964",\r
          "type": "outcome",\r
          "name": "Success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1033,\r
-        "y": 609,\r
-        "z": "c2959a97.94a74",\r
+        "x": 982,\r
+        "y": 578,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "ef5192a4.4e4b1"\r
+                "4202eada.c00e9c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1e42279.d92258",\r
+        "id": "2d4e8e63.345f52",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Successfully sent the request\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1535,\r
-        "y": 641,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1484,\r
+        "y": 610,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5e2abc18.1b66ac",\r
+        "id": "d3e41e81.36a96",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failure\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1562,\r
-        "y": 467,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1511,\r
+        "y": 436,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "488da689.489b18",\r
+        "id": "d671b0a6.2b1d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 413,\r
-        "y": 198,\r
-        "z": "c2959a97.94a74",\r
+        "x": 362,\r
+        "y": 167,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "8d61ef5.90ff99",\r
-                "a3b8c6ad.cc7648",\r
-                "8ad2ed4f.9eaef8",\r
-                "35d2d9b2.cbceee",\r
-                "5929fa76.a7464c",\r
-                "b065abfd.9e90f8"\r
+                "374ef365.4365d4",\r
+                "e582696b.bfd64",\r
+                "3aa20ba3.1be9c4",\r
+                "c57047a.90c3ab8",\r
+                "e0320b48.98ab8",\r
+                "1d32325.a1daece",\r
+                "185b18b9.1e9acf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ef5192a4.4e4b1",\r
+        "id": "4202eada.c00e9c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1281,\r
-        "y": 611,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1230,\r
+        "y": 580,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "a1e42279.d92258",\r
-                "893ecee0.5f1a6"\r
+                "2d4e8e63.345f52",\r
+                "3008cbc8.fcfd94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "629b93c5.786c2c",\r
+        "id": "1364e09.3c15d1f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Could not connect to Controller' />\n",\r
          "comments": "",\r
-        "x": 1548,\r
-        "y": 559,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1497,\r
+        "y": 528,\r
+        "z": "d3028d55.5844c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a1397508.3503c8",\r
+        "id": "4e6aa919.c49248",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1272,\r
-        "y": 509,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1221,\r
+        "y": 478,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "5e2abc18.1b66ac",\r
-                "629b93c5.786c2c"\r
+                "d3e41e81.36a96",\r
+                "1364e09.3c15d1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "893ecee0.5f1a6",\r
+        "id": "3008cbc8.fcfd94",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$service-create-response.configuration-response-common.response-code`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1530,\r
-        "y": 723,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1479,\r
+        "y": 692,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "5758035.e2b987c",\r
-                "ec22434b.def97"\r
+                "7837dd73.2a710c",\r
+                "767b4872.12c6d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5758035.e2b987c",\r
+        "id": "7837dd73.2a710c",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='200'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1698,\r
-        "y": 724,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1647,\r
+        "y": 693,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "211ff3f4.659f1c"\r
+                "f8b00189.009718"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec22434b.def97",\r
+        "id": "767b4872.12c6d",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1706,\r
-        "y": 790,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1655,\r
+        "y": 759,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "c3dd586d.2d9ff"\r
+                "6732375e.1a15a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3dd586d.2d9ff",\r
+        "id": "6732375e.1a15a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='`$service-create-response.configuration-response-common.response-code`' />\n<parameter name='error-message' value='`$service-create-response.configuration-response-common.response-message`' />\n",\r
          "comments": "",\r
-        "x": 1885,\r
-        "y": 790,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1834,\r
+        "y": 759,\r
+        "z": "d3028d55.5844c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "211ff3f4.659f1c",\r
+        "id": "f8b00189.009718",\r
          "type": "call",\r
          "name": "call sync success DG",\r
          "xml": "<call module='optical-service' rpc='optical-service-create-sync-success' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1900,\r
-        "y": 721,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1849,\r
+        "y": 690,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a3b8c6ad.cc7648",\r
+        "id": "e582696b.bfd64",\r
          "type": "set",\r
          "name": "set parameters",\r
          "xml": "<set>\n<parameter name='notification-url' value=\"`$prop.controller.url + '/' + $prop.sdnc.async.url`\" />\n<parameter name='service-aend-nodeid' value='`$param-prefix[0]`' />\n<parameter name='service-zend-nodeid' value='`$param-prefix1[0]`' />\n",\r
          "comments": "",\r
-        "x": 831,\r
-        "y": 276,\r
-        "z": "c2959a97.94a74",\r
+        "x": 770,\r
+        "y": 169.00001525878906,\r
+        "z": "d3028d55.5844c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ad2ed4f.9eaef8",\r
+        "id": "3aa20ba3.1be9c4",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Logical link name\"/>\n<parameter name=\"field2\" value=\"`$logical-link-check`\"/>\n<parameter name=\"field3\" value=\"`$a-end-pnf-name`\"/>\n<parameter name=\"field4\" value=\"`$z-end-pnf-name`\"/>\n\n\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 817,\r
-        "y": 223,\r
-        "z": "c2959a97.94a74",\r
+        "x": 752,\r
+        "y": 125.00001525878906,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "35d2d9b2.cbceee",\r
+        "id": "c57047a.90c3ab8",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$optical-service-create-input.payload.service-protocol`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 919,\r
-        "y": 361,\r
-        "z": "c2959a97.94a74",\r
+        "x": 868,\r
+        "y": 330,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "377ae9e5.0edff6",\r
-                "6ebfa6a3.e8164"\r
+                "e640d047.8b9a48",\r
+                "2e9e0315.971fdc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "377ae9e5.0edff6",\r
+        "id": "e640d047.8b9a48",\r
          "type": "outcome",\r
          "name": "Ethernet",\r
          "xml": "<outcome value='Ethernet'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1096,\r
-        "y": 355,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1045,\r
+        "y": 324,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "d04153bc.9f4338"\r
+                "e0966dd6.b1775"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18dafb4f.277ba5",\r
+        "id": "98d37fbb.84095",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$optical-service-create-input.payload.coding-func`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1460,\r
-        "y": 351,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1409,\r
+        "y": 320,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "bff9d743.e28a08",\r
-                "80d30a7a.cb97f"\r
+                "381822b1.80b79e",\r
+                "800aa6e0.11c5d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d04153bc.9f4338",\r
+        "id": "e0966dd6.b1775",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1286,\r
-        "y": 353,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1235,\r
+        "y": 322,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "18dafb4f.277ba5"\r
+                "98d37fbb.84095"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ebfa6a3.e8164",\r
+        "id": "2e9e0315.971fdc",\r
          "type": "other",\r
          "name": "Do Nothing",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1101,\r
-        "y": 422,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1050,\r
+        "y": 391,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bff9d743.e28a08",\r
+        "id": "381822b1.80b79e",\r
          "type": "outcome",\r
          "name": "10GBASE-R",\r
          "xml": "<outcome value='10GBASE-R'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1619,\r
-        "y": 346,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1568,\r
+        "y": 315,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              [\r
-                "1fad8a48.e66316"\r
+                "efd565dd.38cea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80d30a7a.cb97f",\r
+        "id": "800aa6e0.11c5d8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1612,\r
-        "y": 414,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1561,\r
+        "y": 383,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1fad8a48.e66316",\r
+        "id": "efd565dd.38cea",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='mapping-mode-aend' value='mapping-mode' />\n<parameter name='mapping-mode-zend' value='mapping-mode' />\n<parameter name='mapping-mode.value' value='GFP-F' />\n",\r
          "comments": "",\r
-        "x": 1828,\r
-        "y": 345,\r
-        "z": "c2959a97.94a74",\r
+        "x": 1777,\r
+        "y": 314,\r
+        "z": "d3028d55.5844c",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5929fa76.a7464c",\r
+        "id": "e0320b48.98ab8",\r
          "type": "execute",\r
          "name": "split node-id z-end",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$zend-nodeid`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 834,\r
-        "y": 157,\r
-        "z": "c2959a97.94a74",\r
+        "x": 775,\r
+        "y": 75,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b065abfd.9e90f8",\r
+        "id": "1d32325.a1daece",\r
          "type": "execute",\r
          "name": "split node-id a-end",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$aend-nodeid`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 837,\r
-        "y": 93,\r
-        "z": "c2959a97.94a74",\r
+        "x": 782,\r
+        "y": 37,\r
+        "z": "d3028d55.5844c",\r
          "wires": [\r
              []\r
          ]\r
+    },\r
+    {\r
+        "id": "185b18b9.1e9acf",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 749.566650390625,\r
+        "y": 238.56666564941406,\r
+        "z": "d3028d55.5844c",\r
+        "wires": [\r
+            [\r
+                "fbe62272.e26fb8",\r
+                "8121433b.1d8c48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fbe62272.e26fb8",\r
+        "type": "outcome",\r
+        "name": "10",\r
+        "xml": "<outcome value='10'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 946.566650390625,\r
+        "y": 195.56666564941406,\r
+        "z": "d3028d55.5844c",\r
+        "wires": [\r
+            [\r
+                "4ca46304.56d004"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8121433b.1d8c48",\r
+        "type": "outcome",\r
+        "name": "100",\r
+        "xml": "<outcome value='100'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 945.7333984375,\r
+        "y": 271.566650390625,\r
+        "z": "d3028d55.5844c",\r
+        "wires": [\r
+            [\r
+                "8900f991.ec20e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ca46304.56d004",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.coding-func' value='10GBASE-R' />\n\n",\r
+        "comments": "",\r
+        "x": 1126.7334594726562,\r
+        "y": 193.56666564941406,\r
+        "z": "d3028d55.5844c",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8900f991.ec20e8",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.coding-func' value='100GBASE-R' />\n\n",\r
+        "comments": "",\r
+        "x": 1121.5667114257812,\r
+        "y": 266.566650390625,\r
+        "z": "d3028d55.5844c",\r
+        "wires": []\r
      }\r
  ]
 \ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json

index df94ddf..039d9ee 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "53abb973.be3358",\r
+        "id": "cbaea85f.b8ead",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 320.566650390625,\r
-        "y": 127.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 236.56666564941406,\r
+        "y": 102,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "a8f6adda.0744"\r
+                "cd2455f6.6e932"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8f6adda.0744",\r
+        "id": "cd2455f6.6e932",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,344 +22,300 @@
          "comments": "",\r
          "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}'>",\r
          "outputs": 1,\r
-        "x": 333.566650390625,\r
-        "y": 187.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 249.56666564941406,\r
+        "y": 162,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "18e37cee.ceb953"\r
+                "70c8e970.4db21"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18e37cee.ceb953",\r
+        "id": "70c8e970.4db21",\r
          "type": "method",\r
          "name": "method service-delete-msa-sync",\r
          "xml": "<method rpc='service-delete-msa' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 353.566650390625,\r
-        "y": 267.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 269.56666564941406,\r
+        "y": 242,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "64d96c24.58677c"\r
+                "9c1f56f6.d00f38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64d96c24.58677c",\r
+        "id": "9c1f56f6.d00f38",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 601.066650390625,\r
-        "y": 267.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 517.0666656494141,\r
+        "y": 242,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "d0c8eab9.2acb7",\r
-                "7e4b0c6a.d80e4c"\r
+                "4dd86cf3.942054"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d0c8eab9.2acb7",\r
-        "type": "set",\r
-        "name": "set",\r
-        "xml": "<set>\n<parameter name='optical-service-create-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`\"/>\n",\r
-        "comments": "",\r
-        "x": 783.566650390625,\r
-        "y": 242.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "7e4b0c6a.d80e4c",\r
+        "id": "4dd86cf3.942054",\r
          "type": "execute",\r
          "name": "Call MSA Controller",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/openroadm/openroadm-services/' + $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=\"service-delete-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.msa.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\"/>\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 781.566650390625,\r
-        "y": 344.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 697.5666656494141,\r
+        "y": 319,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "e8374b35.9489e8",\r
-                "59601e7a.333fb8"\r
+                "682d86b8.05526",\r
+                "39c8d3c3.b62bfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59601e7a.333fb8",\r
+        "id": "39c8d3c3.b62bfc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 960.566650390625,\r
-        "y": 415.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 876.5666656494141,\r
+        "y": 390,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "f7639000.8d09b"\r
+                "95d20785.38f27"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e8374b35.9489e8",\r
+        "id": "682d86b8.05526",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 957.566650390625,\r
-        "y": 301.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 873.5666656494141,\r
+        "y": 276,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "44136677.41a668"\r
+                "19ac1c74.d7d004"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44136677.41a668",\r
+        "id": "19ac1c74.d7d004",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1119.566650390625,\r
-        "y": 296.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1035.566665649414,\r
+        "y": 271,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "656a3cd0.5027ec"\r
+                "a6253b3d.1d9918"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7639000.8d09b",\r
+        "id": "95d20785.38f27",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1133.566650390625,\r
-        "y": 418.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1049.566665649414,\r
+        "y": 393,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "6f5cb50c.47cb9c",\r
-                "61d2d42e.74ce34"\r
+                "507025a0.559a4c",\r
+                "91af5694.a6f19"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "656a3cd0.5027ec",\r
+        "id": "a6253b3d.1d9918",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Error deleting the Service' />\n",\r
          "comments": "",\r
-        "x": 1287.566650390625,\r
-        "y": 293.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1203.566665649414,\r
+        "y": 268,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6f5cb50c.47cb9c",\r
+        "id": "507025a0.559a4c",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Successfully sent the request\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1314.566650390625,\r
-        "y": 377.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1230.566665649414,\r
+        "y": 352,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "61d2d42e.74ce34",\r
+        "id": "91af5694.a6f19",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$service-delete-response.configuration-response-common.response-code`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1307.566650390625,\r
-        "y": 468.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1223.566665649414,\r
+        "y": 443,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "6a32e2cb.011efc",\r
-                "126ef311.e5b135"\r
+                "91d16260.78483",\r
+                "b0a0d653.d2aad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a32e2cb.011efc",\r
+        "id": "91d16260.78483",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1450.566650390625,\r
-        "y": 443.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1366.566665649414,\r
+        "y": 418,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "20f6b725.7d2e3"\r
+                "d1f703a2.70624"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20f6b725.7d2e3",\r
+        "id": "d1f703a2.70624",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />\n<parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />\n",\r
          "comments": "",\r
-        "x": 1647.566650390625,\r
-        "y": 441.56666564941406,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1563.566665649414,\r
+        "y": 416,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "126ef311.e5b135",\r
+        "id": "b0a0d653.d2aad8",\r
          "type": "outcome",\r
          "name": "200",\r
          "xml": "<outcome value='200'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1474.566650390625,\r
-        "y": 557.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1390.566665649414,\r
+        "y": 532,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "47d51f0e.38e19"\r
+                "2d1cf19b.b3a7b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47d51f0e.38e19",\r
+        "id": "2d1cf19b.b3a7b6",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1638.566650390625,\r
-        "y": 552.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1554.566665649414,\r
+        "y": 527,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "b9afc35f.499458",\r
-                "f8b135a9.17c5d8",\r
-                "70aa5b37.57ec94",\r
-                "a77548a2.59db78",\r
-                "ba4b7b38.d871e"\r
+                "b1a5c7e2.86fb38",\r
+                "4c41a47d.e30d04",\r
+                "fa335160.5d27e",\r
+                "108a94.a1ea956c",\r
+                "ad08b45b.6db4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9afc35f.499458",\r
+        "id": "b1a5c7e2.86fb38",\r
          "type": "record",\r
          "name": "record",\r
          "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside controller\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1810.566650390625,\r
-        "y": 520.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1726.566665649414,\r
+        "y": 495,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f8b135a9.17c5d8",\r
-        "type": "save",\r
-        "name": "save",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"DELETING\" WHERE request_id = $optical-service-delete-input.request-id' \nforce='true' pfx='save-result'>\n\n\n\n\n\n\n\n\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1820.566650390625,\r
-        "y": 607.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "70aa5b37.57ec94",\r
+        "id": "4c41a47d.e30d04",\r
          "type": "get-resource",\r
          "name": "get-resource",\r
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT *\nfrom REQUEST_DETAILS \nWHERE request_id = $optical-service-delete-input.request-id'\npfx='db.request-details'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n\n",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT *\nfrom REQUEST_DETAILS \nWHERE request_id = $optical-service-delete-input.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",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1826.566650390625,\r
-        "y": 683.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1771.566650390625,\r
+        "y": 574,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
-            [\r
-                "84297f07.a526"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "84297f07.a526",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1984.566650390625,\r
-        "y": 674.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
-        "wires": [\r
-            [\r
-                "aff15672.da7fa8"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "aff15672.da7fa8",\r
+        "id": "fa335160.5d27e",\r
          "type": "set",\r
          "name": "set",\r
-        "xml": "<set>\n<parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\n<parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\n<parameter name='service-id' value='`$db.request-details.service-type`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
+        "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",\r
          "comments": "",\r
-        "x": 2133.566650390625,\r
-        "y": 677.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1706.566665649414,\r
+        "y": 833.9999847412109,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a77548a2.59db78",\r
-        "type": "update",\r
-        "name": "update",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true' \nresource='service-instance' \nkey = 'customer.global-customer-id = $customer-id AND\n     service-subscription.service-type = $service-id AND\n     service-instance.service-instance-id = $instance-id'\nlocal-only='false'>\n    <parameter name='orchestration-status' value='DELETING' />\n\n    \n    \n    \n\n",\r
+        "id": "108a94.a1ea956c",\r
+        "type": "call",\r
+        "name": "call aai-delete-service-handling",\r
+        "xml": "<call module='optical-service' rpc='aai-delete-service-handling' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1799.566650390625,\r
-        "y": 750.5666656494141,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1807.13330078125,\r
+        "y": 699.566650390625,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ba4b7b38.d871e",\r
+        "id": "ad08b45b.6db4",\r
          "type": "set",\r
          "name": "set",\r
-        "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",\r
+        "xml": "<set>\n<parameter name='request-id' value='`$optical-service-create-input.request-id`' />\n",\r
          "comments": "",\r
-        "x": 1790.566650390625,\r
-        "y": 859.566650390625,\r
-        "z": "8588d9b2.517e38",\r
+        "x": 1762.13330078125,\r
+        "y": 627.566650390625,\r
+        "z": "27c6cdb6.f4809a",\r
          "wires": []\r
      }\r
  ]
 \ 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

index 0f3e967..e11d061 100644 (file)
--- 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
@@ -21,7 +21,7 @@ pfx='aai.service'      local-only='false'></get-resource>
                  <parameter name="field2" value="`$aai.service.orchestration-status`"/>\r
                  <parameter name="field3" value="`$aai.service.relationship-list.relationship_length`"/>\r
              </record>\r
-            <for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\r
+            <for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >\r
                  <block atomic='true'>\r
                      <set>\r
                          <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />\r
@@ -66,4 +66,4 @@ service-instance.service-instance-id = $output.service-instance-id'></delete>
      key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>\r
          </block>\r
      </method>\r
-</service-logic>
-\ No newline at end of file
+</service-logic>\r
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml

index 43359c4..4eed402 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml
@@ -38,40 +38,18 @@ key = 'pnf.pnf-name = $z-end-pnf-name
        local-only='false'>\r
                  <parameter name='available-capacity' value='`$available-bandwidth-zend`' />\r
              </update>\r
-            <switch test='`$optical-service-create-input.payload.domain-type`'>\r
-                <outcome value='MSA'>\r
-                    <block>\r
-                        <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 , 'CREATING' , $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 , $optical-service-create-input.notification-url );"></save>\r
-                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \r
+            <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 , $optical-service-create-input.notification-url );"></save>\r
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \r
       key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\r
       service-subscription.service-type = $optical-service-create-input.service-type AND\r
       service-instance.service-instance-id = $optical-service-create-input.service-id' >\r
-                            <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\r
-                            <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\r
-                            <parameter name='service-type' value='Domain-Service' />\r
-                            <parameter name='orchestration-status' value='CREATING' />\r
-                            <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\r
-                            <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />\r
-                        </save>\r
-                    </block>\r
-                </outcome>\r
-                <outcome value='TAPI'>\r
-                    <block>\r
-                        <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 , $optical-service-create-input.notification-url );"></save>\r
-                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \r
-     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\r
-     service-subscription.service-type = $optical-service-create-input.service-type AND\r
-     service-instance.service-instance-id = $optical-service-create-input.service-id' >\r
-                            <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\r
-                            <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\r
-                            <parameter name='service-type' value='Domain-Service' />\r
-                            <parameter name='orchestration-status' value='CREATED' />\r
-                            <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\r
-                            <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />\r
-                        </save>\r
-                    </block>\r
-                </outcome>\r
-            </switch>\r
+                <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\r
+                <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\r
+                <parameter name='service-type' value='Domain-Service' />\r
+                <parameter name='orchestration-status' value='CREATED' />\r
+                <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\r
+                <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />\r
+            </save>\r
              <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \r
       key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\r
       service-subscription.service-type = $optical-service-create-input.service-type AND\r
@@ -85,11 +63,9 @@ key = 'pnf.pnf-name = $z-end-pnf-name
                  <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="pnf.pnf-name" />\r
                  <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$z-end-pnf-name`" />\r
              </save>\r
-            <return status='success'>\r
-                <parameter name='error-code' value='200' />\r
-                <parameter name='error-message' value='Service Creation in Progress' />\r
-                <parameter name='ack-final-indicator' value='N' />\r
-            </return>\r
+            <set>\r
+                <parameter name='final-response-code' value='200' />\r
+            </set>\r
          </block>\r
      </method>\r
  </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml

index 0c09b4a..2341c60 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
@@ -87,6 +87,13 @@
                          </set>\r
                      </outcome>\r
                  </switch>\r
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni1_client_proto'`">\r
+                    <outcome value='true'>\r
+                        <set>\r
+                            <parameter name='optical-service-create-input.payload.service-protocol' value="`$optical-service-create-input.payload.param[$idx].value`"/>\r
+                        </set>\r
+                    </outcome>\r
+                </switch>\r
              </for>\r
              <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
  key='SELECT controller_id \r
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-create-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-create-msa.xml

index db2d29f..6768a50 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-create-msa.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-create-msa.xml
@@ -26,6 +26,18 @@
                  <parameter name='service-aend-nodeid' value='`$param-prefix[0]`' />\r
                  <parameter name='service-zend-nodeid' value='`$param-prefix1[0]`' />\r
              </set>\r
+            <switch test='`$optical-service-create-input.payload.service-rate`'>\r
+                <outcome value='10'>\r
+                    <set>\r
+                        <parameter name='optical-service-create-input.payload.coding-func' value='10GBASE-R' />\r
+                    </set>\r
+                </outcome>\r
+                <outcome value='100'>\r
+                    <set>\r
+                        <parameter name='optical-service-create-input.payload.coding-func' value='100GBASE-R' />\r
+                    </set>\r
+                </outcome>\r
+            </switch>\r
              <switch test='`$optical-service-create-input.payload.service-protocol`'>\r
                  <outcome value='Ethernet'>\r
                      <block atomic='true'>\r
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml

index 562195a..a423317 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
@@ -3,10 +3,6 @@
      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}'>\r
      <method rpc='service-delete-msa' mode='sync'>\r
          <block atomic="true">\r
-            <set>\r
-                <parameter name='optical-service-create-input.request-id' value="`$domain-service1`" />\r
-                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`"/>\r
-            </set>\r
              <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                  <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />\r
                  <parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>\r
@@ -49,32 +45,15 @@
                                          <parameter name="level" value="info" />\r
                                          <parameter name="field1" value="Inside controller"/>\r
                                      </record>\r
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \r
-resource='SQL' \r
-key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id' \r
-force='true' pfx='save-result'></save>\r
                                      <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
  key='SELECT *\r
  from REQUEST_DETAILS \r
  WHERE request_id = $optical-service-delete-input.request-id'\r
-pfx='db.request-details'>\r
-                                        <outcome value='success'>\r
-                                            <set>\r
-                                                <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\r
-                                                <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\r
-                                                <parameter name='service-id' value='`$db.request-details.service-type`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </get-resource>\r
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \r
-force='true' \r
-resource='service-instance' \r
-key = 'customer.global-customer-id = $customer-id AND\r
-     service-subscription.service-type = $service-id AND\r
-     service-instance.service-instance-id = $instance-id'\r
-local-only='false'>\r
-                                        <parameter name='orchestration-status' value='DELETING' />\r
-                                    </update>\r
+pfx='output'></get-resource>\r
+                                    <set>\r
+                                        <parameter name='request-id' value='`$optical-service-create-input.request-id`' />\r
+                                    </set>\r
+                                    <call module='optical-service' rpc='aai-delete-service-handling' mode='sync' ></call>\r
                                      <set>\r
                                          <parameter name='final-response-code' value="200" />\r
                                      </set>\r
author	Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
	Fri, 3 Apr 2020 05:50:12 +0000 (05:50 +0000)
committer	Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
	Fri, 3 Apr 2020 05:50:29 +0000 (05:50 +0000)
platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json		patch \| blob \| history
platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_service-create-msa.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_service-create-msa.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml		patch \| blob \| history