From 715071d3f60eb8b3d4774b7984d7bde5eec9b2ae Mon Sep 17 00:00:00 2001 From: "shashikanth.vh" Date: Fri, 19 Apr 2019 11:32:30 +0000 Subject: SDWAN WAN port create exception issue fix 1.Generated vf module id not updated in service data 2.site-resource vnf relation-ship should be with wan-port-config and not with sdwan-vpn Change-Id: Ie5c153eb35799d93719b277492f43a5f3723e93d Issue-ID: SDNC-653 Signed-off-by: shashikanth.vh Former-commit-id: 0c8135ecd3666e8502122ebd622dd67930da4f00 --- ...URCE-API_sdwan-vf-operation-wanport-create.json | 372 ++++++++++----------- ...OURCE-API_sdwan-vf-operation-wanport-create.xml | 20 +- 2 files changed, 195 insertions(+), 197 deletions(-) (limited to 'platform-logic') diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json index f862a2d3..c3398834 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.json @@ -1,6 +1,6 @@ [ { - "id": "bc28da2b.7303d8", + "id": "5de743a6.6e9fdc", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -8,524 +8,524 @@ "comments": "", "xml": "", "outputs": 1, - "x": 323.0104064941406, - "y": 132.99999237060547, - "z": "eaff5db6.7dde1", + "x": 292.03125, + "y": 127.03125, + "z": "56fc6b1a.95dca4", "wires": [ [ - "dad83918.445348" + "831852f4.73c97" ] ] }, { - "id": "dad83918.445348", + "id": "831852f4.73c97", "type": "method", "name": "sdwan-vf-operation-wanport-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 322.0104064941406, - "y": 232.99999237060547, - "z": "eaff5db6.7dde1", + "x": 291.03125, + "y": 227.03125, + "z": "56fc6b1a.95dca4", "wires": [ [ - "ffb1ada3.8a76c" + "f0bca81d.b6a0f8" ] ] }, { - "id": "55cf0e90.e3564", + "id": "8410a95b.8b6678", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 179.51040267944336, - "y": 42, - "z": "eaff5db6.7dde1", + "x": 148.53124618530273, + "y": 36.03125762939453, + "z": "56fc6b1a.95dca4", "wires": [ [ - "bc28da2b.7303d8" + "5de743a6.6e9fdc" ] ] }, { - "id": "ffb1ada3.8a76c", + "id": "f0bca81d.b6a0f8", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 481.01039123535156, - "y": 349.0000009536743, - "z": "eaff5db6.7dde1", + "x": 450.03123474121094, + "y": 343.03125858306885, + "z": "56fc6b1a.95dca4", "wires": [ [ - "470949db.a87688", - "1946860c.52d49a", - "986d9d2e.d652e", - "176bae50.e7ba42", - "1c96aac1.62b6a5", - "d12731ca.f4e9a", - "ad8e03c8.3f99", - "99ca206c.689c4", - "45a27310.e17b0c", - "98b0c583.6fb0e8", - "f3463186.010ce", - "4efead29.a28254", - "187c318b.c5572e", - "29c03152.ef4a3e" + "54bfa066.4da69", + "1eb4450c.b37a3b", + "ff1f4bbb.9c88d8", + "262e8a6c.764e06", + "1438dd60.41b403", + "fa6eaef6.2d96", + "fdda37d.d3044c8", + "9b9a9c47.ff729", + "89e460e0.31c23", + "cf5e55a3.da5e38", + "3ce6fee1.f7c372", + "37eaec79.c59c14", + "981dfc9a.eb48b", + "461f9f03.a33d2" ] ] }, { - "id": "470949db.a87688", + "id": "54bfa066.4da69", "type": "for", "name": "for each vnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 781.3398132324219, - "y": 240.49612522125244, - "z": "eaff5db6.7dde1", + "x": 750.3606567382812, + "y": 234.52738285064697, + "z": "56fc6b1a.95dca4", "wires": [ [ - "4bf0f7e7.44aea8" + "53ca6ad5.693354" ] ] }, { - "id": "4bf0f7e7.44aea8", + "id": "53ca6ad5.693354", "type": "switchNode", "name": "switch this vnf-id == input vnf-id", "xml": " \n", "comments": "", "outputs": 1, - "x": 1033.3399047851562, - "y": 239.16278839111328, - "z": "eaff5db6.7dde1", + "x": 1002.3607482910156, + "y": 233.1940460205078, + "z": "56fc6b1a.95dca4", "wires": [ [ - "3d05a6f7.8cda9a" + "3af25422.f8b80c" ] ] }, { - "id": "d918203.c2e31e", + "id": "61e228fb.8092e8", "type": "set", "name": "set vnf-index", "xml": "\n\n", "comments": "", - "x": 1405.0063934326172, - "y": 241.16279125213623, - "z": "eaff5db6.7dde1", + "x": 1374.0272369384766, + "y": 235.19404888153076, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "3d05a6f7.8cda9a", + "id": "3af25422.f8b80c", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1251.6732215881348, - "y": 241.16277027130127, - "z": "eaff5db6.7dde1", + "x": 1220.6940650939941, + "y": 235.1940279006958, + "z": "56fc6b1a.95dca4", "wires": [ [ - "d918203.c2e31e" + "61e228fb.8092e8" ] ] }, { - "id": "176bae50.e7ba42", + "id": "262e8a6c.764e06", "type": "for", "name": "for loop idx - VF input parameters", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 855.2605972290039, - "y": 462.66665840148926, - "z": "eaff5db6.7dde1", + "x": 824.2814407348633, + "y": 456.6979160308838, + "z": "56fc6b1a.95dca4", "wires": [ [ - "18c22866.3fa9a8" + "6641b8fa.11e218" ] ] }, { - "id": "18c22866.3fa9a8", + "id": "6641b8fa.11e218", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1070.0389404296875, - "y": 460.2222423553467, - "z": "eaff5db6.7dde1", + "x": 1039.0597839355469, + "y": 454.2534999847412, + "z": "56fc6b1a.95dca4", "wires": [ [ - "f7311df1.3a06f", - "eb8b9c09.06311" + "4c2187d7.70c4d8", + "32a53869.510578" ] ] }, { - "id": "f7311df1.3a06f", + "id": "4c2187d7.70c4d8", "type": "execute", "name": "execute split parameterName", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1266.2951431274414, - "y": 437.97038078308105, - "z": "eaff5db6.7dde1", + "x": 1235.3159866333008, + "y": 432.0016384124756, + "z": "56fc6b1a.95dca4", "wires": [ [] ] }, { - "id": "eb8b9c09.06311", + "id": "32a53869.510578", "type": "set", "name": "set parameterName", "xml": "\n\n", "comments": "", - "x": 1235.7395706176758, - "y": 474.97049713134766, - "z": "eaff5db6.7dde1", + "x": 1204.7604141235352, + "y": 469.0017547607422, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "f77b19d7.8bb178", + "id": "ab557068.64844", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 1239.260799407959, - "y": 397.33332681655884, - "z": "eaff5db6.7dde1", + "x": 1208.2816429138184, + "y": 391.36458444595337, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "1946860c.52d49a", + "id": "1eb4450c.b37a3b", "type": "switchNode", "name": "switch vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 795.7604064941406, - "y": 195.9999942779541, - "z": "eaff5db6.7dde1", + "x": 764.78125, + "y": 190.03125190734863, + "z": "56fc6b1a.95dca4", "wires": [ [ - "89c152d0.6fb2c" + "e279b1ab.b937f" ] ] }, { - "id": "89c152d0.6fb2c", + "id": "e279b1ab.b937f", "type": "other", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 982.4270858764648, - "y": 195.3332920074463, - "z": "eaff5db6.7dde1", + "x": 951.4479293823242, + "y": 189.36454963684082, + "z": "56fc6b1a.95dca4", "wires": [ [ - "869ba82c.b1cd68" + "c52a39f4.c6da18" ] ] }, { - "id": "869ba82c.b1cd68", + "id": "c52a39f4.c6da18", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1164.0937118530273, - "y": 195.3332920074463, - "z": "eaff5db6.7dde1", + "x": 1133.1145553588867, + "y": 189.36454963684082, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "986d9d2e.d652e", + "id": "ff1f4bbb.9c88d8", "type": "switchNode", "name": "switch vf-modules.vf-module_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 837.0103960037231, - "y": 315.9999952316284, - "z": "eaff5db6.7dde1", + "x": 806.0312395095825, + "y": 310.03125286102295, + "z": "56fc6b1a.95dca4", "wires": [ [ - "6d96cae7.544aa4", - "7b4aef1d.e8397" + "cd7442d9.34306", + "6d930136.d20cb" ] ] }, { - "id": "6d96cae7.544aa4", + "id": "cd7442d9.34306", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1068.0104064941406, - "y": 291.99999237060547, - "z": "eaff5db6.7dde1", + "x": 1037.03125, + "y": 286.03125, + "z": "56fc6b1a.95dca4", "wires": [ [ - "8b1de33b.f87d8" + "c51e25a8.593288" ] ] }, { - "id": "7b4aef1d.e8397", + "id": "6d930136.d20cb", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1068.0104064941406, - "y": 331.99999237060547, - "z": "eaff5db6.7dde1", + "x": 1037.03125, + "y": 326.03125, + "z": "56fc6b1a.95dca4", "wires": [ [ - "e6620c2c.848df" + "8a36da98.f826b8" ] ] }, { - "id": "8b1de33b.f87d8", + "id": "c51e25a8.593288", "type": "set", "name": "set vf-index", "xml": "\n\n", "comments": "", - "x": 1210.5104064941406, - "y": 291.99999237060547, - "z": "eaff5db6.7dde1", + "x": 1179.53125, + "y": 286.03125, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "e6620c2c.848df", + "id": "8a36da98.f826b8", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1212.3674507141113, - "y": 331.9365043640137, - "z": "eaff5db6.7dde1", + "x": 1181.3882942199707, + "y": 325.9677619934082, + "z": "56fc6b1a.95dca4", "wires": [ [ - "9a648de3.1f16d", - "8d5a09c0.be4698" + "26e4ea27.208ad6", + "44db3104.e81c6" ] ] }, { - "id": "8d5a09c0.be4698", + "id": "44db3104.e81c6", "type": "set", "name": "set vf-index", "xml": "\n\n\n\n", "comments": "", - "x": 1365.0659255981445, - "y": 301.5556030566804, - "z": "eaff5db6.7dde1", + "x": 1334.086769104004, + "y": 295.58686068607494, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "9a648de3.1f16d", + "id": "26e4ea27.208ad6", "type": "for", "name": "for each existing vf-index", "xml": "\n", "comments": "", "outputs": 1, - "x": 1421.4944305419922, - "y": 354.7777328491211, - "z": "eaff5db6.7dde1", + "x": 1390.5152740478516, + "y": 348.8089904785156, + "z": "56fc6b1a.95dca4", "wires": [ [ - "35f2967d.f1236a" + "3b7c03ef.0af89c" ] ] }, { - "id": "9105950c.e52f88", + "id": "5b9f74ec.1882ec", "type": "comment", "name": "make sure this network doesn't exist already", "info": "", "comments": "", - "x": 1645.1451606750488, - "y": 313.03179025650024, - "z": "eaff5db6.7dde1", + "x": 1614.1660041809082, + "y": 307.0630478858948, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "35f2967d.f1236a", + "id": "3b7c03ef.0af89c", "type": "switchNode", "name": "switch vf-module-id found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1696.7801513671875, - "y": 354.34923553466797, - "z": "eaff5db6.7dde1", + "x": 1665.8009948730469, + "y": 348.3804931640625, + "z": "56fc6b1a.95dca4", "wires": [ [ - "7879d3b9.a48b9c" + "84bba4b1.816e38" ] ] }, { - "id": "7879d3b9.a48b9c", + "id": "84bba4b1.816e38", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1597.5103492736816, - "y": 412.9206666946411, - "z": "eaff5db6.7dde1", + "x": 1566.531192779541, + "y": 406.95192432403564, + "z": "56fc6b1a.95dca4", "wires": [ [ - "d7b29734.9c35b8" + "4d582e07.7c7a1" ] ] }, { - "id": "d7b29734.9c35b8", + "id": "4d582e07.7c7a1", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1745.2604522705078, - "y": 412.7778587634675, - "z": "eaff5db6.7dde1", + "x": 1714.2812957763672, + "y": 406.80911639286205, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "99ca206c.689c4", + "id": "9b9a9c47.ff729", "type": "set", "name": "copy input data to service data", - "xml": "\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 849.8635559082031, - "y": 742.4961910247803, - "z": "eaff5db6.7dde1", + "x": 821.8844604492188, + "y": 730.527437210083, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "ad8e03c8.3f99", + "id": "fdda37d.d3044c8", "type": "execute", "name": "execute generate-vf-module-index", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 862.1971206665039, - "y": 688.1629104614258, - "z": "eaff5db6.7dde1", + "x": 831.2179641723633, + "y": 682.1941680908203, + "z": "56fc6b1a.95dca4", "wires": [ [] ] }, { - "id": "d12731ca.f4e9a", + "id": "fa6eaef6.2d96", "type": "set", "name": "set new vf-module_length", "xml": "\n", "comments": "", - "x": 834.1970672607422, - "y": 635.1628475189209, - "z": "eaff5db6.7dde1", + "x": 803.2179107666016, + "y": 629.1941051483154, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "1c96aac1.62b6a5", + "id": "1438dd60.41b403", "type": "set", "name": "set vf-module-request-input.", "xml": "\n\n", "comments": "", - "x": 846.1967353820801, - "y": 525.1542224884033, - "z": "eaff5db6.7dde1", + "x": 815.2175788879395, + "y": 519.1854801177979, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "45a27310.e17b0c", + "id": "89e460e0.31c23", "type": "set", "name": "set vf-module-object-path", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", - "x": 838.0104808807373, - "y": 794.0000371932983, - "z": "eaff5db6.7dde1", + "x": 807.0313243865967, + "y": 788.0312948226929, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "98b0c583.6fb0e8", + "id": "cf5e55a3.da5e38", "type": "set", "name": "set vf-module-level-oper-status", "xml": "\n\n\n", "comments": "", - "x": 852.5105400085449, - "y": 843.9999303817749, - "z": "eaff5db6.7dde1", + "x": 821.5313835144043, + "y": 838.0311880111694, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "187c318b.c5572e", + "id": "981dfc9a.eb48b", "type": "save", "name": "save sdwan vpn resource in AAI", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 856.0104484558105, - "y": 887.4999761581421, - "z": "eaff5db6.7dde1", + "x": 825.0312919616699, + "y": 881.5312337875366, + "z": "56fc6b1a.95dca4", "wires": [ [] ] }, { - "id": "29c03152.ef4a3e", + "id": "461f9f03.a33d2", "type": "save", "name": "save service relationship in AAI", - "xml": "\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 853.0103759765625, - "y": 933.5000076293945, - "z": "eaff5db6.7dde1", + "x": 822.0312194824219, + "y": 927.5312652587891, + "z": "56fc6b1a.95dca4", "wires": [ [] ] }, { - "id": "f3463186.010ce", + "id": "3ce6fee1.f7c372", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 803.7329216003418, - "y": 980.6738667488098, - "z": "eaff5db6.7dde1", + "x": 772.7537651062012, + "y": 974.7051243782043, + "z": "56fc6b1a.95dca4", "wires": [] }, { - "id": "4efead29.a28254", + "id": "37eaec79.c59c14", "type": "call", "name": "call sdwan-get-wan-param", "xml": "\n", "comments": "", "outputs": 1, - "x": 845.8992767333984, - "y": 587.8888759613037, - "z": "eaff5db6.7dde1", + "x": 814.9201202392578, + "y": 581.9201335906982, + "z": "56fc6b1a.95dca4", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml index c8494499..f630eeee 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-create.xml @@ -69,7 +69,7 @@ - + @@ -80,6 +80,7 @@ + + key='wan-port-config.wan-port-config-id = $prop.wan-port-vf-index' > + @@ -121,18 +122,15 @@ - + - - - - - + + + + -- cgit 1.2.3-korg