diff options
12 files changed, 1232 insertions, 1298 deletions
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 1dd336e8..cb664239 100644 --- 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 @@ [
{
- "id": "8b4dcfe.e866f3",
+ "id": "104e7d48.f3cf6b",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -8,897 +8,897 @@ "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='DataChange' version='${project.version}'>",
"outputs": 1,
- "x": 401,
- "y": 62,
- "z": "d8656b08.07aab8",
+ "x": 406.5,
+ "y": 79.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "adc1d56c.b72ff"
+ "5d813483.feaafc"
]
]
},
{
- "id": "adc1d56c.b72ff",
+ "id": "5d813483.feaafc",
"type": "method",
"name": "method msa-update-network-to-aai",
"xml": "<method rpc='msa-update-network-to-aai' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 144,
- "y": 136,
- "z": "d8656b08.07aab8",
+ "x": 149.5,
+ "y": 153.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "106658a8.d884c7"
+ "f1373060.5fa1b8"
]
]
},
{
- "id": "106658a8.d884c7",
+ "id": "f1373060.5fa1b8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 382.00003814697266,
- "y": 136.00001335144043,
- "z": "d8656b08.07aab8",
+ "x": 387.50003814697266,
+ "y": 153.5666790008545,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "4b7c5962.7cf4f8"
+ "118d904f.a73618"
]
]
},
{
- "id": "8e1c9818.33b57",
+ "id": "5148e490.8887ac",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 123,
- "y": 64,
- "z": "d8656b08.07aab8",
+ "x": 128.5,
+ "y": 81.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "8b4dcfe.e866f3"
+ "104e7d48.f3cf6b"
]
]
},
{
- "id": "4b7c5962.7cf4f8",
+ "id": "118d904f.a73618",
"type": "switchNode",
"name": "switch network-id",
"xml": "<switch test=\"`$networks.network-id`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 178.5104522705078,
- "y": 247.0000114440918,
- "z": "d8656b08.07aab8",
+ "x": 184.0104522705078,
+ "y": 264.56667709350586,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "b84da364.adfac",
- "3a113c69.68266c"
+ "1a591305.fd6b45",
+ "315839fb.fe3f4e"
]
]
},
{
- "id": "b84da364.adfac",
+ "id": "1a591305.fd6b45",
"type": "other",
"name": "other: Do Nothing",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 443.5104064941406,
- "y": 469.99993896484375,
- "z": "d8656b08.07aab8",
+ "x": 449.0104064941406,
+ "y": 487.5666046142578,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "3a113c69.68266c",
+ "id": "315839fb.fe3f4e",
"type": "outcome",
"name": "otn-topology",
"xml": "<outcome value='otn-topology'>\n",
"comments": "",
"outputs": 1,
- "x": 410,
- "y": 247,
- "z": "d8656b08.07aab8",
+ "x": 415.5,
+ "y": 264.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "5112d334.33a61c"
+ "975d8fa3.881088"
]
]
},
{
- "id": "5112d334.33a61c",
+ "id": "975d8fa3.881088",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 605,
- "y": 247,
- "z": "d8656b08.07aab8",
+ "x": 610.5,
+ "y": 264.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "4a7e5696.0715b",
- "d2e8624a.31b89",
- "22d90846.8bc5b8",
- "6c4d9e05.4fa72",
- "1587342a.1379dc"
+ "68d9f126.b948e",
+ "a34b2c50.7ce4f",
+ "e99fa34f.55a988",
+ "4503a33d.d9bd8c",
+ "81e5bdae.f433c8"
]
]
},
{
- "id": "4a7e5696.0715b",
+ "id": "68d9f126.b948e",
"type": "save",
"name": "save network-resource",
"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",
"comments": "",
"outputs": 1,
- "x": 897,
- "y": 100,
- "z": "d8656b08.07aab8",
+ "x": 902.5,
+ "y": 117.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "d2e8624a.31b89",
+ "id": "a34b2c50.7ce4f",
"type": "save",
"name": "save network-resource relation with esr-thirdparty-sdnc",
"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`\" />",
"comments": "",
"outputs": 1,
- "x": 987,
- "y": 159,
- "z": "d8656b08.07aab8",
+ "x": 992.5,
+ "y": 176.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "22d90846.8bc5b8",
+ "id": "e99fa34f.55a988",
"type": "for",
"name": "for each node",
"xml": "<for index='nidx' start='0' end='`$networks.node_length`' >\n\n",
"comments": "",
"outputs": 1,
- "x": 831,
- "y": 301,
- "z": "d8656b08.07aab8",
+ "x": 836.5,
+ "y": 318.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "f56585e4.72bcc",
- "b3dc81c8.6f70f8"
+ "8d4a4f94.782ed",
+ "dbb6b256.7c00a"
]
]
},
{
- "id": "f56585e4.72bcc",
+ "id": "8d4a4f94.782ed",
"type": "set",
"name": "set node",
"xml": "<set>\n<parameter name='node.' value='`$networks.node[$nidx].`' />\n",
"comments": "",
- "x": 1013,
- "y": 300,
- "z": "d8656b08.07aab8",
+ "x": 1018.5,
+ "y": 317.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "b3dc81c8.6f70f8",
+ "id": "dbb6b256.7c00a",
"type": "switchNode",
"name": "switch node-type",
"xml": "<switch test=\"`$node.node-type`\">\n\n",
"comments": "",
"outputs": 1,
- "x": 1034,
- "y": 400,
- "z": "d8656b08.07aab8",
+ "x": 1039.5,
+ "y": 417.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "ac532b61.57fca8",
- "a021c2b4.589bc"
+ "c77859ef.314a08",
+ "34a91f9c.019b1"
]
]
},
{
- "id": "ac532b61.57fca8",
+ "id": "c77859ef.314a08",
"type": "outcome",
"name": "SWITCH",
"xml": "<outcome value='SWITCH'>\n",
"comments": "",
"outputs": 1,
- "x": 1219,
- "y": 401,
- "z": "d8656b08.07aab8",
+ "x": 1224.5,
+ "y": 418.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "8591e2ec.94b2d8"
+ "70a2f008.086aa8"
]
]
},
{
- "id": "a021c2b4.589bc",
+ "id": "34a91f9c.019b1",
"type": "other",
"name": "other : Do Nothing",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1262,
- "y": 524,
- "z": "d8656b08.07aab8",
+ "x": 1267.5,
+ "y": 541.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "8591e2ec.94b2d8",
+ "id": "70a2f008.086aa8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1390,
- "y": 402,
- "z": "d8656b08.07aab8",
+ "x": 1395.5,
+ "y": 419.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "8d6438ce.9a465",
- "7c327396.cf8004",
- "92a0366b.9648d8",
- "506cbe9f.0da148",
- "9a96883c.2c0c6",
- "76be62e9.bf594c"
+ "1172ae87.ebdb29",
+ "9cec7146.2e6ac",
+ "d1692405.c347a",
+ "50bbb17d.793c4",
+ "869684c2.e7fdb",
+ "e310391d.26926"
]
]
},
{
- "id": "8d6438ce.9a465",
+ "id": "1172ae87.ebdb29",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"pnfname\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1569,
- "y": 194,
- "z": "d8656b08.07aab8",
+ "x": 1574.5,
+ "y": 211.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "7c327396.cf8004",
+ "id": "9cec7146.2e6ac",
"type": "save",
"name": "save pnf details to AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 1624,
- "y": 250,
- "z": "d8656b08.07aab8",
+ "x": 1629.5,
+ "y": 267.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "92a0366b.9648d8",
+ "id": "d1692405.c347a",
"type": "save",
"name": "save pnf relationship to network-resource in AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 1727,
- "y": 314,
- "z": "d8656b08.07aab8",
+ "x": 1732.5,
+ "y": 331.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "506cbe9f.0da148",
+ "id": "50bbb17d.793c4",
"type": "for",
"name": "for each termination point",
"xml": "<for index='tpidx' start='0' end='`$node.termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1595,
- "y": 575,
- "z": "d8656b08.07aab8",
+ "x": 1600.5,
+ "y": 592.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "a9a91cea.c7d998",
- "3e218bee.5222ec",
- "763d8580.7328c4",
- "a8ff331a.025d",
- "8e2b2ac1.d11b2",
- "6bb4981.68f2ee8",
- "9bf5664b.07737"
+ "7af64957.8fa6b8",
+ "f7da9215.3d16c",
+ "9a1981e1.920fd8",
+ "6b40a855.ff49b",
+ "32cd571a.6766f",
+ "79c2bf41.e84278",
+ "6ab14ba2.b06b3c"
]
]
},
{
- "id": "a9a91cea.c7d998",
+ "id": "7af64957.8fa6b8",
"type": "set",
"name": "set termination point",
"xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tpidx].`' />\n",
"comments": "",
- "x": 1865,
- "y": 606,
- "z": "d8656b08.07aab8",
+ "x": 1870.5,
+ "y": 623.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "a8ff331a.025d",
+ "id": "6b40a855.ff49b",
"type": "save",
"name": "save p-interface to AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 1862,
- "y": 814,
- "z": "d8656b08.07aab8",
+ "x": 1867.5,
+ "y": 831.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "763d8580.7328c4",
+ "id": "9a1981e1.920fd8",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"interfaceName\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1839,
- "y": 752,
- "z": "d8656b08.07aab8",
+ "x": 1844.5,
+ "y": 769.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "3e218bee.5222ec",
+ "id": "f7da9215.3d16c",
"type": "switchNode",
"name": "switch tp-type",
"xml": "<switch test=\"`$tp.tp-type`\">\n",
"comments": "",
"outputs": 1,
- "x": 1852,
- "y": 674,
- "z": "d8656b08.07aab8",
+ "x": 1857.5,
+ "y": 691.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "88cb4971.2e8588",
- "43b07fb6.69d3f",
- "818ba69d.e74cf8"
+ "6b889540.d3439c",
+ "6c79f8e4.880e78",
+ "22f2d784.911b5"
]
]
},
{
- "id": "88cb4971.2e8588",
+ "id": "6b889540.d3439c",
"type": "outcome",
"name": "XPONDER-NETWORK",
"xml": "<outcome value='XPONDER-NETWORK'>\n",
"comments": "",
"outputs": 1,
- "x": 2090,
- "y": 630,
- "z": "d8656b08.07aab8",
+ "x": 2095.5,
+ "y": 647.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "4bf140e7.df7828"
+ "6a2abc7e.072b44"
]
]
},
{
- "id": "43b07fb6.69d3f",
+ "id": "6c79f8e4.880e78",
"type": "outcome",
"name": "XPONDER-CLIENT",
"xml": "<outcome value='XPONDER-CLIENT'>\n",
"comments": "",
"outputs": 1,
- "x": 2080,
- "y": 707,
- "z": "d8656b08.07aab8",
+ "x": 2085.5,
+ "y": 724.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "d2a50717.2a1d9"
+ "c1e1de7a.899c9"
]
]
},
{
- "id": "818ba69d.e74cf8",
+ "id": "22f2d784.911b5",
"type": "other",
"name": "other : Do Nothing",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 2090,
- "y": 780,
- "z": "d8656b08.07aab8",
+ "x": 2095.5,
+ "y": 797.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "6c4d9e05.4fa72",
+ "id": "4503a33d.d9bd8c",
"type": "for",
"name": "for each link",
"xml": "<for index='lidx' start='0' end='`$networks.link_length`' >\n\n\n",
"comments": "",
"outputs": 1,
- "x": 792,
- "y": 575,
- "z": "d8656b08.07aab8",
+ "x": 797.5,
+ "y": 592.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "575b0050.f3102",
- "f4b57e4d.f91c18"
+ "e267bbc9.6ea998",
+ "3d7fd479.ed54bc"
]
]
},
{
- "id": "575b0050.f3102",
+ "id": "e267bbc9.6ea998",
"type": "set",
"name": "set link",
"xml": "<set>\n<parameter name='link.' value='`$networks.link[$lidx].`' />\n",
"comments": "",
- "x": 987,
- "y": 521,
- "z": "d8656b08.07aab8",
+ "x": 992.5,
+ "y": 538.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "f4b57e4d.f91c18",
+ "id": "3d7fd479.ed54bc",
"type": "switchNode",
"name": "switch link-type",
"xml": "<switch test=\"`$link.link-type`\">\n",
"comments": "",
"outputs": 1,
- "x": 954,
- "y": 661,
- "z": "d8656b08.07aab8",
+ "x": 959.5,
+ "y": 678.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "c7be7986.f3d7",
- "b81cc555.59f47"
+ "73a2e499.1ff214",
+ "f6f62047.3cff1"
]
]
},
{
- "id": "c7be7986.f3d7",
+ "id": "73a2e499.1ff214",
"type": "outcome",
"name": "OTN-LINK",
"xml": "<outcome value='OTN-LINK'>\n",
"comments": "",
"outputs": 1,
- "x": 1167,
- "y": 657,
- "z": "d8656b08.07aab8",
+ "x": 1172.5,
+ "y": 674.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "b99bdbf4.fe7ab8"
+ "2630e595.f233aa"
]
]
},
{
- "id": "b81cc555.59f47",
+ "id": "f6f62047.3cff1",
"type": "other",
"name": "other : Do Nothing",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1119,
- "y": 761,
- "z": "d8656b08.07aab8",
+ "x": 1124.5,
+ "y": 778.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "b99bdbf4.fe7ab8",
+ "id": "2630e595.f233aa",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1168,
- "y": 1158,
- "z": "d8656b08.07aab8",
+ "x": 1173.5,
+ "y": 1175.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "eb78e1a4.f6c888",
- "9c6cd27.ce7a0b",
- "8d15fb9d.87f2c8",
- "df343460.1e46a",
- "d885100b.8f343",
- "3c142cb3.61690c",
- "14cce7fe.30486",
- "4284a26f.1ce334"
+ "4e7725d2.f582b4",
+ "e002d5f0.653908",
+ "b0fde3b8.a17ea",
+ "f2c0c6e.cf39138",
+ "281eb291.a9a1e6",
+ "fe4625e.c7038d8",
+ "af77ded3.a07b1",
+ "f2060323.e44fc8"
]
]
},
{
- "id": "eb78e1a4.f6c888",
+ "id": "4e7725d2.f582b4",
"type": "execute",
"name": "execute",
"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",
"comments": "",
"outputs": 1,
- "x": 1428,
- "y": 1017,
- "z": "d8656b08.07aab8",
+ "x": 1433.5,
+ "y": 1034.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "9c6cd27.ce7a0b",
+ "id": "e002d5f0.653908",
"type": "save",
"name": "save logical-link details to AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 1517,
- "y": 1157,
- "z": "d8656b08.07aab8",
+ "x": 1522.5,
+ "y": 1174.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "4bf140e7.df7828",
+ "id": "6a2abc7e.072b44",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2304,
- "y": 631,
- "z": "d8656b08.07aab8",
+ "x": 2309.5,
+ "y": 648.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "dd7793ee.4f994"
+ "99d1c3f3.3da028"
]
]
},
{
- "id": "d2a50717.2a1d9",
+ "id": "c1e1de7a.899c9",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 2291,
- "y": 710,
- "z": "d8656b08.07aab8",
+ "x": 2296.5,
+ "y": 727.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "765312cb.e91374"
+ "98775e23.b3ef58"
]
]
},
{
- "id": "dd7793ee.4f994",
+ "id": "99d1c3f3.3da028",
"type": "set",
"name": "set network-interface-type as NNI",
"xml": "<set>\n<parameter name='network-interface-type' value='NNI' />\n",
"comments": "",
- "x": 2545,
- "y": 630,
- "z": "d8656b08.07aab8",
+ "x": 2550.5,
+ "y": 647.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "765312cb.e91374",
+ "id": "98775e23.b3ef58",
"type": "set",
"name": "set network-interface-type as UNI",
"xml": "<set>\n<parameter name='network-interface-type' value='UNI' />\n",
"comments": "",
- "x": 2548,
- "y": 708,
- "z": "d8656b08.07aab8",
+ "x": 2553.5,
+ "y": 725.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "8e2b2ac1.d11b2",
+ "id": "32cd571a.6766f",
"type": "set",
"name": "set speed-value as null",
"xml": "<set>\n<parameter name='speed-value' value='' />\n<parameter name='available-capacity' value='' />\n<parameter name='network-interface-type' value='' />\n",
"comments": "",
- "x": 1874,
- "y": 523,
- "z": "d8656b08.07aab8",
+ "x": 1879.5,
+ "y": 540.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "8d15fb9d.87f2c8",
+ "id": "b0fde3b8.a17ea",
"type": "set",
"name": "set link-parameters",
"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",
"comments": "",
- "x": 1489,
- "y": 1066,
- "z": "d8656b08.07aab8",
+ "x": 1494.5,
+ "y": 1083.566665649414,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "df343460.1e46a",
+ "id": "f2c0c6e.cf39138",
"type": "save",
"name": "save logical-link relationship to p-interface",
"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`\" /> ",
"comments": "",
"outputs": 1,
- "x": 1500,
- "y": 1528,
- "z": "d8656b08.07aab8",
+ "x": 1505.5,
+ "y": 1545.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "6bb4981.68f2ee8",
+ "id": "79c2bf41.e84278",
"type": "save",
"name": "save pnf & p-interface in DB",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1788,
- "y": 998,
- "z": "d8656b08.07aab8",
+ "x": 1793.5,
+ "y": 1015.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "d885100b.8f343",
+ "id": "281eb291.a9a1e6",
"type": "get-resource",
"name": "get source pnf-name and interface-name UUID from DB",
"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",
"comments": "",
"outputs": 1,
- "x": 1613,
- "y": 1308,
- "z": "d8656b08.07aab8",
+ "x": 1618.5,
+ "y": 1325.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "4c55d475.77aecc"
+ "20ab3da2.39562a"
]
]
},
{
- "id": "3c142cb3.61690c",
+ "id": "fe4625e.c7038d8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"print direct name\"/>\n<parameter name=\"field2\" value=\"`$pnfname1`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1468,
- "y": 1366,
- "z": "d8656b08.07aab8",
+ "x": 1473.5,
+ "y": 1383.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "4c55d475.77aecc",
+ "id": "20ab3da2.39562a",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1931,
- "y": 1312,
- "z": "d8656b08.07aab8",
+ "x": 1936.5,
+ "y": 1329.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "2acd3a80.9f5afe"
+ "22cab29c.5a4c96"
]
]
},
{
- "id": "2acd3a80.9f5afe",
+ "id": "22cab29c.5a4c96",
"type": "set",
"name": "set",
"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",
"comments": "",
- "x": 2085,
- "y": 1304,
- "z": "d8656b08.07aab8",
+ "x": 2090.5,
+ "y": 1321.566665649414,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "14cce7fe.30486",
+ "id": "af77ded3.a07b1",
"type": "get-resource",
"name": "get destination pnf-name and interface-name UUID from DB",
"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",
"comments": "",
"outputs": 1,
- "x": 1584,
- "y": 1443,
- "z": "d8656b08.07aab8",
+ "x": 1589.5,
+ "y": 1460.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "2b2056ba.68c06a"
+ "de812346.e33968"
]
]
},
{
- "id": "2b2056ba.68c06a",
+ "id": "de812346.e33968",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1917,
- "y": 1436,
- "z": "d8656b08.07aab8",
+ "x": 1922.5,
+ "y": 1453.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "190b0926.27e49f"
+ "7c98abe2.520c94"
]
]
},
{
- "id": "190b0926.27e49f",
+ "id": "7c98abe2.520c94",
"type": "set",
"name": "set",
"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",
"comments": "",
- "x": 2077,
- "y": 1438,
- "z": "d8656b08.07aab8",
+ "x": 2082.5,
+ "y": 1455.566665649414,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "4284a26f.1ce334",
+ "id": "f2060323.e44fc8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 1459,
- "y": 1109,
- "z": "d8656b08.07aab8",
+ "x": 1464.5,
+ "y": 1126.566665649414,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "9a96883c.2c0c6",
+ "id": "869684c2.e7fdb",
"type": "execute",
"name": "split node-id",
"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",
"comments": "",
"outputs": 1,
- "x": 1627,
- "y": 370,
- "z": "d8656b08.07aab8",
+ "x": 1632.5,
+ "y": 387.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "76be62e9.bf594c",
+ "id": "e310391d.26926",
"type": "execute",
"name": "execute",
"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",
"comments": "",
"outputs": 1,
- "x": 1626,
- "y": 429,
- "z": "d8656b08.07aab8",
+ "x": 1631.5,
+ "y": 446.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "c6fee13e.a22228",
- "4241c0e7.e68e5"
+ "e92a74f4.54bde",
+ "3cb543e1.cd89e4"
]
]
},
{
- "id": "b707b093.cd8c68",
+ "id": "3ae8595f.f2c786",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1941,
- "y": 444,
- "z": "d8656b08.07aab8",
+ "x": 1946.5,
+ "y": 461.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "bfdcc473.e8754"
+ "e714cae6.771e5"
]
]
},
{
- "id": "bfdcc473.e8754",
+ "id": "e714cae6.771e5",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='clli' value='`$cllires.supporting-node[0].node-ref`' />\n",
"comments": "",
- "x": 2123,
- "y": 439,
- "z": "d8656b08.07aab8",
+ "x": 2128.5,
+ "y": 456.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": []
},
{
- "id": "4241c0e7.e68e5",
+ "id": "3cb543e1.cd89e4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1804,
- "y": 376,
- "z": "d8656b08.07aab8",
+ "x": 1809.5,
+ "y": 393.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "8f6ab8.a5f3cd48"
+ "db88dbe6.1f184"
]
]
},
{
- "id": "c6fee13e.a22228",
+ "id": "e92a74f4.54bde",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1770,
- "y": 445,
- "z": "d8656b08.07aab8",
+ "x": 1775.5,
+ "y": 462.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[
- "b707b093.cd8c68"
+ "3ae8595f.f2c786"
]
]
},
{
- "id": "8f6ab8.a5f3cd48",
+ "id": "db88dbe6.1f184",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-delete.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Getting clli failed\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1945,
- "y": 370,
- "z": "d8656b08.07aab8",
+ "x": 1950.5,
+ "y": 387.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "9bf5664b.07737",
+ "id": "6ab14ba2.b06b3c",
"type": "save",
"name": "save",
"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`' />",
"comments": "",
"outputs": 1,
- "x": 1803.5,
- "y": 886,
- "z": "d8656b08.07aab8",
+ "x": 1809,
+ "y": 903.5666656494141,
+ "z": "8859ea1e.d24268",
"wires": [
[]
]
},
{
- "id": "1587342a.1379dc",
+ "id": "81e5bdae.f433c8",
"type": "set",
"name": "set controller_id",
"xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`\" />\n\n\n\n",
"comments": "",
- "x": 860,
- "y": 218,
- "z": "d8656b08.07aab8",
+ "x": 865.5,
+ "y": 235.56666564941406,
+ "z": "8859ea1e.d24268",
"wires": []
}
]
\ 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 a370575d..a4076e51 100644 --- 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`' />
<parameter name='port-description' value='`$tp.tp-id`' />
</save>
- <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>
+ <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>
</for>
</block>
</outcome>
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 6cf5663f..a4f65e72 100644 --- 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 @@ [
{
- "id": "168f1b9b.e0d8a4",
+ "id": "b2c9d122.8079d",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 290,
- "y": 256.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 279.566650390625,
+ "y": 287,
+ "z": "4d560a72.e4927c",
"wires": [
[
- "69efd249.69fbdc"
+ "b624e48.81e8398"
]
]
},
{
- "id": "69efd249.69fbdc",
+ "id": "b624e48.81e8398",
"type": "service-logic",
"name": "optical-service ${project.version}",
"module": "optical-service",
@@ -22,235 +22,235 @@ "comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>",
"outputs": 1,
- "x": 477,
- "y": 205.66665649414062,
- "z": "5b091ac8.c4f784",
+ "x": 466.566650390625,
+ "y": 236,
+ "z": "4d560a72.e4927c",
"wires": [
[
- "7c805408.44c49c"
+ "e75c0d8a.68d908"
]
]
},
{
- "id": "7c805408.44c49c",
+ "id": "e75c0d8a.68d908",
"type": "method",
"name": "method",
"xml": "<method rpc='aai-delete-service-handling' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 331,
- "y": 379.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 320.566650390625,
+ "y": 410,
+ "z": "4d560a72.e4927c",
"wires": [
[
- "9d8283a.657188"
+ "730df27.f0e4c0c"
]
]
},
{
- "id": "9d8283a.657188",
+ "id": "730df27.f0e4c0c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 504,
- "y": 378.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 493.566650390625,
+ "y": 409,
+ "z": "4d560a72.e4927c",
"wires": [
[
- "f165a108.8a699",
- "940496d9.dec278",
- "32c002b0.0f4fce",
- "2caf6515.aa94aa",
- "a8c5a8ab.1bde18",
- "a1d8c39f.8281b"
+ "6723ac25.55f13c",
+ "eb2abe2d.21c0e8",
+ "914875aa.50ff98",
+ "7a255a1a.b26164",
+ "8dbb40fc.b81ee",
+ "c3a4108f.675268"
]
]
},
{
- "id": "f165a108.8a699",
+ "id": "6723ac25.55f13c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n",
"comments": "",
"outputs": 1,
- "x": 735,
- "y": 265.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 724.566650390625,
+ "y": 296,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "940496d9.dec278",
+ "id": "eb2abe2d.21c0e8",
"type": "get-resource",
"name": "Get service from AAI",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n service-subscription.service-type = $output.service-type AND\n service-instance.service-instance-id = $output.service-instance-id' \npfx='aai.service' local-only='false'>\n\n",
"comments": "",
"outputs": 1,
- "x": 754,
- "y": 381.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 743.566650390625,
+ "y": 412,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "32c002b0.0f4fce",
+ "id": "914875aa.50ff98",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$aai.service.orchestration-status`\"/>\n<parameter name=\"field3\" value=\"`$aai.service.relationship-list.relationship_length`\"/>\n\n\n",
"comments": "",
"outputs": 1,
- "x": 764,
- "y": 447.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 753.566650390625,
+ "y": 478,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "2caf6515.aa94aa",
+ "id": "7a255a1a.b26164",
"type": "for",
"name": "for",
"xml": "<for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 737,
- "y": 510.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 726.566650390625,
+ "y": 541,
+ "z": "4d560a72.e4927c",
"wires": [
[
- "c68f711c.1667a"
+ "d1115849.8412c"
]
]
},
{
- "id": "1e030001.bace",
+ "id": "9d29a06.61df4e",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />\n<parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />\n\n",
"comments": "",
- "x": 1147,
- "y": 197.66665649414062,
- "z": "5b091ac8.c4f784",
+ "x": 1136.566650390625,
+ "y": 228,
+ "z": "4d560a72.e4927c",
"wires": []
},
{
- "id": "e3a487a2.2e5338",
+ "id": "99771c42.d3d4f",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$pnf-name`\"/>\n<parameter name=\"field3\" value=\"`$pinterface-name`\"/>\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1170,
- "y": 266.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 1159.566650390625,
+ "y": 297,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "a8c5a8ab.1bde18",
+ "id": "8dbb40fc.b81ee",
"type": "delete",
"name": "delete service instance AAI",
"xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",
"comments": "",
"outputs": 1,
- "x": 757,
- "y": 586.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 746.566650390625,
+ "y": 617,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "c68f711c.1667a",
+ "id": "d1115849.8412c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 921,
- "y": 514.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 910.566650390625,
+ "y": 545,
+ "z": "4d560a72.e4927c",
"wires": [
[
- "1e030001.bace",
- "e3a487a2.2e5338",
- "2c623e61.ef3c52",
- "46559965.50bc28",
- "c493aa8c.c04b68",
- "d87c55e6.d344b8"
+ "9d29a06.61df4e",
+ "99771c42.d3d4f",
+ "d7dc2f90.81174",
+ "1e0cbdbd.3ee7f2",
+ "d3321d96.966928",
+ "d37a6f28.98bec"
]
]
},
{
- "id": "a1d8c39f.8281b",
+ "id": "c3a4108f.675268",
"type": "delete",
"name": "delete from db",
"xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n resource=\"SQL\"\n key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",
"comments": "",
"outputs": 1,
- "x": 694,
- "y": 643.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 683.566650390625,
+ "y": 674,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "c493aa8c.c04b68",
+ "id": "d3321d96.966928",
"type": "get-resource",
"name": "get p-interface total capacity",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key='pnf.pnf-name = $pnf-name AND\n p-interface.interface-name = $pinterface-name ' \npfx='p.in.details' local-only='false'>\n\n",
"comments": "",
"outputs": 1,
- "x": 1266.8887939453125,
- "y": 322.77777099609375,
- "z": "5b091ac8.c4f784",
+ "x": 1256.4554443359375,
+ "y": 353.1111145019531,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "d87c55e6.d344b8",
+ "id": "d37a6f28.98bec",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='new-rate' value='`$p.in.details.speed-value`' />\n",
"comments": "",
- "x": 1207.111083984375,
- "y": 413,
- "z": "5b091ac8.c4f784",
+ "x": 1196.677734375,
+ "y": 443.3333435058594,
+ "z": "4d560a72.e4927c",
"wires": []
},
{
- "id": "2c623e61.ef3c52",
+ "id": "d7dc2f90.81174",
"type": "update",
"name": "update p-interface capacity AAI",
"xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\n key='pnf.pnf-name = $pnf-name AND\n p-interface.interface-name = $pinterface-name '\n local-only='false'>\n<parameter name='available-capacity' value='`$new-rate`' />\n\n\n\n\n\n\n\n\n\n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n",
"comments": "",
"outputs": 1,
- "x": 1174,
- "y": 518.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 1163.566650390625,
+ "y": 549,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
},
{
- "id": "46559965.50bc28",
+ "id": "1e0cbdbd.3ee7f2",
"type": "save",
"name": "update pinterface rate DB",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '\nforce='true' pfx='save-result'>",
"comments": "",
"outputs": 1,
- "x": 1165,
- "y": 586.6666564941406,
- "z": "5b091ac8.c4f784",
+ "x": 1154.566650390625,
+ "y": 617,
+ "z": "4d560a72.e4927c",
"wires": [
[]
]
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 34039b4e..b99102d2 100644 --- 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 @@ [
{
- "id": "27072996.28603e",
+ "id": "ed855935.68b9c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 184,
- "y": 103,
- "z": "7d0d9c37.54e5a4",
+ "x": 105.5,
+ "y": 109,
+ "z": "7dd93eb8.cfce58",
"wires": [
[
- "6ffe569c.fa109"
+ "3c249c15.d445ac"
]
]
},
{
- "id": "cc951b5b.220708",
+ "id": "aeb9ff8.19b168",
"type": "method",
"name": "method",
"xml": "<method rpc='optical-service-create-sync-success' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 378,
- "y": 75,
- "z": "7d0d9c37.54e5a4",
+ "x": 299.5,
+ "y": 81,
+ "z": "7dd93eb8.cfce58",
"wires": [
[
- "532eb08a.251b5"
+ "2bc24e2c.b2707a"
]
]
},
{
- "id": "6ffe569c.fa109",
+ "id": "3c249c15.d445ac",
"type": "service-logic",
"name": "optical-service ${project.version}",
"module": "optical-service",
@@ -38,285 +38,173 @@ "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": 219.5,
- "y": 226,
- "z": "7d0d9c37.54e5a4",
+ "x": 141,
+ "y": 232,
+ "z": "7dd93eb8.cfce58",
"wires": [
[
- "cc951b5b.220708"
+ "aeb9ff8.19b168"
]
]
},
{
- "id": "532eb08a.251b5",
+ "id": "2bc24e2c.b2707a",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 481,
- "y": 139,
- "z": "7d0d9c37.54e5a4",
+ "x": 402.5,
+ "y": 145,
+ "z": "7dd93eb8.cfce58",
"wires": [
[
- "59831fea.3da9b8",
- "de3d717d.5418b8",
- "32dae8f5.5da2a",
- "8a15eff0.fb43c8",
- "2407f854.80a4a",
- "4b9498a0.6b56d8",
- "38b45c59.81b3bc",
- "7c78c7d.3f8aeb8",
- "4b5d7c6c.dfedd4"
+ "45c29ba0.1a8f6c",
+ "8ae2e619.562c8",
+ "f8f48edd.64e44",
+ "4cef2908.13e6b8",
+ "b6ddb6e7.407d88",
+ "861e288.ff5a6d8",
+ "d66dfe6f.f22d28",
+ "3cba8d47.890d8a",
+ "9679e92f.973568",
+ "4a3b5ff.ccb33a"
]
]
},
{
- "id": "32dae8f5.5da2a",
+ "id": "f8f48edd.64e44",
"type": "save",
"name": "update rate in aend in DB",
"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",
"comments": "",
"outputs": 1,
- "x": 882,
- "y": 183,
- "z": "7d0d9c37.54e5a4",
+ "x": 803.5,
+ "y": 189,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "2407f854.80a4a",
+ "id": "b6ddb6e7.407d88",
"type": "update",
"name": "update p-interface a-End in AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 806,
- "y": 313,
- "z": "7d0d9c37.54e5a4",
+ "x": 727.5,
+ "y": 319,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "8a15eff0.fb43c8",
+ "id": "4cef2908.13e6b8",
"type": "save",
"name": "update rate in azend DB",
"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",
"comments": "",
"outputs": 1,
- "x": 820,
- "y": 257,
- "z": "7d0d9c37.54e5a4",
+ "x": 741.5,
+ "y": 263,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "4b9498a0.6b56d8",
+ "id": "861e288.ff5a6d8",
"type": "update",
"name": "update p-interface z-End in AAI",
"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",
"comments": "",
"outputs": 1,
- "x": 802,
- "y": 385,
- "z": "7d0d9c37.54e5a4",
+ "x": 723.5,
+ "y": 391,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "59831fea.3da9b8",
+ "id": "45c29ba0.1a8f6c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside sync success\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 641,
- "y": 86,
- "z": "7d0d9c37.54e5a4",
+ "x": 562.5,
+ "y": 92,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "de3d717d.5418b8",
+ "id": "8ae2e619.562c8",
"type": "set",
"name": "set available rate as 0",
"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",
"comments": "",
- "x": 753,
- "y": 136,
- "z": "7d0d9c37.54e5a4",
+ "x": 674.5,
+ "y": 142,
+ "z": "7dd93eb8.cfce58",
"wires": []
},
{
- "id": "8efcdbce.63cc68",
+ "id": "9679e92f.973568",
"type": "save",
"name": "save Service Request Details in DB",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , '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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1245,
- "y": 339,
- "z": "7d0d9c37.54e5a4",
+ "x": 667.5,
+ "y": 467,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "efcf557d.c3a5f8",
+ "id": "4a3b5ff.ccb33a",
"type": "save",
"name": "save service-instance details in AAI",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1255,
- "y": 431,
- "z": "7d0d9c37.54e5a4",
+ "x": 636.5,
+ "y": 535,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "38b45c59.81b3bc",
+ "id": "d66dfe6f.f22d28",
"type": "save",
"name": "save service-instance relation with p-interface",
"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 ",
"comments": "",
"outputs": 1,
- "x": 700,
- "y": 602,
- "z": "7d0d9c37.54e5a4",
+ "x": 621.5,
+ "y": 608,
+ "z": "7dd93eb8.cfce58",
"wires": [
[]
]
},
{
- "id": "7c78c7d.3f8aeb8",
- "type": "returnSuccess",
- "name": "return success",
- "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",
+ "id": "3cba8d47.890d8a",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='final-response-code' value='200' />\n",
"comments": "",
- "x": 526,
- "y": 670,
- "z": "7d0d9c37.54e5a4",
+ "x": 469.566650390625,
+ "y": 703.566650390625,
+ "z": "7dd93eb8.cfce58",
"wires": []
- },
- {
- "id": "4b5d7c6c.dfedd4",
- "type": "switchNode",
- "name": "switch domain-type",
- "xml": "<switch test='`$optical-service-create-input.payload.domain-type`'>\n \n",
- "comments": "",
- "outputs": 1,
- "x": 705,
- "y": 477,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- [
- "d809de29.7d03f8",
- "c1db711f.fdedc"
- ]
- ]
- },
- {
- "id": "d809de29.7d03f8",
- "type": "outcome",
- "name": "MSA",
- "xml": "<outcome value='MSA'>\n",
- "comments": "",
- "outputs": 1,
- "x": 878,
- "y": 442,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- [
- "4f2bcf28.f836e8"
- ]
- ]
- },
- {
- "id": "c1db711f.fdedc",
- "type": "outcome",
- "name": "TAPI",
- "xml": "<outcome value='TAPI'>\n",
- "comments": "",
- "outputs": 1,
- "x": 875,
- "y": 518,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- [
- "1de8f6d7.6e55d9"
- ]
- ]
- },
- {
- "id": "4f2bcf28.f836e8",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1001,
- "y": 437,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- [
- "8efcdbce.63cc68",
- "efcf557d.c3a5f8"
- ]
- ]
- },
- {
- "id": "1de8f6d7.6e55d9",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1008,
- "y": 548,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- [
- "35944f6f.0c2038",
- "a30d1744.eb9978"
- ]
- ]
- },
- {
- "id": "35944f6f.0c2038",
- "type": "save",
- "name": "save Service Request Details in DB",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATED' , $optical-service-create-input.payload.service-rate , $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url );\">\n",
- "comments": "",
- "outputs": 1,
- "x": 1243,
- "y": 514,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- []
- ]
- },
- {
- "id": "a30d1744.eb9978",
- "type": "save",
- "name": "save service-instance details in AAI",
- "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",
- "comments": "",
- "outputs": 1,
- "x": 1245,
- "y": 592,
- "z": "7d0d9c37.54e5a4",
- "wires": [
- []
- ]
}
]
\ 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 3d5395ed..6edd77f8 100644 --- 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 @@ [
{
- "id": "19b0a312.c6518d",
+ "id": "b74a66d5.9bb398",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 304,
- "y": 94,
- "z": "6aec8519.596ebc",
+ "x": 295.5000305175781,
+ "y": 78.99999237060547,
+ "z": "be119e26.f34f9",
"wires": [
[
- "81c1d0fa.bcc35"
+ "f760250f.2146"
]
]
},
{
- "id": "e56e4f2c.7f32c",
+ "id": "3de2d7a.f5149a8",
"type": "method",
"name": "method",
"xml": "<method rpc='optical-service-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 303,
- "y": 169,
- "z": "6aec8519.596ebc",
+ "x": 294.5000305175781,
+ "y": 153.99999237060547,
+ "z": "be119e26.f34f9",
"wires": [
[
- "8a27eddd.8659"
+ "a5ce55fe.28ddd"
]
]
},
{
- "id": "81c1d0fa.bcc35",
+ "id": "f760250f.2146",
"type": "service-logic",
"name": "optical-service ${project.version}",
"module": "optical-service",
@@ -38,1045 +38,1089 @@ "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": 521.5,
- "y": 77,
- "z": "6aec8519.596ebc",
+ "x": 513.0000305175781,
+ "y": 61.99999237060547,
+ "z": "be119e26.f34f9",
"wires": [
[
- "e56e4f2c.7f32c"
+ "3de2d7a.f5149a8"
]
]
},
{
- "id": "8a27eddd.8659",
+ "id": "a5ce55fe.28ddd",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 395,
- "y": 250.00000762939453,
- "z": "6aec8519.596ebc",
+ "x": 386.5000305175781,
+ "y": 235,
+ "z": "be119e26.f34f9",
"wires": [
[
- "cb83a0f.af4db6",
- "c467f6e9.a09748",
- "27820288.3245de",
- "eb2c1d7a.9bc0f",
- "812b7088.1c2e1",
- "f6999b39.46ee28",
- "faed5cf2.7521c",
- "281e3ae5.c7e156",
- "f4302cf0.c694f",
- "9cecb747.fbb8f8",
- "4ff206b2.2a38f8"
+ "2ab36a9f.f1f24e",
+ "77ca198e.37e04",
+ "68ebe78a.dd3bb",
+ "360c94f6.31041c",
+ "c21735a0.60eee",
+ "13d6217f.3fa927",
+ "f6fda81a.c05dd8",
+ "52cfcf48.59a01",
+ "47962899.7c2",
+ "e4b9f8f.0986908",
+ "3bfa7a37.3c6426"
]
]
},
{
- "id": "cb83a0f.af4db6",
+ "id": "2ab36a9f.f1f24e",
"type": "for",
"name": "for",
"xml": "<for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >\n \n \n \n\n\n",
"comments": "",
"outputs": 1,
- "x": 527.9999694824219,
- "y": 214.00000762939453,
- "z": "6aec8519.596ebc",
+ "x": 519.5,
+ "y": 199,
+ "z": "be119e26.f34f9",
"wires": [
[
- "c2bd7688.8306a8",
- "e0cd029e.1c401",
- "c08c879e.8aa398",
- "e5d38e0f.c60ef",
- "e48f435a.a53b1",
- "cd52a71e.a07748",
- "96ffe338.d9102",
- "307d0ddd.cbbf82",
- "6c345065.66388",
- "6b15a6f5.41dc08",
- "708a333d.a59a6c",
- "930d48ba.7db8c8",
- "2bad3261.39a7be"
+ "9060c9c5.3504f8",
+ "5d6c79de.a3b868",
+ "3ef65e63.bc200a",
+ "cbdd335e.bb59e8",
+ "1e17c676.d6b4d2",
+ "e5856afd.4a9d48",
+ "7ddb4531.494d44",
+ "dc75f16e.caefe8",
+ "80d81673.f6bb08",
+ "da2fcf8b.57e868",
+ "84b92024.42fc4",
+ "b3fa14e7.d8f17",
+ "ee48055b.43515",
+ "27cdd875.835958"
]
]
},
{
- "id": "c2bd7688.8306a8",
+ "id": "9060c9c5.3504f8",
"type": "switchNode",
"name": "switch uni1",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 747.9999694824219,
- "y": 112.00001525878906,
- "z": "6aec8519.596ebc",
+ "x": 739.5,
+ "y": 97.00000762939453,
+ "z": "be119e26.f34f9",
"wires": [
[
- "e2160d67.6a214"
+ "b6665015.8f12d"
]
]
},
{
- "id": "930d48ba.7db8c8",
+ "id": "b3fa14e7.d8f17",
"type": "set",
"name": "set parameter",
"xml": "<set>\n<parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />\n",
"comments": "",
- "x": 776.9999694824219,
- "y": 62.00000762939453,
- "z": "6aec8519.596ebc",
+ "x": 768.5,
+ "y": 47,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "e2160d67.6a214",
+ "id": "b6665015.8f12d",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 911.9999694824219,
- "y": 114.00001525878906,
- "z": "6aec8519.596ebc",
+ "x": 903.5,
+ "y": 99.00000762939453,
+ "z": "be119e26.f34f9",
"wires": [
[
- "4c25de7b.31204"
+ "1e006738.7e7a91"
]
]
},
{
- "id": "4c25de7b.31204",
+ "id": "1e006738.7e7a91",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1051.9999694824219,
- "y": 109.00001525878906,
- "z": "6aec8519.596ebc",
+ "x": 1043.5,
+ "y": 94.00000762939453,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "e0cd029e.1c401",
+ "id": "5d6c79de.a3b868",
"type": "switchNode",
"name": "switch uni2",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni2_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 747.9999694824219,
- "y": 193.00000762939453,
- "z": "6aec8519.596ebc",
+ "x": 739.5,
+ "y": 178,
+ "z": "be119e26.f34f9",
"wires": [
[
- "6209659e.61d4fc"
+ "589d96ad.decae8"
]
]
},
{
- "id": "6209659e.61d4fc",
+ "id": "589d96ad.decae8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 906.9999694824219,
- "y": 198.00000762939453,
- "z": "6aec8519.596ebc",
+ "x": 898.5,
+ "y": 183,
+ "z": "be119e26.f34f9",
"wires": [
[
- "6da07ddf.5b16c4"
+ "ec88e67b.e42a78"
]
]
},
{
- "id": "6da07ddf.5b16c4",
+ "id": "ec88e67b.e42a78",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1041.9999694824219,
- "y": 195.00000762939453,
- "z": "6aec8519.596ebc",
+ "x": 1033.5,
+ "y": 180,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "c08c879e.8aa398",
+ "id": "3ef65e63.bc200a",
"type": "switchNode",
"name": "switch uni1 coding_func",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_coding_func'`\">\n",
"comments": "",
"outputs": 1,
- "x": 751.9999694824219,
- "y": 289.9999771118164,
- "z": "6aec8519.596ebc",
+ "x": 743.5,
+ "y": 274.9999694824219,
+ "z": "be119e26.f34f9",
"wires": [
[
- "a209861e.a84c68"
+ "8b10514f.c61f58"
]
]
},
{
- "id": "a209861e.a84c68",
+ "id": "8b10514f.c61f58",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 949.9999694824219,
- "y": 289.9999771118164,
- "z": "6aec8519.596ebc",
+ "x": 941.5,
+ "y": 274.9999694824219,
+ "z": "be119e26.f34f9",
"wires": [
[
- "400f8845.d561c8"
+ "fef26935.ee43c"
]
]
},
{
- "id": "400f8845.d561c8",
+ "id": "fef26935.ee43c",
"type": "set",
"name": "set",
"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",
"comments": "",
- "x": 1086.9999694824219,
- "y": 286.9999771118164,
- "z": "6aec8519.596ebc",
+ "x": 1078.5,
+ "y": 271.9999694824219,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "e5d38e0f.c60ef",
+ "id": "cbdd335e.bb59e8",
"type": "switchNode",
"name": "switch uni",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 720.9999694824219,
- "y": 380.9999465942383,
- "z": "6aec8519.596ebc",
+ "x": 709.5,
+ "y": 329.99993896484375,
+ "z": "be119e26.f34f9",
"wires": [
[
- "43b24bcd.988c54"
+ "a83d6090.08a4a"
]
]
},
{
- "id": "43b24bcd.988c54",
+ "id": "a83d6090.08a4a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 864.9999694824219,
- "y": 383.9999465942383,
- "z": "6aec8519.596ebc",
+ "x": 854.5,
+ "y": 334.99993896484375,
+ "z": "be119e26.f34f9",
"wires": [
[
- "a79c959.2645a68"
+ "eec11b63.1ee83"
]
]
},
{
- "id": "a79c959.2645a68",
+ "id": "eec11b63.1ee83",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1019.9999694824219,
- "y": 381.9999465942383,
- "z": "6aec8519.596ebc",
+ "x": 1012.5,
+ "y": 345.99993896484375,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "e48f435a.a53b1",
+ "id": "1e17c676.d6b4d2",
"type": "switchNode",
"name": "switch enni",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 709.9999694824219,
- "y": 441.9999465942383,
- "z": "6aec8519.596ebc",
+ "x": 703.5,
+ "y": 383.99993896484375,
+ "z": "be119e26.f34f9",
"wires": [
[
- "2e88bf81.cdfcc"
+ "c1d6057a.bfaba"
]
]
},
{
- "id": "2e88bf81.cdfcc",
+ "id": "c1d6057a.bfaba",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 866.9999694824219,
- "y": 449.9999465942383,
- "z": "6aec8519.596ebc",
+ "x": 858.5,
+ "y": 398.99993896484375,
+ "z": "be119e26.f34f9",
"wires": [
[
- "6cecdd4e.699c54"
+ "6c9b34a9.cdab44"
]
]
},
{
- "id": "6cecdd4e.699c54",
+ "id": "6c9b34a9.cdab44",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1028.9999694824219,
- "y": 461.9999465942383,
- "z": "6aec8519.596ebc",
+ "x": 1016.5,
+ "y": 404.99993896484375,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "cd52a71e.a07748",
+ "id": "e5856afd.4a9d48",
"type": "switchNode",
"name": "switch uni coding_func",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_coding_func'`\">\n",
"comments": "",
"outputs": 1,
- "x": 725.9999694824219,
- "y": 498.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 710.5,
+ "y": 423.39996337890625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "423b71c7.c87b8"
+ "180d2bf0.83ffa4"
]
]
},
{
- "id": "423b71c7.c87b8",
+ "id": "180d2bf0.83ffa4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 915.9999694824219,
- "y": 502.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 910.5,
+ "y": 460.39996337890625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "48fc9f8f.e1214"
+ "b518fbe6.6b3d48"
]
]
},
{
- "id": "48fc9f8f.e1214",
+ "id": "b518fbe6.6b3d48",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1055.9999694824219,
- "y": 508.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 1050.5,
+ "y": 466.39996337890625,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "96ffe338.d9102",
+ "id": "7ddb4531.494d44",
"type": "switchNode",
"name": "switch enni1",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 701.9999694824219,
- "y": 556.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 689.5,
+ "y": 471.4000244140625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "b119e02f.85a12"
+ "3f99875.f5fb5f8"
]
]
},
{
- "id": "307d0ddd.cbbf82",
+ "id": "dc75f16e.caefe8",
"type": "switchNode",
"name": "switch enni2",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni2_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 697.9999694824219,
- "y": 623.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 682.5,
+ "y": 535.4000244140625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "6a8649d8.5b4328"
+ "5ff8b6da.c93f"
]
]
},
{
- "id": "b119e02f.85a12",
+ "id": "3f99875.f5fb5f8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 869.9999694824219,
- "y": 559.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 862.5,
+ "y": 498.4000244140625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "78577f48.191f5"
+ "a1dffc1a.4ca8b8"
]
]
},
{
- "id": "6a8649d8.5b4328",
+ "id": "5ff8b6da.c93f",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 860.9999694824219,
- "y": 627.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 847.5,
+ "y": 553.4000244140625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "260a366a.9008da"
+ "1195c2b2.9677fd"
]
]
},
{
- "id": "78577f48.191f5",
+ "id": "a1dffc1a.4ca8b8",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1010.9999694824219,
- "y": 558.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 1004.5,
+ "y": 503.4000244140625,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "260a366a.9008da",
+ "id": "1195c2b2.9677fd",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 994.9999694824219,
- "y": 631.4000015258789,
- "z": "6aec8519.596ebc",
+ "x": 971.5,
+ "y": 548.4000244140625,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "6c345065.66388",
+ "id": "80d81673.f6bb08",
"type": "switchNode",
"name": "switch uni coding_func",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_coding_func'`\">\n",
"comments": "",
"outputs": 1,
- "x": 703.9999694824219,
- "y": 667.8000259399414,
- "z": "6aec8519.596ebc",
+ "x": 695.5,
+ "y": 584.800048828125,
+ "z": "be119e26.f34f9",
"wires": [
[
- "109cf4b6.34d27b"
+ "11aeaa86.32d365"
]
]
},
{
- "id": "109cf4b6.34d27b",
+ "id": "11aeaa86.32d365",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 873.9999694824219,
- "y": 671.8000259399414,
- "z": "6aec8519.596ebc",
+ "x": 872.5,
+ "y": 587.800048828125,
+ "z": "be119e26.f34f9",
"wires": [
[
- "a04925ba.233548"
+ "4ffe3b95.e1db4c"
]
]
},
{
- "id": "a04925ba.233548",
+ "id": "4ffe3b95.e1db4c",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 1017.9999694824219,
- "y": 682.8000259399414,
- "z": "6aec8519.596ebc",
+ "x": 1016.5,
+ "y": 588.800048828125,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "c467f6e9.a09748",
+ "id": "77ca198e.37e04",
"type": "get-resource",
"name": "get controller_id from DB",
"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",
"comments": "",
"outputs": 1,
- "x": 687.9999694824219,
- "y": 761.6000137329102,
- "z": "6aec8519.596ebc",
+ "x": 678.5,
+ "y": 779.5999755859375,
+ "z": "be119e26.f34f9",
"wires": [
[
- "ea6ce722.102db8"
+ "8351b374.bb829"
]
]
},
{
- "id": "27820288.3245de",
+ "id": "68ebe78a.dd3bb",
"type": "get-resource",
"name": "get controller_id from DB",
"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",
"comments": "",
"outputs": 1,
- "x": 668,
- "y": 846.6000137329102,
- "z": "6aec8519.596ebc",
+ "x": 659.5000305175781,
+ "y": 831.6000061035156,
+ "z": "be119e26.f34f9",
"wires": [
[
- "2351ae73.eacf92"
+ "b67baa88.7569f8"
]
]
},
{
- "id": "89a07cd5.0252",
+ "id": "2aa1562e.df8772",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='controller1' value=\"`$db.source1.controller-id`\"/>\n",
"comments": "",
- "x": 1012.9999694824219,
- "y": 764.6000137329102,
- "z": "6aec8519.596ebc",
+ "x": 1005.5,
+ "y": 779.5999755859375,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "9eef6461.fbaa98",
+ "id": "723d4991.2456b",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='controller2' value=\"`$db.source2.controller-id`\"/>\n",
"comments": "",
- "x": 1009.9999694824219,
- "y": 853.6000137329102,
- "z": "6aec8519.596ebc",
+ "x": 1001.5,
+ "y": 838.6000061035156,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "4ff206b2.2a38f8",
+ "id": "3bfa7a37.3c6426",
"type": "switchNode",
"name": "controllers-id check",
"xml": "<switch test='`$controller1==$controller2`'>\n",
"comments": "",
"outputs": 1,
- "x": 105.99996948242188,
- "y": 1354.5999755859375,
- "z": "6aec8519.596ebc",
+ "x": 97.5,
+ "y": 1339.599967956543,
+ "z": "be119e26.f34f9",
"wires": [
[
- "6d524179.31442",
- "29c9a077.5048"
+ "8218e216.269b68",
+ "abeeec75.5e0a"
]
]
},
{
- "id": "6d524179.31442",
+ "id": "8218e216.269b68",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 373.89996337890625,
- "y": 1285.89990234375,
- "z": "6aec8519.596ebc",
+ "x": 278.39996337890625,
+ "y": 1278.89990234375,
+ "z": "be119e26.f34f9",
"wires": [
[
- "77e4cb5c.3ea374"
+ "714fe0b3.cbe86"
]
]
},
{
- "id": "7fa6e0ba.8dc59",
+ "id": "28b59567.3572fa",
"type": "call",
"name": "main-create",
"xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 705.9000244140625,
- "y": 1277.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 697.4000549316406,
+ "y": 1262.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "a084b4d3.d2ad68"
+ "f2170d69.16bd1"
]
]
},
{
- "id": "29c9a077.5048",
+ "id": "abeeec75.5e0a",
"type": "outcomeFalse",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 377.89996337890625,
- "y": 1460.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 369.3999938964844,
+ "y": 1445.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "3686da83.318ed6"
+ "9e125ea0.2b4738"
]
]
},
{
- "id": "eb2c1d7a.9bc0f",
+ "id": "360c94f6.31041c",
"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='`$controller1`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",
"comments": "",
"outputs": 1,
- "x": 679.8999633789062,
- "y": 902.9000015258789,
- "z": "6aec8519.596ebc",
+ "x": 671.3999938964844,
+ "y": 887.8999938964844,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "812b7088.1c2e1",
+ "id": "c21735a0.60eee",
"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='`$controller2`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix2\"/>\n",
"comments": "",
"outputs": 1,
- "x": 667.8999938964844,
- "y": 950.9000015258789,
- "z": "6aec8519.596ebc",
+ "x": 659.4000244140625,
+ "y": 935.8999938964844,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "f6999b39.46ee28",
+ "id": "13d6217f.3fa927",
"type": "set",
"name": "set controller-ip",
"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 ",
"comments": "",
- "x": 592.75,
- "y": 998.7499771118164,
- "z": "6aec8519.596ebc",
+ "x": 584.2500305175781,
+ "y": 983.7499694824219,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "3686da83.318ed6",
+ "id": "9e125ea0.2b4738",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 519.566650390625,
- "y": 1458.566650390625,
- "z": "6aec8519.596ebc",
+ "x": 511.0666809082031,
+ "y": 1443.5666427612305,
+ "z": "be119e26.f34f9",
"wires": [
[
- "7f7dd90.ca00828",
- "402e803d.bb4b3",
- "f46024a4.178778",
- "4cfee8aa.5fe5e8",
- "ddc83fd9.94789"
+ "cb4e4d03.2320a8",
+ "aabebe1e.a2a91",
+ "ed06089e.edc54",
+ "ee62cd42.65cd58",
+ "be3eb75a.fcea9"
]
]
},
{
- "id": "7f7dd90.ca00828",
+ "id": "cb4e4d03.2320a8",
"type": "set",
"name": "set",
"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",
"comments": "",
- "x": 690.6499710083008,
- "y": 1577.6500482559204,
- "z": "6aec8519.596ebc",
+ "x": 682.1500015258789,
+ "y": 1562.6500406265259,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "ddc83fd9.94789",
+ "id": "be3eb75a.fcea9",
"type": "call",
"name": "inter-domain DG",
"xml": "<call module='optical-service' rpc='inter-domain-handling' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 682.1499710083008,
- "y": 1692.6500492095947,
- "z": "6aec8519.596ebc",
+ "x": 673.6500015258789,
+ "y": 1677.6500415802002,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "77e4cb5c.3ea374",
+ "id": "714fe0b3.cbe86",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 529.8999633789062,
- "y": 1282.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 521.3999938964844,
+ "y": 1267.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "aa333758.2eb158",
- "c56b33b.5b1d4d",
- "dfbe19a.ac6e1e8",
- "9217e91.3f8cc18",
- "7fa6e0ba.8dc59"
+ "912b18e0.6fcbc8",
+ "ce6f9a2a.d58bc",
+ "545d3a33.e4b434",
+ "9be241b.73fe74",
+ "28b59567.3572fa"
]
]
},
{
- "id": "d28a3ef1.7ab4b",
+ "id": "2a30842b.722684",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$final-response-code`'>\n",
"comments": "",
"outputs": 1,
- "x": 924.9000244140625,
- "y": 1190.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 916.4000549316406,
+ "y": 1175.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "516af1e8.b7429"
+ "13543e22.9a274a"
]
]
},
{
- "id": "516af1e8.b7429",
+ "id": "13543e22.9a274a",
"type": "outcome",
"name": "200",
"xml": "<outcome value='200'>\n",
"comments": "",
"outputs": 1,
- "x": 1062.9000244140625,
- "y": 1183.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 1054.4000549316406,
+ "y": 1168.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "8514f080.cd77"
+ "d10726b7.d3d02"
]
]
},
{
- "id": "9457262f.dafa78",
+ "id": "d44f3957.51ad4",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service Created Successfully' />\n<parameter name='ack-final-indicator' value='Y' />\n",
"comments": "",
- "x": 1362.9000244140625,
- "y": 1226.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 1354.4000549316406,
+ "y": 1211.900016784668,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "8514f080.cd77",
+ "id": "d10726b7.d3d02",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1200.9000244140625,
- "y": 1179.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 1192.4000549316406,
+ "y": 1164.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "9457262f.dafa78",
- "d89f6cb.9d2869",
- "90dcc928.7bcbc8"
+ "d44f3957.51ad4",
+ "16c29993.ab7326",
+ "87bdb7fa.7da8d8"
]
]
},
{
- "id": "6b15a6f5.41dc08",
+ "id": "da2fcf8b.57e868",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 748.8999938964844,
- "y": 152.9000015258789,
- "z": "6aec8519.596ebc",
+ "x": 740.4000244140625,
+ "y": 137.89999389648438,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "708a333d.a59a6c",
+ "id": "84b92024.42fc4",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 743.8999938964844,
- "y": 229.9000015258789,
- "z": "6aec8519.596ebc",
+ "x": 735.4000244140625,
+ "y": 214.89999389648438,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "2bad3261.39a7be",
+ "id": "ee48055b.43515",
"type": "switchNode",
"name": "service-name",
"xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'service-name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 670.5666809082031,
- "y": 722.5666580200195,
- "z": "6aec8519.596ebc",
+ "x": 663.0667114257812,
+ "y": 618.566650390625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "8a2bc3a2.8fb3"
+ "5a17268d.005fe8"
]
]
},
{
- "id": "8a2bc3a2.8fb3",
+ "id": "5a17268d.005fe8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 851.5666809082031,
- "y": 730.5666580200195,
- "z": "6aec8519.596ebc",
+ "x": 840.0667114257812,
+ "y": 634.566650390625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "f0ba54a2.8930a8"
+ "a2725653.88689"
]
]
},
{
- "id": "f0ba54a2.8930a8",
+ "id": "a2725653.88689",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
"comments": "",
- "x": 995.5667419433594,
- "y": 728.5666732788086,
- "z": "6aec8519.596ebc",
+ "x": 974.0667724609375,
+ "y": 636.566650390625,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "ea6ce722.102db8",
+ "id": "8351b374.bb829",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 867.8999938964844,
- "y": 765.9000015258789,
- "z": "6aec8519.596ebc",
+ "x": 860.4000244140625,
+ "y": 785.9000244140625,
+ "z": "be119e26.f34f9",
"wires": [
[
- "89a07cd5.0252"
+ "2aa1562e.df8772"
]
]
},
{
- "id": "2351ae73.eacf92",
+ "id": "b67baa88.7569f8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 866.8999938964844,
- "y": 850.9000015258789,
- "z": "6aec8519.596ebc",
+ "x": 858.4000244140625,
+ "y": 835.8999938964844,
+ "z": "be119e26.f34f9",
"wires": [
[
- "9eef6461.fbaa98"
+ "723d4991.2456b"
]
]
},
{
- "id": "a084b4d3.d2ad68",
+ "id": "f2170d69.16bd1",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 861.8999633789062,
- "y": 1277.9000244140625,
- "z": "6aec8519.596ebc",
+ "x": 853.3999938964844,
+ "y": 1262.900016784668,
+ "z": "be119e26.f34f9",
"wires": [
[
- "d28a3ef1.7ab4b"
+ "2a30842b.722684"
]
]
},
{
- "id": "faed5cf2.7521c",
+ "id": "f6fda81a.c05dd8",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-request-id\"/> ",
"comments": "",
"outputs": 1,
- "x": 364,
- "y": 962,
- "z": "6aec8519.596ebc",
+ "x": 355.5000305175781,
+ "y": 946.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "281e3ae5.c7e156",
+ "id": "52cfcf48.59a01",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-svc-instance-id\"/> ",
"comments": "",
"outputs": 1,
- "x": 393,
- "y": 876,
- "z": "6aec8519.596ebc",
+ "x": 384.5000305175781,
+ "y": 860.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "f4302cf0.c694f",
+ "id": "47962899.7c2",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-svc-instance-id\"/> ",
"comments": "",
"outputs": 1,
- "x": 327,
- "y": 1037,
- "z": "6aec8519.596ebc",
+ "x": 318.5000305175781,
+ "y": 1021.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "9cecb747.fbb8f8",
+ "id": "e4b9f8f.0986908",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-request-id\"/> ",
"comments": "",
"outputs": 1,
- "x": 298,
- "y": 1114,
- "z": "6aec8519.596ebc",
+ "x": 289.5000305175781,
+ "y": 1098.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "d89f6cb.9d2869",
+ "id": "16c29993.ab7326",
"type": "call",
"name": "create-service-relationship",
"xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1459,
- "y": 1145,
- "z": "6aec8519.596ebc",
+ "x": 1450.5000305175781,
+ "y": 1129.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "c56b33b.5b1d4d",
+ "id": "ce6f9a2a.d58bc",
"type": "set",
"name": "set acc ser",
"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",
"comments": "",
- "x": 699,
- "y": 1080,
- "z": "6aec8519.596ebc",
+ "x": 690.5000305175781,
+ "y": 1064.9999923706055,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "aa333758.2eb158",
+ "id": "912b18e0.6fcbc8",
"type": "save",
"name": "save access service db",
"xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, 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 );\"> ",
"comments": "",
"outputs": 1,
- "x": 763,
- "y": 1170,
- "z": "6aec8519.596ebc",
+ "x": 754.5000305175781,
+ "y": 1154.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "f46024a4.178778",
+ "id": "ed06089e.edc54",
"type": "set",
"name": "set acc ser",
"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",
"comments": "",
- "x": 699,
- "y": 1395,
- "z": "6aec8519.596ebc",
+ "x": 690.5000305175781,
+ "y": 1379.9999923706055,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "402e803d.bb4b3",
+ "id": "aabebe1e.a2a91",
"type": "save",
"name": "save access service db",
"xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, 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 );\"> ",
"comments": "",
"outputs": 1,
- "x": 761,
- "y": 1522,
- "z": "6aec8519.596ebc",
+ "x": 752.5000305175781,
+ "y": 1506.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "4cfee8aa.5fe5e8",
+ "id": "ee62cd42.65cd58",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 706.0999755859375,
- "y": 1458.0999755859375,
- "z": "6aec8519.596ebc",
+ "x": 697.6000061035156,
+ "y": 1443.099967956543,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "dfbe19a.ac6e1e8",
+ "id": "545d3a33.e4b434",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 705.0999755859375,
- "y": 1125.0999755859375,
- "z": "6aec8519.596ebc",
+ "x": 696.6000061035156,
+ "y": 1110.099967956543,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
},
{
- "id": "9217e91.3f8cc18",
+ "id": "9be241b.73fe74",
"type": "set",
"name": "set",
"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`' />",
"comments": "",
- "x": 535,
- "y": 1071,
- "z": "6aec8519.596ebc",
+ "x": 526.5000305175781,
+ "y": 1055.9999923706055,
+ "z": "be119e26.f34f9",
"wires": []
},
{
- "id": "90dcc928.7bcbc8",
+ "id": "87bdb7fa.7da8d8",
"type": "save",
"name": "update acc service db",
"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'>",
"comments": "",
"outputs": 1,
- "x": 1385,
- "y": 1070,
- "z": "6aec8519.596ebc",
+ "x": 1376.5000305175781,
+ "y": 1054.9999923706055,
+ "z": "be119e26.f34f9",
"wires": [
[]
]
+ },
+ {
+ "id": "27cdd875.835958",
+ "type": "switchNode",
+ "name": "protocol",
+ "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_client_proto'`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 646.566650390625,
+ "y": 661.566650390625,
+ "z": "be119e26.f34f9",
+ "wires": [
+ [
+ "b3f1926e.bdae08"
+ ]
+ ]
+ },
+ {
+ "id": "b3f1926e.bdae08",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 770.566650390625,
+ "y": 672.566650390625,
+ "z": "be119e26.f34f9",
+ "wires": [
+ [
+ "487a398d.1fdfb"
+ ]
+ ]
+ },
+ {
+ "id": "487a398d.1fdfb",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-protocol' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+ "comments": "",
+ "x": 896.566650390625,
+ "y": 685.566650390625,
+ "z": "be119e26.f34f9",
+ "wires": []
}
]
\ 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 fd253262..6bd4dad9 100644 --- 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 @@ [
{
- "id": "3ea35ee.ad0f6a2",
+ "id": "2b9a1424.f485ec",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 116,
- "y": 81,
- "z": "c2959a97.94a74",
+ "x": 95,
+ "y": 83,
+ "z": "d3028d55.5844c",
"wires": [
[
- "11cee705.bf2a31"
+ "aa23222f.bc76d8"
]
]
},
{
- "id": "d850b04.b54af5",
+ "id": "a2e5095f.de7898",
"type": "method",
"name": "method",
"xml": "<method rpc='service-create-msa' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 174,
- "y": 206,
- "z": "c2959a97.94a74",
+ "x": 123,
+ "y": 175,
+ "z": "d3028d55.5844c",
"wires": [
[
- "488da689.489b18"
+ "d671b0a6.2b1d"
]
]
},
{
- "id": "11cee705.bf2a31",
+ "id": "aa23222f.bc76d8",
"type": "service-logic",
"name": "optical-service ${project.version}",
"module": "optical-service",
@@ -38,408 +38,480 @@ "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": 360.5,
- "y": 84,
- "z": "c2959a97.94a74",
+ "x": 309.5,
+ "y": 53,
+ "z": "d3028d55.5844c",
"wires": [
[
- "d850b04.b54af5"
+ "a2e5095f.de7898"
]
]
},
{
- "id": "8d61ef5.90ff99",
+ "id": "374ef365.4365d4",
"type": "execute",
"name": "Call MSA Controller",
"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\"/> ",
"comments": "",
"outputs": 1,
- "x": 809,
- "y": 533,
- "z": "c2959a97.94a74",
+ "x": 758,
+ "y": 502,
+ "z": "d3028d55.5844c",
"wires": [
[
- "ccc1ac83.fb8f3",
- "2f9f6425.084e84"
+ "e418881c.c81778",
+ "213e5cd0.481964"
]
]
},
{
- "id": "ccc1ac83.fb8f3",
+ "id": "e418881c.c81778",
"type": "outcome",
"name": "Failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1038,
- "y": 508,
- "z": "c2959a97.94a74",
+ "x": 987,
+ "y": 477,
+ "z": "d3028d55.5844c",
"wires": [
[
- "a1397508.3503c8"
+ "4e6aa919.c49248"
]
]
},
{
- "id": "2f9f6425.084e84",
+ "id": "213e5cd0.481964",
"type": "outcome",
"name": "Success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1033,
- "y": 609,
- "z": "c2959a97.94a74",
+ "x": 982,
+ "y": 578,
+ "z": "d3028d55.5844c",
"wires": [
[
- "ef5192a4.4e4b1"
+ "4202eada.c00e9c"
]
]
},
{
- "id": "a1e42279.d92258",
+ "id": "2d4e8e63.345f52",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Successfully sent the request\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1535,
- "y": 641,
- "z": "c2959a97.94a74",
+ "x": 1484,
+ "y": 610,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "5e2abc18.1b66ac",
+ "id": "d3e41e81.36a96",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failure\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1562,
- "y": 467,
- "z": "c2959a97.94a74",
+ "x": 1511,
+ "y": 436,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "488da689.489b18",
+ "id": "d671b0a6.2b1d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 413,
- "y": 198,
- "z": "c2959a97.94a74",
+ "x": 362,
+ "y": 167,
+ "z": "d3028d55.5844c",
"wires": [
[
- "8d61ef5.90ff99",
- "a3b8c6ad.cc7648",
- "8ad2ed4f.9eaef8",
- "35d2d9b2.cbceee",
- "5929fa76.a7464c",
- "b065abfd.9e90f8"
+ "374ef365.4365d4",
+ "e582696b.bfd64",
+ "3aa20ba3.1be9c4",
+ "c57047a.90c3ab8",
+ "e0320b48.98ab8",
+ "1d32325.a1daece",
+ "185b18b9.1e9acf"
]
]
},
{
- "id": "ef5192a4.4e4b1",
+ "id": "4202eada.c00e9c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1281,
- "y": 611,
- "z": "c2959a97.94a74",
+ "x": 1230,
+ "y": 580,
+ "z": "d3028d55.5844c",
"wires": [
[
- "a1e42279.d92258",
- "893ecee0.5f1a6"
+ "2d4e8e63.345f52",
+ "3008cbc8.fcfd94"
]
]
},
{
- "id": "629b93c5.786c2c",
+ "id": "1364e09.3c15d1f",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Could not connect to Controller' />\n",
"comments": "",
- "x": 1548,
- "y": 559,
- "z": "c2959a97.94a74",
+ "x": 1497,
+ "y": 528,
+ "z": "d3028d55.5844c",
"wires": []
},
{
- "id": "a1397508.3503c8",
+ "id": "4e6aa919.c49248",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1272,
- "y": 509,
- "z": "c2959a97.94a74",
+ "x": 1221,
+ "y": 478,
+ "z": "d3028d55.5844c",
"wires": [
[
- "5e2abc18.1b66ac",
- "629b93c5.786c2c"
+ "d3e41e81.36a96",
+ "1364e09.3c15d1f"
]
]
},
{
- "id": "893ecee0.5f1a6",
+ "id": "3008cbc8.fcfd94",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$service-create-response.configuration-response-common.response-code`'>\n",
"comments": "",
"outputs": 1,
- "x": 1530,
- "y": 723,
- "z": "c2959a97.94a74",
+ "x": 1479,
+ "y": 692,
+ "z": "d3028d55.5844c",
"wires": [
[
- "5758035.e2b987c",
- "ec22434b.def97"
+ "7837dd73.2a710c",
+ "767b4872.12c6d"
]
]
},
{
- "id": "5758035.e2b987c",
+ "id": "7837dd73.2a710c",
"type": "outcome",
"name": "outcome",
"xml": "<outcome value='200'>\n",
"comments": "",
"outputs": 1,
- "x": 1698,
- "y": 724,
- "z": "c2959a97.94a74",
+ "x": 1647,
+ "y": 693,
+ "z": "d3028d55.5844c",
"wires": [
[
- "211ff3f4.659f1c"
+ "f8b00189.009718"
]
]
},
{
- "id": "ec22434b.def97",
+ "id": "767b4872.12c6d",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1706,
- "y": 790,
- "z": "c2959a97.94a74",
+ "x": 1655,
+ "y": 759,
+ "z": "d3028d55.5844c",
"wires": [
[
- "c3dd586d.2d9ff"
+ "6732375e.1a15a"
]
]
},
{
- "id": "c3dd586d.2d9ff",
+ "id": "6732375e.1a15a",
"type": "returnFailure",
"name": "return failure",
"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",
"comments": "",
- "x": 1885,
- "y": 790,
- "z": "c2959a97.94a74",
+ "x": 1834,
+ "y": 759,
+ "z": "d3028d55.5844c",
"wires": []
},
{
- "id": "211ff3f4.659f1c",
+ "id": "f8b00189.009718",
"type": "call",
"name": "call sync success DG",
"xml": "<call module='optical-service' rpc='optical-service-create-sync-success' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1900,
- "y": 721,
- "z": "c2959a97.94a74",
+ "x": 1849,
+ "y": 690,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "a3b8c6ad.cc7648",
+ "id": "e582696b.bfd64",
"type": "set",
"name": "set parameters",
"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",
"comments": "",
- "x": 831,
- "y": 276,
- "z": "c2959a97.94a74",
+ "x": 770,
+ "y": 169.00001525878906,
+ "z": "d3028d55.5844c",
"wires": []
},
{
- "id": "8ad2ed4f.9eaef8",
+ "id": "3aa20ba3.1be9c4",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/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",
"comments": "",
"outputs": 1,
- "x": 817,
- "y": 223,
- "z": "c2959a97.94a74",
+ "x": 752,
+ "y": 125.00001525878906,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "35d2d9b2.cbceee",
+ "id": "c57047a.90c3ab8",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$optical-service-create-input.payload.service-protocol`'>\n",
"comments": "",
"outputs": 1,
- "x": 919,
- "y": 361,
- "z": "c2959a97.94a74",
+ "x": 868,
+ "y": 330,
+ "z": "d3028d55.5844c",
"wires": [
[
- "377ae9e5.0edff6",
- "6ebfa6a3.e8164"
+ "e640d047.8b9a48",
+ "2e9e0315.971fdc"
]
]
},
{
- "id": "377ae9e5.0edff6",
+ "id": "e640d047.8b9a48",
"type": "outcome",
"name": "Ethernet",
"xml": "<outcome value='Ethernet'>\n",
"comments": "",
"outputs": 1,
- "x": 1096,
- "y": 355,
- "z": "c2959a97.94a74",
+ "x": 1045,
+ "y": 324,
+ "z": "d3028d55.5844c",
"wires": [
[
- "d04153bc.9f4338"
+ "e0966dd6.b1775"
]
]
},
{
- "id": "18dafb4f.277ba5",
+ "id": "98d37fbb.84095",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$optical-service-create-input.payload.coding-func`'>\n",
"comments": "",
"outputs": 1,
- "x": 1460,
- "y": 351,
- "z": "c2959a97.94a74",
+ "x": 1409,
+ "y": 320,
+ "z": "d3028d55.5844c",
"wires": [
[
- "bff9d743.e28a08",
- "80d30a7a.cb97f"
+ "381822b1.80b79e",
+ "800aa6e0.11c5d8"
]
]
},
{
- "id": "d04153bc.9f4338",
+ "id": "e0966dd6.b1775",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1286,
- "y": 353,
- "z": "c2959a97.94a74",
+ "x": 1235,
+ "y": 322,
+ "z": "d3028d55.5844c",
"wires": [
[
- "18dafb4f.277ba5"
+ "98d37fbb.84095"
]
]
},
{
- "id": "6ebfa6a3.e8164",
+ "id": "2e9e0315.971fdc",
"type": "other",
"name": "Do Nothing",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1101,
- "y": 422,
- "z": "c2959a97.94a74",
+ "x": 1050,
+ "y": 391,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "bff9d743.e28a08",
+ "id": "381822b1.80b79e",
"type": "outcome",
"name": "10GBASE-R",
"xml": "<outcome value='10GBASE-R'>\n",
"comments": "",
"outputs": 1,
- "x": 1619,
- "y": 346,
- "z": "c2959a97.94a74",
+ "x": 1568,
+ "y": 315,
+ "z": "d3028d55.5844c",
"wires": [
[
- "1fad8a48.e66316"
+ "efd565dd.38cea"
]
]
},
{
- "id": "80d30a7a.cb97f",
+ "id": "800aa6e0.11c5d8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1612,
- "y": 414,
- "z": "c2959a97.94a74",
+ "x": 1561,
+ "y": 383,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "1fad8a48.e66316",
+ "id": "efd565dd.38cea",
"type": "set",
"name": "set",
"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",
"comments": "",
- "x": 1828,
- "y": 345,
- "z": "c2959a97.94a74",
+ "x": 1777,
+ "y": 314,
+ "z": "d3028d55.5844c",
"wires": []
},
{
- "id": "5929fa76.a7464c",
+ "id": "e0320b48.98ab8",
"type": "execute",
"name": "split node-id z-end",
"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",
"comments": "",
"outputs": 1,
- "x": 834,
- "y": 157,
- "z": "c2959a97.94a74",
+ "x": 775,
+ "y": 75,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
},
{
- "id": "b065abfd.9e90f8",
+ "id": "1d32325.a1daece",
"type": "execute",
"name": "split node-id a-end",
"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",
"comments": "",
"outputs": 1,
- "x": 837,
- "y": 93,
- "z": "c2959a97.94a74",
+ "x": 782,
+ "y": 37,
+ "z": "d3028d55.5844c",
"wires": [
[]
]
+ },
+ {
+ "id": "185b18b9.1e9acf",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test='`$optical-service-create-input.payload.service-rate`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 749.566650390625,
+ "y": 238.56666564941406,
+ "z": "d3028d55.5844c",
+ "wires": [
+ [
+ "fbe62272.e26fb8",
+ "8121433b.1d8c48"
+ ]
+ ]
+ },
+ {
+ "id": "fbe62272.e26fb8",
+ "type": "outcome",
+ "name": "10",
+ "xml": "<outcome value='10'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 946.566650390625,
+ "y": 195.56666564941406,
+ "z": "d3028d55.5844c",
+ "wires": [
+ [
+ "4ca46304.56d004"
+ ]
+ ]
+ },
+ {
+ "id": "8121433b.1d8c48",
+ "type": "outcome",
+ "name": "100",
+ "xml": "<outcome value='100'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 945.7333984375,
+ "y": 271.566650390625,
+ "z": "d3028d55.5844c",
+ "wires": [
+ [
+ "8900f991.ec20e8"
+ ]
+ ]
+ },
+ {
+ "id": "4ca46304.56d004",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='optical-service-create-input.payload.coding-func' value='10GBASE-R' />\n\n",
+ "comments": "",
+ "x": 1126.7334594726562,
+ "y": 193.56666564941406,
+ "z": "d3028d55.5844c",
+ "wires": []
+ },
+ {
+ "id": "8900f991.ec20e8",
+ "type": "set",
+ "name": "set",
+ "xml": "<set>\n<parameter name='optical-service-create-input.payload.coding-func' value='100GBASE-R' />\n\n",
+ "comments": "",
+ "x": 1121.5667114257812,
+ "y": 266.566650390625,
+ "z": "d3028d55.5844c",
+ "wires": []
}
]
\ 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 df94ddfb..039d9ee2 100644 --- 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 @@ [
{
- "id": "53abb973.be3358",
+ "id": "cbaea85f.b8ead",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 320.566650390625,
- "y": 127.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 236.56666564941406,
+ "y": 102,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "a8f6adda.0744"
+ "cd2455f6.6e932"
]
]
},
{
- "id": "a8f6adda.0744",
+ "id": "cd2455f6.6e932",
"type": "service-logic",
"name": "optical-service ${project.version}",
"module": "optical-service",
@@ -22,344 +22,300 @@ "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": 333.566650390625,
- "y": 187.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 249.56666564941406,
+ "y": 162,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "18e37cee.ceb953"
+ "70c8e970.4db21"
]
]
},
{
- "id": "18e37cee.ceb953",
+ "id": "70c8e970.4db21",
"type": "method",
"name": "method service-delete-msa-sync",
"xml": "<method rpc='service-delete-msa' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 353.566650390625,
- "y": 267.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 269.56666564941406,
+ "y": 242,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "64d96c24.58677c"
+ "9c1f56f6.d00f38"
]
]
},
{
- "id": "64d96c24.58677c",
+ "id": "9c1f56f6.d00f38",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 601.066650390625,
- "y": 267.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 517.0666656494141,
+ "y": 242,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "d0c8eab9.2acb7",
- "7e4b0c6a.d80e4c"
+ "4dd86cf3.942054"
]
]
},
{
- "id": "d0c8eab9.2acb7",
- "type": "set",
- "name": "set",
- "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",
- "comments": "",
- "x": 783.566650390625,
- "y": 242.56666564941406,
- "z": "8588d9b2.517e38",
- "wires": []
- },
- {
- "id": "7e4b0c6a.d80e4c",
+ "id": "4dd86cf3.942054",
"type": "execute",
"name": "Call MSA Controller",
"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",
"comments": "",
"outputs": 1,
- "x": 781.566650390625,
- "y": 344.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 697.5666656494141,
+ "y": 319,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "e8374b35.9489e8",
- "59601e7a.333fb8"
+ "682d86b8.05526",
+ "39c8d3c3.b62bfc"
]
]
},
{
- "id": "59601e7a.333fb8",
+ "id": "39c8d3c3.b62bfc",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 960.566650390625,
- "y": 415.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 876.5666656494141,
+ "y": 390,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "f7639000.8d09b"
+ "95d20785.38f27"
]
]
},
{
- "id": "e8374b35.9489e8",
+ "id": "682d86b8.05526",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 957.566650390625,
- "y": 301.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 873.5666656494141,
+ "y": 276,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "44136677.41a668"
+ "19ac1c74.d7d004"
]
]
},
{
- "id": "44136677.41a668",
+ "id": "19ac1c74.d7d004",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1119.566650390625,
- "y": 296.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1035.566665649414,
+ "y": 271,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "656a3cd0.5027ec"
+ "a6253b3d.1d9918"
]
]
},
{
- "id": "f7639000.8d09b",
+ "id": "95d20785.38f27",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1133.566650390625,
- "y": 418.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1049.566665649414,
+ "y": 393,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "6f5cb50c.47cb9c",
- "61d2d42e.74ce34"
+ "507025a0.559a4c",
+ "91af5694.a6f19"
]
]
},
{
- "id": "656a3cd0.5027ec",
+ "id": "a6253b3d.1d9918",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Error deleting the Service' />\n",
"comments": "",
- "x": 1287.566650390625,
- "y": 293.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1203.566665649414,
+ "y": 268,
+ "z": "27c6cdb6.f4809a",
"wires": []
},
{
- "id": "6f5cb50c.47cb9c",
+ "id": "507025a0.559a4c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Successfully sent the request\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1314.566650390625,
- "y": 377.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1230.566665649414,
+ "y": 352,
+ "z": "27c6cdb6.f4809a",
"wires": [
[]
]
},
{
- "id": "61d2d42e.74ce34",
+ "id": "91af5694.a6f19",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$service-delete-response.configuration-response-common.response-code`'>\n",
"comments": "",
"outputs": 1,
- "x": 1307.566650390625,
- "y": 468.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1223.566665649414,
+ "y": 443,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "6a32e2cb.011efc",
- "126ef311.e5b135"
+ "91d16260.78483",
+ "b0a0d653.d2aad8"
]
]
},
{
- "id": "6a32e2cb.011efc",
+ "id": "91d16260.78483",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1450.566650390625,
- "y": 443.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1366.566665649414,
+ "y": 418,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "20f6b725.7d2e3"
+ "d1f703a2.70624"
]
]
},
{
- "id": "20f6b725.7d2e3",
+ "id": "d1f703a2.70624",
"type": "returnFailure",
"name": "return failure",
"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",
"comments": "",
- "x": 1647.566650390625,
- "y": 441.56666564941406,
- "z": "8588d9b2.517e38",
+ "x": 1563.566665649414,
+ "y": 416,
+ "z": "27c6cdb6.f4809a",
"wires": []
},
{
- "id": "126ef311.e5b135",
+ "id": "b0a0d653.d2aad8",
"type": "outcome",
"name": "200",
"xml": "<outcome value='200'>\n",
"comments": "",
"outputs": 1,
- "x": 1474.566650390625,
- "y": 557.5666656494141,
- "z": "8588d9b2.517e38",
+ "x": 1390.566665649414,
+ "y": 532,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "47d51f0e.38e19"
+ "2d1cf19b.b3a7b6"
]
]
},
{
- "id": "47d51f0e.38e19",
+ "id": "2d1cf19b.b3a7b6",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1638.566650390625,
- "y": 552.5666656494141,
- "z": "8588d9b2.517e38",
+ "x": 1554.566665649414,
+ "y": 527,
+ "z": "27c6cdb6.f4809a",
"wires": [
[
- "b9afc35f.499458",
- "f8b135a9.17c5d8",
- "70aa5b37.57ec94",
- "a77548a2.59db78",
- "ba4b7b38.d871e"
+ "b1a5c7e2.86fb38",
+ "4c41a47d.e30d04",
+ "fa335160.5d27e",
+ "108a94.a1ea956c",
+ "ad08b45b.6db4"
]
]
},
{
- "id": "b9afc35f.499458",
+ "id": "b1a5c7e2.86fb38",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside controller\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1810.566650390625,
- "y": 520.5666656494141,
- "z": "8588d9b2.517e38",
+ "x": 1726.566665649414,
+ "y": 495,
+ "z": "27c6cdb6.f4809a",
"wires": [
[]
]
},
{
- "id": "f8b135a9.17c5d8",
- "type": "save",
- "name": "save",
- "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",
- "comments": "",
- "outputs": 1,
- "x": 1820.566650390625,
- "y": 607.5666656494141,
- "z": "8588d9b2.517e38",
- "wires": [
- []
- ]
- },
- {
- "id": "70aa5b37.57ec94",
+ "id": "4c41a47d.e30d04",
"type": "get-resource",
"name": "get-resource",
- "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",
+ "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",
"comments": "",
"outputs": 1,
- "x": 1826.566650390625,
- "y": 683.5666656494141,
- "z": "8588d9b2.517e38",
+ "x": 1771.566650390625,
+ "y": 574,
+ "z": "27c6cdb6.f4809a",
"wires": [
- [
- "84297f07.a526"
- ]
- ]
- },
- {
- "id": "84297f07.a526",
- "type": "success",
- "name": "success",
- "xml": "<outcome value='success'>\n",
- "comments": "",
- "outputs": 1,
- "x": 1984.566650390625,
- "y": 674.5666656494141,
- "z": "8588d9b2.517e38",
- "wires": [
- [
- "aff15672.da7fa8"
- ]
+ []
]
},
{
- "id": "aff15672.da7fa8",
+ "id": "fa335160.5d27e",
"type": "set",
"name": "set",
- "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",
+ "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",
"comments": "",
- "x": 2133.566650390625,
- "y": 677.5666656494141,
- "z": "8588d9b2.517e38",
+ "x": 1706.566665649414,
+ "y": 833.9999847412109,
+ "z": "27c6cdb6.f4809a",
"wires": []
},
{
- "id": "a77548a2.59db78",
- "type": "update",
- "name": "update",
- "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",
+ "id": "108a94.a1ea956c",
+ "type": "call",
+ "name": "call aai-delete-service-handling",
+ "xml": "<call module='optical-service' rpc='aai-delete-service-handling' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 1799.566650390625,
- "y": 750.5666656494141,
- "z": "8588d9b2.517e38",
+ "x": 1807.13330078125,
+ "y": 699.566650390625,
+ "z": "27c6cdb6.f4809a",
"wires": [
[]
]
},
{
- "id": "ba4b7b38.d871e",
+ "id": "ad08b45b.6db4",
"type": "set",
"name": "set",
- "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",
+ "xml": "<set>\n<parameter name='request-id' value='`$optical-service-create-input.request-id`' />\n",
"comments": "",
- "x": 1790.566650390625,
- "y": 859.566650390625,
- "z": "8588d9b2.517e38",
+ "x": 1762.13330078125,
+ "y": 627.566650390625,
+ "z": "27c6cdb6.f4809a",
"wires": []
}
]
\ 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 0f3e967b..e11d061b 100644 --- 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`"/>
<parameter name="field3" value="`$aai.service.relationship-list.relationship_length`"/>
</record>
- <for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >
+ <for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >
<block atomic='true'>
<set>
<parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
@@ -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>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic>
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 43359c40..4eed4026 100644 --- 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'>
<parameter name='available-capacity' value='`$available-bandwidth-zend`' />
</update>
- <switch test='`$optical-service-create-input.payload.domain-type`'>
- <outcome value='MSA'>
- <block>
- <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>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+ <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>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
service-subscription.service-type = $optical-service-create-input.service-type AND
service-instance.service-instance-id = $optical-service-create-input.service-id' >
- <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />
- <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />
- <parameter name='service-type' value='Domain-Service' />
- <parameter name='orchestration-status' value='CREATING' />
- <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />
- <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />
- </save>
- </block>
- </outcome>
- <outcome value='TAPI'>
- <block>
- <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>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
- key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
- service-subscription.service-type = $optical-service-create-input.service-type AND
- service-instance.service-instance-id = $optical-service-create-input.service-id' >
- <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />
- <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />
- <parameter name='service-type' value='Domain-Service' />
- <parameter name='orchestration-status' value='CREATED' />
- <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />
- <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />
- </save>
- </block>
- </outcome>
- </switch>
+ <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />
+ <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />
+ <parameter name='service-type' value='Domain-Service' />
+ <parameter name='orchestration-status' value='CREATED' />
+ <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />
+ <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />
+ </save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
service-subscription.service-type = $optical-service-create-input.service-type AND
@@ -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" />
<parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$z-end-pnf-name`" />
</save>
- <return status='success'>
- <parameter name='error-code' value='200' />
- <parameter name='error-message' value='Service Creation in Progress' />
- <parameter name='ack-final-indicator' value='N' />
- </return>
+ <set>
+ <parameter name='final-response-code' value='200' />
+ </set>
</block>
</method>
</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 0c09b4a5..2341c607 100644 --- 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>
</outcome>
</switch>
+ <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni1_client_proto'`">
+ <outcome value='true'>
+ <set>
+ <parameter name='optical-service-create-input.payload.service-protocol' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+ </set>
+ </outcome>
+ </switch>
</for>
<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key='SELECT controller_id
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 db2d29f6..6768a50c 100644 --- 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]`' />
<parameter name='service-zend-nodeid' value='`$param-prefix1[0]`' />
</set>
+ <switch test='`$optical-service-create-input.payload.service-rate`'>
+ <outcome value='10'>
+ <set>
+ <parameter name='optical-service-create-input.payload.coding-func' value='10GBASE-R' />
+ </set>
+ </outcome>
+ <outcome value='100'>
+ <set>
+ <parameter name='optical-service-create-input.payload.coding-func' value='100GBASE-R' />
+ </set>
+ </outcome>
+ </switch>
<switch test='`$optical-service-create-input.payload.service-protocol`'>
<outcome value='Ethernet'>
<block atomic='true'>
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 562195a0..a4233171 100644 --- 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}'>
<method rpc='service-delete-msa' mode='sync'>
<block atomic="true">
- <set>
- <parameter name='optical-service-create-input.request-id' value="`$domain-service1`" />
- <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`"/>
- </set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
<parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>
@@ -49,32 +45,15 @@ <parameter name="level" value="info" />
<parameter name="field1" value="Inside controller"/>
</record>
- <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
-resource='SQL'
-key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id'
-force='true' pfx='save-result'></save>
<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key='SELECT *
from REQUEST_DETAILS
WHERE request_id = $optical-service-delete-input.request-id'
-pfx='db.request-details'>
- <outcome value='success'>
- <set>
- <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />
- <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />
- <parameter name='service-id' value='`$db.request-details.service-type`' />
- </set>
- </outcome>
- </get-resource>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService'
-force='true'
-resource='service-instance'
-key = 'customer.global-customer-id = $customer-id AND
- service-subscription.service-type = $service-id AND
- service-instance.service-instance-id = $instance-id'
-local-only='false'>
- <parameter name='orchestration-status' value='DELETING' />
- </update>
+pfx='output'></get-resource>
+ <set>
+ <parameter name='request-id' value='`$optical-service-create-input.request-id`' />
+ </set>
+ <call module='optical-service' rpc='aai-delete-service-handling' mode='sync' ></call>
<set>
<parameter name='final-response-code' value="200" />
</set>
|