X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Foptical-service%2Fsrc%2Fmain%2Fjson%2Foptical-service_main-create.json;h=5f81d00d85b9aedc258e39422531b3def2308531;hb=4e6241c456ca3fcb8ae93e08d7940b7c618b2f97;hp=a4a40e3a4ae7a0a9fe90ceea74298f305f36addd;hpb=7217066f61eec5b3b205e6e84119a7c03509ec2f;p=sdnc%2Foam.git

diff --git a/platform-logic/optical-service/src/main/json/optical-service_main-create.json b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
index a4a40e3a..5f81d00d 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_main-create.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "65bbf2ea.e8f944",
+        "id": "fa16ded3.d901b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 286.8833312988281,
-        "y": 269,
-        "z": "30ae7182.add8b6",
+        "x": 115.56666564941406,
+        "y": 208,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "1593715.ae96a8f"
+                "90403a74.09bb68"
             ]
         ]
     },
     {
-        "id": "f336edeb.74ce6",
+        "id": "f00eb096.4df5f8",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='main-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 285.8833312988281,
-        "y": 344,
-        "z": "30ae7182.add8b6",
+        "x": 114.56666564941406,
+        "y": 283,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "14882330.8313b5"
+                "f2783a8d.204c9"
             ]
         ]
     },
     {
-        "id": "1593715.ae96a8f",
+        "id": "90403a74.09bb68",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -38,330 +38,342 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 504.3833312988281,
-        "y": 252,
-        "z": "30ae7182.add8b6",
+        "x": 333.06666564941406,
+        "y": 191,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "f336edeb.74ce6"
+                "f00eb096.4df5f8"
             ]
         ]
     },
     {
-        "id": "14882330.8313b5",
+        "id": "f2783a8d.204c9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 461.8833312988281,
-        "y": 357,
-        "z": "30ae7182.add8b6",
+        "x": 290.56666564941406,
+        "y": 296,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "994bfa4.9799188",
-                "c4d3d388.dc35a",
-                "204f0598.3ac182",
-                "2d636d44.e5a0fa",
-                "2c72a67.f372ada",
-                "79455985.47e29",
-                "887cbe59.b1784",
-                "4f44de12.e7fb18"
+                "ee7be5b0.aa7dc8",
+                "1dad9f12.1a3e61",
+                "aaac41a5.27aa68",
+                "f2b644f.38afa38",
+                "8c0272ce.5073f8",
+                "c0d24976.f4106",
+                "f7e9652a.8ce238",
+                "6f7933ca.5a605c"
             ]
         ]
     },
     {
-        "id": "c4d3d388.dc35a",
+        "id": "1dad9f12.1a3e61",
         "type": "switchNode",
         "name": "switch : domain-type",
         "xml": "<switch test='`$domain-type`'>\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 339.3833312988281,
-        "y": 670,
-        "z": "30ae7182.add8b6",
+        "x": 168.06666564941406,
+        "y": 609,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "77b74d5.6495a34",
-                "7bd5cfea.c1ac2"
+                "e31c6328.82295",
+                "4cf89a4b.d30f7c"
             ]
         ]
     },
     {
-        "id": "77b74d5.6495a34",
+        "id": "e31c6328.82295",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 641.8833312988281,
-        "y": 640,
-        "z": "30ae7182.add8b6",
+        "x": 470.56666564941406,
+        "y": 579,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "70f7a20a.befe0c"
+                "b7bf1438.6f1708"
             ]
         ]
     },
     {
-        "id": "7bd5cfea.c1ac2",
+        "id": "4cf89a4b.d30f7c",
         "type": "outcome",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 637.8833312988281,
-        "y": 749,
-        "z": "30ae7182.add8b6",
+        "x": 466.56666564941406,
+        "y": 688,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "9b03001b.004b98"
+                "8393cee1.c83828"
             ]
         ]
     },
     {
-        "id": "994bfa4.9799188",
+        "id": "ee7be5b0.aa7dc8",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n<parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />\n<parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 854.88330078125,
-        "y": 181,
-        "z": "30ae7182.add8b6",
+        "x": 683.5666351318359,
+        "y": 120,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "70f7a20a.befe0c",
+        "id": "b7bf1438.6f1708",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 829.8833312988281,
-        "y": 641,
-        "z": "30ae7182.add8b6",
+        "x": 658.5666656494141,
+        "y": 580,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "5fc1c8dc.a583e8"
+                "e32158b8.9895f",
+                "2158346f.f6bbfc"
             ]
         ]
     },
     {
-        "id": "9b03001b.004b98",
+        "id": "8393cee1.c83828",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 822.8833312988281,
-        "y": 754,
-        "z": "30ae7182.add8b6",
+        "x": 651.5666656494141,
+        "y": 693,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "b46560fc.9378b8"
+                "a02ebdd4.76b6e"
             ]
         ]
     },
     {
-        "id": "204f0598.3ac182",
+        "id": "aaac41a5.27aa68",
         "type": "call",
         "name": "call validate-input-parameters",
         "xml": "<call module='optical-service' rpc='optical-validate-input-params' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 911.88330078125,
-        "y": 136,
-        "z": "30ae7182.add8b6",
+        "x": 740.5666351318359,
+        "y": 75,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "b46560fc.9378b8",
+        "id": "a02ebdd4.76b6e",
         "type": "call",
         "name": "call TAPI DG",
         "xml": "<call module='optical-service' rpc='service-create-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1018.8833618164062,
-        "y": 760,
-        "z": "30ae7182.add8b6",
+        "x": 847.5666961669922,
+        "y": 699,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fc1c8dc.a583e8",
+        "id": "e32158b8.9895f",
         "type": "call",
         "name": "call MSA DG",
         "xml": "<call module='optical-service' rpc='service-create-msa' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1048.88330078125,
-        "y": 641,
-        "z": "30ae7182.add8b6",
+        "x": 877.5666351318359,
+        "y": 580,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d636d44.e5a0fa",
+        "id": "f2b644f.38afa38",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
         "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='controllerid'>\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",
         "comments": "",
         "outputs": 1,
-        "x": 871.88330078125,
-        "y": 257,
-        "z": "30ae7182.add8b6",
+        "x": 700.5666351318359,
+        "y": 196,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "33031f70.c9e2f"
+                "b77153b2.c2f938"
             ]
         ]
     },
     {
-        "id": "2c72a67.f372ada",
+        "id": "8c0272ce.5073f8",
         "type": "execute",
         "name": "split node-id a-end retrieved from DB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 871.88330078125,
-        "y": 308,
-        "z": "30ae7182.add8b6",
+        "x": 700.5666351318359,
+        "y": 247,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "33031f70.c9e2f",
+        "id": "b77153b2.c2f938",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.88330078125,
-        "y": 255,
-        "z": "30ae7182.add8b6",
+        "x": 936.5666351318359,
+        "y": 194,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "6316e11e.6a8a8"
+                "8f62ab7a.db0b3"
             ]
         ]
     },
     {
-        "id": "6316e11e.6a8a8",
+        "id": "8f62ab7a.db0b3",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='controller-id' value='`$controllerid.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1250.88330078125,
-        "y": 257,
-        "z": "30ae7182.add8b6",
+        "x": 1079.566635131836,
+        "y": 196,
+        "z": "85a5350a.773aa",
         "wires": []
     },
     {
-        "id": "79455985.47e29",
+        "id": "c0d24976.f4106",
         "type": "set",
         "name": "set controller-ip",
-        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n \n",
+        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n\n \n",
         "comments": "",
-        "x": 815.88330078125,
-        "y": 370,
-        "z": "30ae7182.add8b6",
+        "x": 644.5666351318359,
+        "y": 309,
+        "z": "85a5350a.773aa",
         "wires": []
     },
     {
-        "id": "887cbe59.b1784",
+        "id": "f7e9652a.8ce238",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\npfx='db-aend'>\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",
         "comments": "",
         "outputs": 1,
-        "x": 693.88330078125,
-        "y": 424,
-        "z": "30ae7182.add8b6",
+        "x": 522.5666351318359,
+        "y": 363,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "1d791c96.d1da33"
+                "a1f4b6c7.113a2"
             ]
         ]
     },
     {
-        "id": "4f44de12.e7fb18",
+        "id": "6f7933ca.5a605c",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-zend.port-id'\npfx='db-zend'>\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",
         "comments": "",
         "outputs": 1,
-        "x": 679.88330078125,
-        "y": 487,
-        "z": "30ae7182.add8b6",
+        "x": 508.56663513183594,
+        "y": 426,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "ef8516e4.6c5f7"
+                "2ea9e371.7eafec"
             ]
         ]
     },
     {
-        "id": "1d791c96.d1da33",
+        "id": "a1f4b6c7.113a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 877.88330078125,
-        "y": 426,
-        "z": "30ae7182.add8b6",
+        "x": 706.5666351318359,
+        "y": 365,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "c56f5bdc.a7e378"
+                "46b0b834.385158"
             ]
         ]
     },
     {
-        "id": "c56f5bdc.a7e378",
+        "id": "46b0b834.385158",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-nodeid' value='`$db-aend.pnf-id`' />\n<parameter name='a-end-pnf-name' value='`$db-aend.pnf-name`' />\n<parameter name='aend-clli' value='`$db-aend.clli`' />\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1044.88330078125,
-        "y": 425,
-        "z": "30ae7182.add8b6",
+        "x": 873.5666351318359,
+        "y": 364,
+        "z": "85a5350a.773aa",
         "wires": []
     },
     {
-        "id": "ef8516e4.6c5f7",
+        "id": "2ea9e371.7eafec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.88330078125,
-        "y": 491,
-        "z": "30ae7182.add8b6",
+        "x": 705.5666351318359,
+        "y": 430,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "3ea4fdfa.d7bd4a"
+                "89fb9148.b2f3a8"
             ]
         ]
     },
     {
-        "id": "3ea4fdfa.d7bd4a",
+        "id": "89fb9148.b2f3a8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-nodeid' value='`$db-zend.pnf-id`' />\n<parameter name='z-end-pnf-name' value='`$db-zend.pnf-name`' />\n<parameter name='zend-clli' value='`$db-zend.clli`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1044.88330078125,
-        "y": 492,
-        "z": "30ae7182.add8b6",
+        "x": 873.5666351318359,
+        "y": 431,
+        "z": "85a5350a.773aa",
+        "wires": []
+    },
+    {
+        "id": "2158346f.f6bbfc",
+        "type": "set",
+        "name": "set service-name",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.service-name + '_' + $param-prefix[2]`\"/>\n \n",
+        "comments": "",
+        "x": 840.5,
+        "y": 507.5,
+        "z": "85a5350a.773aa",
         "wires": []
     }
 ]
\ No newline at end of file