Merge "SDWAN device oper status not updated in AAI"
authorDan Timoney <dtimoney@att.com>
Fri, 19 Apr 2019 13:44:57 +0000 (13:44 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 19 Apr 2019 13:44:57 +0000 (13:44 +0000)
Former-commit-id: b6f2775e642f2a0b7cfeb4162bae8a98ec0ea0ae

platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vf-module-input.json
platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml [changed mode: 0755->0644]
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml

index ebf78f4..7181837 100644 (file)
@@ -1 +1,557 @@
-[{"id":"ea5c79fa.0a8cc8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":286.25000762939453,"y":416.25000762939453,"z":"e7f16526.16fa48","wires":[["415f4f79.ce4c6","3f9465cc.1cf0ca","d5fa8c45.3e223","4b25ca9c.280804","f4dcf148.c2c8d","74fce8e4.b16128","b87e6689.a6bb68"]]},{"id":"415f4f79.ce4c6","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":542.7619094848633,"y":349.33034229278564,"z":"e7f16526.16fa48","wires":[["569a8602.d763d8"]]},{"id":"569a8602.d763d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":768.476203918457,"y":349.3303461074829,"z":"e7f16526.16fa48","wires":[["83dcb0ce.53e5a"]]},{"id":"83dcb0ce.53e5a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n","comments":"","x":919.9047698974609,"y":349.3303442001343,"z":"e7f16526.16fa48","wires":[]},{"id":"3f9465cc.1cf0ca","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":531.3332726614817,"y":307.9017738614764,"z":"e7f16526.16fa48","wires":[["90f99d55.c26ac"]]},{"id":"90f99d55.c26ac","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":767.0476243155344,"y":306.47317164284846,"z":"e7f16526.16fa48","wires":[["81889b61.b3bfd8"]]},{"id":"81889b61.b3bfd8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":917.0475976126536,"y":306.4731811795916,"z":"e7f16526.16fa48","wires":[]},{"id":"d5fa8c45.3e223","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":541.3333260672434,"y":392.1874889646258,"z":"e7f16526.16fa48","wires":[["faa49149.2b86c"]]},{"id":"faa49149.2b86c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":768.4761995588033,"y":392.1874998637609,"z":"e7f16526.16fa48","wires":[["54306d5b.2a8714"]]},{"id":"54306d5b.2a8714","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is a required input\" />\n","comments":"","x":919.9047655378072,"y":392.18749795641224,"z":"e7f16526.16fa48","wires":[]},{"id":"9652914c.1bb7e","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1138.7978401184082,"y":563.9496374130249,"z":"e7f16526.16fa48","wires":[["10afdd9f.c76fe2"]]},{"id":"10afdd9f.c76fe2","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1343.7978401184082,"y":563.9496202468872,"z":"e7f16526.16fa48","wires":[["5ca4e9bd.7d2d68"]]},{"id":"5ca4e9bd.7d2d68","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1495.226406097412,"y":563.9496183395386,"z":"e7f16526.16fa48","wires":[]},{"id":"5073a804.d512e8","type":"switchNode","name":"switch tenant","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.tenant`'>\n","comments":"","outputs":1,"x":1084.6549186706543,"y":605.3781480789185,"z":"e7f16526.16fa48","wires":[["59c1d2fa.686d8c"]]},{"id":"59c1d2fa.686d8c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1342.3692359924316,"y":605.3781824111938,"z":"e7f16526.16fa48","wires":[["f3fb61d6.cc04f"]]},{"id":"f3fb61d6.cc04f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.vf-module-request-input.tenant is a required input\" />\n","comments":"","x":1493.7978019714355,"y":605.3781805038452,"z":"e7f16526.16fa48","wires":[]},{"id":"85af947a.22df18","type":"comment","name":"Validation of required fields","info":"","comments":"","x":691.3332824707031,"y":263.61605644226074,"z":"e7f16526.16fa48","wires":[]},{"id":"4b25ca9c.280804","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":524.4880752563477,"y":606.2948093414307,"z":"e7f16526.16fa48","wires":[["46f73107.a11e3"]]},{"id":"46f73107.a11e3","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":684.0713768005371,"y":605.8780736923218,"z":"e7f16526.16fa48","wires":[["5f080643.137608"]]},{"id":"5f080643.137608","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":876.0713768005371,"y":605.8780736923218,"z":"e7f16526.16fa48","wires":[["9652914c.1bb7e","5073a804.d512e8","97868ae3.7d64c8"]]},{"id":"b003da9.6001328","type":"dgstart","name":"DGSTART","outputs":1,"x":203.7500098092214,"y":136.1636562347412,"z":"e7f16526.16fa48","wires":[["4513d2b4.de1b4c"]]},{"id":"4513d2b4.de1b4c","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":317.03571537562766,"y":176.4017677307129,"z":"e7f16526.16fa48","wires":[["9f09d02b.74d24"]]},{"id":"9f09d02b.74d24","type":"method","name":"method validate-vf-module-input","xml":"<method rpc='validate-vf-module-input' mode='sync'>\n","comments":"","outputs":1,"x":274.095304761614,"y":217.08031368255615,"z":"e7f16526.16fa48","wires":[["ea5c79fa.0a8cc8"]]},{"id":"c6fa4eaa.296c1","type":"comment","name":"validate-vf-module-input","info":"","comments":"","x":598.0948660714284,"y":83.75,"z":"e7f16526.16fa48","wires":[]},{"id":"f4dcf148.c2c8d","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$vf-module-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":554.3571570260183,"y":436.25001525878906,"z":"e7f16526.16fa48","wires":[["40adc00a.0182f"]]},{"id":"40adc00a.0182f","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":766.7857382638113,"y":436.2500114440918,"z":"e7f16526.16fa48","wires":[["4bc1bff5.09afa"]]},{"id":"4bc1bff5.09afa","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"service-information.service-instance-id is a required input\" />\n","comments":"","x":918.2143042428152,"y":436.25000953674316,"z":"e7f16526.16fa48","wires":[]},{"id":"74fce8e4.b16128","type":"switchNode","name":"switch vnf-id","xml":"<switch test='`$vf-module-topology-operation-input.vnf-information.vnf-id`'>\n","comments":"","outputs":1,"x":511.8571662902832,"y":482.7500057220459,"z":"e7f16526.16fa48","wires":[["5b2b7ba3.f8c584"]]},{"id":"5b2b7ba3.f8c584","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":767.1428756713867,"y":481.32143783569336,"z":"e7f16526.16fa48","wires":[["a3b38083.db3e6"]]},{"id":"a3b38083.db3e6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.vnf-id is a required input\" />\n","comments":"","x":918.5714416503906,"y":481.3214359283447,"z":"e7f16526.16fa48","wires":[]},{"id":"97868ae3.7d64c8","type":"switchNode","name":"switch aic-cloud-region","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":1114,"y":647.6548051834106,"z":"e7f16526.16fa48","wires":[["a5724b37.d9d578"]]},{"id":"a5724b37.d9d578","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1340.7143173217773,"y":647.654839515686,"z":"e7f16526.16fa48","wires":[["e5de3e6a.52ece"]]},{"id":"e5de3e6a.52ece","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-request-input.aic-cloud-region is a required input\" />\n","comments":"","x":1492.1428833007812,"y":647.6548376083374,"z":"e7f16526.16fa48","wires":[]},{"id":"b87e6689.a6bb68","type":"switchNode","name":"switch vf-module-id","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`'>\n","comments":"","outputs":1,"x":532.6666564941406,"y":528.7499847412109,"z":"e7f16526.16fa48","wires":[["e506a425.ee0a78"]]},{"id":"e506a425.ee0a78","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":766.9523658752441,"y":527.3214168548584,"z":"e7f16526.16fa48","wires":[["b00a0f0d.7df6c"]]},{"id":"b00a0f0d.7df6c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.vf-module-id is a required input\" />\n","comments":"","x":918.380931854248,"y":527.3214149475098,"z":"e7f16526.16fa48","wires":[]},{"id":"27b56d4b.cf2242","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":707.9166946411133,"y":761.0000114440918,"z":"e7f16526.16fa48","wires":[["858c4aa9.75cbe8"]]},{"id":"858c4aa9.75cbe8","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":934.5833358764648,"y":761.3333168029785,"z":"e7f16526.16fa48","wires":[["16e33b74.6a3275"]]},{"id":"16e33b74.6a3275","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1139.5833358764648,"y":761.3332996368408,"z":"e7f16526.16fa48","wires":[["8cdecc05.e04a9"]]},{"id":"8cdecc05.e04a9","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1291.0119018554688,"y":761.3332977294922,"z":"e7f16526.16fa48","wires":[]},{"id":"ba0cf2a7.da9b1","type":"comment","name":"model-customization-uuid validation moved to changeassign DG","info":"","comments":"","x":765,"y":718.75,"z":"e7f16526.16fa48","wires":[]}]
\ No newline at end of file
+[\r
+    {\r
+        "id": "64530960.7a4c48",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 266.03125,\r
+        "y": 487.50000762939453,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "42eab53.cead04c",\r
+                "9030d08e.473eb",\r
+                "e2eeb7ea.c3b598",\r
+                "6a464fe8.f5db",\r
+                "1cf09f88.9f996",\r
+                "50ebeee1.1f03d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "42eab53.cead04c",\r
+        "type": "switchNode",\r
+        "name": "switch svc-request-id",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 522.5431518554688,\r
+        "y": 420.58034229278564,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "acac6999.f74ae8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acac6999.f74ae8",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 748.2574462890625,\r
+        "y": 420.5803461074829,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "7a7765a6.716e9c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a7765a6.716e9c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 899.6860122680664,\r
+        "y": 420.5803442001343,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9030d08e.473eb",\r
+        "type": "switchNode",\r
+        "name": "switch svc-action",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 511.1145150320872,\r
+        "y": 379.1517738614764,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "6c42550c.9ee7ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6c42550c.9ee7ec",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 746.8288666861399,\r
+        "y": 377.72317164284846,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "7bffbb0f.9e8194"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7bffbb0f.9e8194",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 896.8288399832591,\r
+        "y": 377.7231811795916,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e2eeb7ea.c3b598",\r
+        "type": "switchNode",\r
+        "name": "switch request-action",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 521.1145684378489,\r
+        "y": 463.4374889646258,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "3b145144.cf0dce"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b145144.cf0dce",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 748.2574419294087,\r
+        "y": 463.4374998637609,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "dab01406.ba8c98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dab01406.ba8c98",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 899.6860079084126,\r
+        "y": 463.43749795641224,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "12ea91e7.8a5dee",\r
+        "type": "switchNode",\r
+        "name": "switch model-customization-id",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1118.5790824890137,\r
+        "y": 635.1996374130249,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "7123b9f.8aa2648"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7123b9f.8aa2648",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1323.5790824890137,\r
+        "y": 635.1996202468872,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "56283888.4b07c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "56283888.4b07c8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.onap-model-information.model-customization-uuid is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 1475.0076484680176,\r
+        "y": 635.1996183395386,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "eca8ac0.d277c58",\r
+        "type": "switchNode",\r
+        "name": "switch tenant",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.tenant`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1064.4361610412598,\r
+        "y": 676.6281480789185,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "17c7649f.342e3b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "17c7649f.342e3b",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1322.150478363037,\r
+        "y": 676.6281824111938,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "a9a7bd61.ab17c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a9a7bd61.ab17c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.vf-module-request-input.tenant is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 1473.579044342041,\r
+        "y": 676.6281805038452,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "37d1ad14.2a8632",\r
+        "type": "comment",\r
+        "name": "Validation of required fields",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 671.1145248413086,\r
+        "y": 334.86605644226074,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6a464fe8.f5db",\r
+        "type": "switchNode",\r
+        "name": "switch svc-action",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 504.2693176269531,\r
+        "y": 677.5448093414307,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "55f87411.8977fc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55f87411.8977fc",\r
+        "type": "outcome",\r
+        "name": "assign",\r
+        "xml": "<outcome value='assign'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 663.8526191711426,\r
+        "y": 677.1280736923218,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "76a30e92.c3b23"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "76a30e92.c3b23",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 855.8526191711426,\r
+        "y": 677.1280736923218,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "12ea91e7.8a5dee",\r
+                "eca8ac0.d277c58",\r
+                "75303db4.f39ac4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "412ad4c5.a2550c",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 183.53125217982688,\r
+        "y": 207.4136562347412,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "5fecaed1.6af1f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fecaed1.6af1f",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "outputs": 1,\r
+        "x": 296.81695774623313,\r
+        "y": 247.6517677307129,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "ce8e825.505198"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce8e825.505198",\r
+        "type": "method",\r
+        "name": "method validate-vf-module-input",\r
+        "xml": "<method rpc='validate-vf-module-input' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 253.87654713221946,\r
+        "y": 288.33031368255615,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "64530960.7a4c48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d3c65d01.b09e8",\r
+        "type": "comment",\r
+        "name": "validate-vf-module-input",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 577.8761084420339,\r
+        "y": 155,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1cf09f88.9f996",\r
+        "type": "switchNode",\r
+        "name": "switch service-instance-id",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.service-information.service-instance-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 534.1383993966238,\r
+        "y": 507.50001525878906,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "4a5d470b.8d66d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4a5d470b.8d66d8",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 746.5669806344167,\r
+        "y": 507.5000114440918,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "6a814e78.eefa1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a814e78.eefa1",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"service-information.service-instance-id is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 897.9955466134206,\r
+        "y": 507.50000953674316,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "50ebeee1.1f03d",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-id",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.vnf-information.vnf-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 491.6384086608887,\r
+        "y": 554.0000057220459,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "91be467.d997cb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "91be467.d997cb8",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 746.9241180419922,\r
+        "y": 552.5714378356934,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "a61fec00.397b18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a61fec00.397b18",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.vnf-id is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 898.3526840209961,\r
+        "y": 552.5714359283447,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "75303db4.f39ac4",\r
+        "type": "switchNode",\r
+        "name": "switch aic-cloud-region",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1093.7812423706055,\r
+        "y": 718.9048051834106,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "ce90203b.b0afd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce90203b.b0afd",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1320.4955596923828,\r
+        "y": 718.904839515686,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "2275e534.88d4ca"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2275e534.88d4ca",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-request-input.aic-cloud-region is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 1471.9241256713867,\r
+        "y": 718.9048376083374,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3d870d1c.309352",\r
+        "type": "outcome",\r
+        "name": "changeassign",\r
+        "xml": "<outcome value='changeassign'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 687.6979370117188,\r
+        "y": 832.2500114440918,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "fa0141f0.f9902"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fa0141f0.f9902",\r
+        "type": "switchNode",\r
+        "name": "switch model-customization-id",\r
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 914.3645782470703,\r
+        "y": 832.5833168029785,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "5358c72a.6a77a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5358c72a.6a77a8",\r
+        "type": "outcome",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1119.3645782470703,\r
+        "y": 832.5832996368408,\r
+        "z": "c914996f.38af08",\r
+        "wires": [\r
+            [\r
+                "80d57253.986af"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "80d57253.986af",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-information.onap-model-information.model-customization-uuid is a required input\" />\n",\r
+        "comments": "",\r
+        "x": 1270.7931442260742,\r
+        "y": 832.5832977294922,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "319c1dc4.f1e692",\r
+        "type": "comment",\r
+        "name": "model-customization-uuid validation moved to changeassign DG",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 744.7812423706055,\r
+        "y": 790,\r
+        "z": "c914996f.38af08",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file
index 30ccba9..8891506 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "818160d.1a87aa",\r
+        "id": "f4e72acb.01bf58",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 116.01041412353516,\r
-        "y": 49.010414123535156,\r
-        "z": "83799888.3d8488",\r
+        "x": 130.03125,\r
+        "y": 54.00000190734863,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "2c87f750.9ff0e8"\r
+                "a16de899.ba6ce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c87f750.9ff0e8",\r
+        "id": "a16de899.ba6ce8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 253.01041793823242,\r
-        "y": 154.0104274749756,\r
-        "z": "83799888.3d8488",\r
+        "x": 267.03125381469727,\r
+        "y": 159.00001525878906,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "ff163fb7.14832"\r
+                "452b8421.fdadac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff163fb7.14832",\r
+        "id": "452b8421.fdadac",\r
         "type": "method",\r
         "name": "sdwan-get-wan-param",\r
         "xml": "<method rpc='sdwan-get-wan-param' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 241.01053619384766,\r
-        "y": 242.0104103088379,\r
-        "z": "83799888.3d8488",\r
+        "x": 255.0313720703125,\r
+        "y": 246.99999809265137,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "352c95ce.453cea"\r
+                "50910d6a.5d96b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "352c95ce.453cea",\r
+        "id": "50910d6a.5d96b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 248.01042938232422,\r
-        "y": 328.0104684829712,\r
-        "z": "83799888.3d8488",\r
+        "x": 262.03126525878906,\r
+        "y": 333.00005626678467,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "52293f30.d5b77"\r
+                "8cd27d33.452ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52293f30.d5b77",\r
+        "id": "8cd27d33.452ae",\r
         "type": "for",\r
         "name": "for each sdwan-get-request-input-param",\r
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",\r
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 284.6771926879883,\r
-        "y": 410.6770648956299,\r
-        "z": "83799888.3d8488",\r
+        "x": 298.6980285644531,\r
+        "y": 415.66665267944336,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "e8d20d4.02e64f"\r
+                "b3542ade.7b14d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8d20d4.02e64f",\r
+        "id": "b3542ade.7b14d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 549.5106964111328,\r
-        "y": 320.01045656204224,\r
-        "z": "83799888.3d8488",\r
+        "x": 563.5315322875977,\r
+        "y": 325.0000443458557,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "2847b0ea.9ebb",\r
-                "d4feaef6.6438f",\r
-                "3e47338e.c3ab3c",\r
-                "91d20588.adacd8",\r
-                "43f318cb.2f4418",\r
-                "49351eca.09882",\r
-                "a41eaf2.439f75",\r
-                "9005e8e9.34f768",\r
-                "a55d2183.cf6a",\r
-                "c8c85e46.4f10f",\r
-                "286e48cc.e48988",\r
-                "383fea5a.143066",\r
-                "18a75045.9bb5e",\r
-                "60fcaabc.ca5bf4",\r
-                "d17b4c90.52ccd",\r
-                "2a13a6a0.eb644a",\r
-                "19ce9dfd.f8a2f2",\r
-                "a399cdca.37b7a"\r
+                "e86947af.f5b608",\r
+                "638cf29c.12828c",\r
+                "46b5c4a7.4a507c",\r
+                "b5fed085.d4d7c",\r
+                "77b16659.a09ba8",\r
+                "d7c2c346.bb4d6",\r
+                "8f7cd129.e628b",\r
+                "7871b91.d889348",\r
+                "de89e87a.10da58",\r
+                "769a21a2.077c4",\r
+                "e772d25.ba6eb3",\r
+                "6d16b1ef.6edda",\r
+                "f44a56f3.db7c08",\r
+                "2d9d0a07.21b996",\r
+                "f4e0170c.c926f8",\r
+                "ec6279c6.c6c888",\r
+                "7c9c948.6f89d6c",\r
+                "97c178d3.f58628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2847b0ea.9ebb",\r
+        "id": "e86947af.f5b608",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 781.0111198425293,\r
-        "y": 804.0109233856201,\r
-        "z": "83799888.3d8488",\r
+        "x": 795.0319557189941,\r
+        "y": 809.0005111694336,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43f318cb.2f4418",\r
+        "id": "77b16659.a09ba8",\r
         "type": "switchNode",\r
         "name": "switch deviceName",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceName'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782.0105018615723,\r
-        "y": 235.01046657562256,\r
-        "z": "83799888.3d8488",\r
+        "x": 796.0313377380371,\r
+        "y": 240.00005435943604,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "510fde76.25775"\r
+                "8a272a2c.746128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "510fde76.25775",\r
+        "id": "8a272a2c.746128",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 984.010908126831,\r
-        "y": 236.01053714752197,\r
-        "z": "83799888.3d8488",\r
+        "x": 998.0317440032959,\r
+        "y": 241.00012493133545,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "bacc1950.a6e0e8"\r
+                "2c0253a3.fcc01c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bacc1950.a6e0e8",\r
+        "id": "2c0253a3.fcc01c",\r
         "type": "set",\r
         "name": "set deviceName",\r
         "xml": "<set>\n<parameter name='prop.wan.deviceName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1148.0111656188965,\r
-        "y": 232.6106538772583,\r
-        "z": "83799888.3d8488",\r
+        "x": 1162.0320014953613,\r
+        "y": 237.60024166107178,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8c85e46.4f10f",\r
+        "id": "769a21a2.077c4",\r
         "type": "switchNode",\r
         "name": "switch vlanId",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vlanId'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 763.8506278991699,\r
-        "y": 465.01052474975586,\r
-        "z": "83799888.3d8488",\r
+        "x": 777.8714637756348,\r
+        "y": 470.00011253356934,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "5ea3c659.f0cd28"\r
+                "96af6598.d7c628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ea3c659.f0cd28",\r
+        "id": "96af6598.d7c628",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 948.850715637207,\r
-        "y": 463.010555267334,\r
-        "z": "83799888.3d8488",\r
+        "x": 962.8715515136719,\r
+        "y": 468.00014305114746,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "a7e47063.77624"\r
+                "835228c7.4ae758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7e47063.77624",\r
+        "id": "835228c7.4ae758",\r
         "type": "set",\r
         "name": "set vlanId",\r
         "xml": "<set>\n<parameter name='prop.wan.vlanId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1096.1846237182617,\r
-        "y": 460.4718141555786,\r
-        "z": "83799888.3d8488",\r
+        "x": 1110.2054595947266,\r
+        "y": 465.4614019393921,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e47338e.c3ab3c",\r
+        "id": "46b5c4a7.4a507c",\r
         "type": "switchNode",\r
         "name": "switch name",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 779.905574798584,\r
-        "y": 164.98373794555664,\r
-        "z": "83799888.3d8488",\r
+        "x": 793.9264106750488,\r
+        "y": 169.97332572937012,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "69feffe1.51e2a"\r
+                "7b61097d.91aee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69feffe1.51e2a",\r
+        "id": "7b61097d.91aee8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 967.9056625366211,\r
-        "y": 165.98376750946045,\r
-        "z": "83799888.3d8488",\r
+        "x": 981.9264984130859,\r
+        "y": 170.97335529327393,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "8d991bb4.b45f18"\r
+                "b4967d12.d0c5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d991bb4.b45f18",\r
+        "id": "b4967d12.d0c5f",\r
         "type": "set",\r
         "name": "set name",\r
         "xml": "<set>\n<parameter name='prop.wan.name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1117.905912399292,\r
-        "y": 160.58384323120117,\r
-        "z": "83799888.3d8488",\r
+        "x": 1131.9267482757568,\r
+        "y": 165.57343101501465,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9005e8e9.34f768",\r
+        "id": "7871b91.d889348",\r
         "type": "switchNode",\r
         "name": "switch ipAddress",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'ipAddress'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 767.9058036804199,\r
-        "y": 391.38722801208496,\r
-        "z": "83799888.3d8488",\r
+        "x": 781.9266395568848,\r
+        "y": 396.37681579589844,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "cf4b6fa5.dfd8b"\r
+                "e6c538ab.c14a08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf4b6fa5.dfd8b",\r
+        "id": "e6c538ab.c14a08",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 961.9060516357422,\r
-        "y": 392.3871765136719,\r
-        "z": "83799888.3d8488",\r
+        "x": 975.926887512207,\r
+        "y": 397.37676429748535,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "abac1fea.19c24"\r
+                "4bb13cc.edc5bc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abac1fea.19c24",\r
+        "id": "4bb13cc.edc5bc4",\r
         "type": "set",\r
         "name": "set ipAddress",\r
         "xml": "<set>\n<parameter name='prop.wan.ipAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1114.2399597167969,\r
-        "y": 390.84843730926514,\r
-        "z": "83799888.3d8488",\r
+        "x": 1128.2607955932617,\r
+        "y": 395.8380250930786,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a55d2183.cf6a",\r
+        "id": "de89e87a.10da58",\r
         "type": "switchNode",\r
         "name": "switch providerIpAddress",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'providerIpAddress'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 799.9059638977051,\r
-        "y": 426.387149810791,\r
-        "z": "83799888.3d8488",\r
+        "x": 813.9267997741699,\r
+        "y": 431.3767375946045,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "b70a8774.407208"\r
+                "a03ed9c9.218c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b70a8774.407208",\r
+        "id": "a03ed9c9.218c88",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 975.9062156677246,\r
-        "y": 426.387095451355,\r
-        "z": "83799888.3d8488",\r
+        "x": 989.9270515441895,\r
+        "y": 431.37668323516846,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "a3935f63.e64dc"\r
+                "3a45df3c.4f62e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3935f63.e64dc",\r
+        "id": "3a45df3c.4f62e",\r
         "type": "set",\r
         "name": "set providerIpAddress",\r
         "xml": "<set>\n<parameter name='prop.wan.providerIpAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1142.2397994995117,\r
-        "y": 426.84827709198,\r
-        "z": "83799888.3d8488",\r
+        "x": 1156.2606353759766,\r
+        "y": 431.83786487579346,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "383fea5a.143066",\r
+        "id": "6d16b1ef.6edda",\r
         "type": "switchNode",\r
         "name": "switch inputBandwidth",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'inputBandwidth'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 790.9057731628418,\r
-        "y": 538.3869562149048,\r
-        "z": "83799888.3d8488",\r
+        "x": 804.9266090393066,\r
+        "y": 543.3765439987183,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "45b075bc.f36a3c"\r
+                "299964fe.6aa9cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45b075bc.f36a3c",\r
+        "id": "299964fe.6aa9cc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 967.9059715270996,\r
-        "y": 537.3870210647583,\r
-        "z": "83799888.3d8488",\r
+        "x": 981.9268074035645,\r
+        "y": 542.3766088485718,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "7f4d1606.062148"\r
+                "a43497c1.d28c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f4d1606.062148",\r
+        "id": "a43497c1.d28c98",\r
         "type": "set",\r
         "name": "set inputBandwidth",\r
         "xml": "<set>\n<parameter name='prop.wan.inputBandwidth' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1175.2397212982178,\r
-        "y": 531.8481855392456,\r
-        "z": "83799888.3d8488",\r
+        "x": 1189.2605571746826,\r
+        "y": 536.8377733230591,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18a75045.9bb5e",\r
+        "id": "f44a56f3.db7c08",\r
         "type": "switchNode",\r
         "name": "switch outputBandwidth",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'outputBandwidth'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 796.9057731628418,\r
-        "y": 577.3869562149048,\r
-        "z": "83799888.3d8488",\r
+        "x": 810.9266090393066,\r
+        "y": 582.3765439987183,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "2be3aa98.e7daa6"\r
+                "6b63ec76.cea694"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2be3aa98.e7daa6",\r
+        "id": "6b63ec76.cea694",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 980.905969619751,\r
-        "y": 577.3870649337769,\r
-        "z": "83799888.3d8488",\r
+        "x": 994.9268054962158,\r
+        "y": 582.3766527175903,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "7e2e3a9b.578594"\r
+                "9c582c07.4759e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e2e3a9b.578594",\r
+        "id": "9c582c07.4759e",\r
         "type": "set",\r
         "name": "set outputBandwidth",\r
         "xml": "<set>\n<parameter name='prop.wan.outputBandwidth' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1177.2397441864014,\r
-        "y": 570.8481683731079,\r
-        "z": "83799888.3d8488",\r
+        "x": 1191.2605800628662,\r
+        "y": 575.8377561569214,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91d20588.adacd8",\r
+        "id": "b5fed085.d4d7c",\r
         "type": "switchNode",\r
         "name": "switch description",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'description'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 786.9057273864746,\r
-        "y": 198.387113571167,\r
-        "z": "83799888.3d8488",\r
+        "x": 800.9265632629395,\r
+        "y": 203.37670135498047,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "8acddcca.d85a2"\r
+                "92449f78.32a97"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8acddcca.d85a2",\r
+        "id": "92449f78.32a97",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978.9059715270996,\r
-        "y": 199.3871431350708,\r
-        "z": "83799888.3d8488",\r
+        "x": 992.9268074035645,\r
+        "y": 204.37673091888428,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "f82affc6.722b5"\r
+                "8982915c.e8181"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f82affc6.722b5",\r
+        "id": "8982915c.e8181",\r
         "type": "set",\r
         "name": "set description",\r
         "xml": "<set>\n<parameter name='prop.wan.description' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1129.239974975586,\r
-        "y": 198.84835243225098,\r
-        "z": "83799888.3d8488",\r
+        "x": 1143.2608108520508,\r
+        "y": 203.83794021606445,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a41eaf2.439f75",\r
+        "id": "8f7cd129.e628b",\r
         "type": "switchNode",\r
         "name": "switch portNumber",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portNumber'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 779.2389717102051,\r
-        "y": 351.0047388076782,\r
-        "z": "83799888.3d8488",\r
+        "x": 793.2598075866699,\r
+        "y": 355.9943265914917,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "9190cac8.65bcb8"\r
+                "75d70ce6.dcc884"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9190cac8.65bcb8",\r
+        "id": "75d70ce6.dcc884",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 970.239143371582,\r
-        "y": 354.00476837158203,\r
-        "z": "83799888.3d8488",\r
+        "x": 984.2599792480469,\r
+        "y": 358.9943561553955,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "bc0c9c4f.ffd6c"\r
+                "15c7df8.ee5e621"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc0c9c4f.ffd6c",\r
+        "id": "15c7df8.ee5e621",\r
         "type": "set",\r
         "name": "set portNumber",\r
         "xml": "<set>\n<parameter name='prop.wan.portNumber' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1124.2394714355469,\r
-        "y": 353.6047830581665,\r
-        "z": "83799888.3d8488",\r
+        "x": 1138.2603073120117,\r
+        "y": 358.59437084198,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49351eca.09882",\r
+        "id": "d7c2c346.bb4d6",\r
         "type": "switchNode",\r
         "name": "switch portType",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portType'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 780.134090423584,\r
-        "y": 270.97804832458496,\r
-        "z": "83799888.3d8488",\r
+        "x": 794.1549263000488,\r
+        "y": 275.96763610839844,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "9c7436d2.ff2978"\r
+                "ca83aa38.707c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c7436d2.ff2978",\r
+        "id": "ca83aa38.707c38",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 975.1341781616211,\r
-        "y": 270.97807788848877,\r
-        "z": "83799888.3d8488",\r
+        "x": 989.1550140380859,\r
+        "y": 275.96766567230225,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "45817322.3ae1fc"\r
+                "2f419e64.d2b172"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45817322.3ae1fc",\r
+        "id": "2f419e64.d2b172",\r
         "type": "set",\r
         "name": "set portType",\r
         "xml": "<set>\n<parameter name='prop.wan.portType' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1122.134506225586,\r
-        "y": 271.57809257507324,\r
-        "z": "83799888.3d8488",\r
+        "x": 1136.1553421020508,\r
+        "y": 276.5676803588867,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9e43e20.584a3",\r
+        "id": "bc53deb3.66dc2",\r
         "type": "set",\r
         "name": "set transportnetworkName",\r
         "xml": "<set>\n<parameter name='prop.wan.transportNetworkName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1224.0102291107178,\r
-        "y": 496.39741706848145,\r
-        "z": "83799888.3d8488",\r
+        "x": 1238.0310649871826,\r
+        "y": 501.3870048522949,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "878c2a18.4ab5f8",\r
+        "id": "2040cf67.854b5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1012.6763229370117,\r
-        "y": 497.93633460998535,\r
-        "z": "83799888.3d8488",\r
+        "x": 1026.6971588134766,\r
+        "y": 502.9259223937988,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "c9e43e20.584a3"\r
+                "bc53deb3.66dc2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "286e48cc.e48988",\r
+        "id": "e772d25.ba6eb3",\r
         "type": "switchNode",\r
         "name": "switch transportnetworkName",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'transportNetworkName'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 813.6761474609375,\r
-        "y": 501.9360647201538,\r
-        "z": "83799888.3d8488",\r
+        "x": 827.6969833374023,\r
+        "y": 506.9256525039673,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "878c2a18.4ab5f8"\r
+                "2040cf67.854b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4feaef6.6438f",\r
+        "id": "638cf29c.12828c",\r
         "type": "switchNode",\r
         "name": "switch id",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'id'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772.0097541809082,\r
-        "y": 132.39711570739746,\r
-        "z": "83799888.3d8488",\r
+        "x": 786.030590057373,\r
+        "y": 137.38670349121094,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "c4e97c71.2edee"\r
+                "24f19492.f009fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4e97c71.2edee",\r
+        "id": "24f19492.f009fc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 973.009895324707,\r
-        "y": 130.3971462249756,\r
-        "z": "83799888.3d8488",\r
+        "x": 987.0307312011719,\r
+        "y": 135.38673400878906,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "fa0065d4.357e68"\r
+                "a4b229b.62831d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa0065d4.357e68",\r
+        "id": "a4b229b.62831d8",\r
         "type": "set",\r
         "name": "set id",\r
         "xml": "<set>\n<parameter name='prop.wan.id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1115.0102424621582,\r
-        "y": 125.99725341796875,\r
-        "z": "83799888.3d8488",\r
+        "x": 1129.031078338623,\r
+        "y": 130.98684120178223,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60fcaabc.ca5bf4",\r
+        "id": "2d9d0a07.21b996",\r
         "type": "switchNode",\r
         "name": "switch devicePortId",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'devicePortId'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782.0104598999023,\r
-        "y": 622.010443687439,\r
-        "z": "83799888.3d8488",\r
+        "x": 796.0312957763672,\r
+        "y": 627.0000314712524,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "642147fe.576a98"\r
+                "88000960.246438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "642147fe.576a98",\r
+        "id": "88000960.246438",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 981.0106258392334,\r
-        "y": 616.0105199813843,\r
-        "z": "83799888.3d8488",\r
+        "x": 995.0314617156982,\r
+        "y": 621.0001077651978,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "fd4863f3.2dd12"\r
+                "fabf24be.4a2ae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd4863f3.2dd12",\r
+        "id": "fabf24be.4a2ae8",\r
         "type": "set",\r
         "name": "set devicePortId",\r
         "xml": "<set>\n<parameter name='prop.wan.devicePortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1180.3443698883057,\r
-        "y": 615.4716176986694,\r
-        "z": "83799888.3d8488",\r
+        "x": 1194.3652057647705,\r
+        "y": 620.4612054824829,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d17b4c90.52ccd",\r
+        "id": "f4e0170c.c926f8",\r
         "type": "switchNode",\r
         "name": "switch wanPortId",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'wanPortId'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772.0104598999023,\r
-        "y": 658.0104455947876,\r
-        "z": "83799888.3d8488",\r
+        "x": 786.0312957763672,\r
+        "y": 663.0000333786011,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "f3f82bbf.a22db8"\r
+                "6611a8d1.372738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3f82bbf.a22db8",\r
+        "id": "6611a8d1.372738",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 983.0106239318848,\r
-        "y": 651.0105228424072,\r
-        "z": "83799888.3d8488",\r
+        "x": 997.0314598083496,\r
+        "y": 656.0001106262207,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "9cec917d.42e1c"\r
+                "148c330d.e6ff2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cec917d.42e1c",\r
+        "id": "148c330d.e6ff2d",\r
         "type": "set",\r
         "name": "set wanPortId",\r
         "xml": "<set>\n<parameter name='prop.wan.wanPortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1180.3443698883057,\r
-        "y": 655.4716176986694,\r
-        "z": "83799888.3d8488",\r
+        "x": 1194.3652057647705,\r
+        "y": 660.4612054824829,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e6f5b113.db834",\r
+        "id": "1bb7d8d3.393ca7",\r
         "type": "set",\r
         "name": "set apn",\r
         "xml": "<set>\n<parameter name='prop.wan.apn-name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 1121.0000076293945,\r
-        "y": 310.01041412353516,\r
-        "z": "83799888.3d8488",\r
+        "x": 1135.0208435058594,\r
+        "y": 315.00000190734863,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a13a6a0.eb644a",\r
+        "id": "ec6279c6.c6c888",\r
         "type": "switchNode",\r
         "name": "switch apn",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'apn'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 770.0000076293945,\r
-        "y": 309.01041412353516,\r
-        "z": "83799888.3d8488",\r
+        "x": 784.0208435058594,\r
+        "y": 314.00000190734863,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "cd547003.96af2"\r
+                "48104b80.431324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd547003.96af2",\r
+        "id": "48104b80.431324",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 965.0000953674316,\r
-        "y": 309.01044368743896,\r
-        "z": "83799888.3d8488",\r
+        "x": 979.0209312438965,\r
+        "y": 314.00003147125244,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "e6f5b113.db834"\r
+                "1bb7d8d3.393ca7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19ce9dfd.f8a2f2",\r
+        "id": "7c9c948.6f89d6c",\r
         "type": "switchNode",\r
         "name": "switch publicIP",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'publicIP'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 768.0000305175781,\r
-        "y": 701.0104351043701,\r
-        "z": "83799888.3d8488",\r
+        "x": 782.020866394043,\r
+        "y": 706.0000228881836,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "fadc805c.91335"\r
+                "bd2c91e6.2d3bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fadc805c.91335",\r
+        "id": "bd2c91e6.2d3bd",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.0002021789551,\r
-        "y": 696.010516166687,\r
-        "z": "83799888.3d8488",\r
+        "x": 991.0210380554199,\r
+        "y": 701.0001039505005,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "bda8c6bd.b7ac88"\r
+                "432b35f4.5934dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bda8c6bd.b7ac88",\r
+        "id": "432b35f4.5934dc",\r
         "type": "set",\r
         "name": "set publicIP",\r
         "xml": "<set>\n<parameter name='prop.wan.publicIP' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1182.3338661193848,\r
-        "y": 694.4716167449951,\r
-        "z": "83799888.3d8488",\r
+        "x": 1196.3547019958496,\r
+        "y": 699.4612045288086,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a399cdca.37b7a",\r
+        "id": "97c178d3.f58628",\r
         "type": "switchNode",\r
         "name": "switch IPMode",\r
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.0000305175781,\r
-        "y": 742.0104360580444,\r
-        "z": "83799888.3d8488",\r
+        "x": 792.020866394043,\r
+        "y": 747.0000238418579,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "728b6eda.0249c"\r
+                "12f9c78d.14c828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "728b6eda.0249c",\r
+        "id": "12f9c78d.14c828",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977.0002822875977,\r
-        "y": 741.0105991363525,\r
-        "z": "83799888.3d8488",\r
+        "x": 991.0211181640625,\r
+        "y": 746.000186920166,\r
+        "z": "192759e2.8ca676",\r
         "wires": [\r
             [\r
-                "43404525.61dcfc"\r
+                "6609b7c6.fc8a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43404525.61dcfc",\r
+        "id": "6609b7c6.fc8a48",\r
         "type": "set",\r
         "name": "set IPMode",\r
         "xml": "<set>\n<parameter name='prop.wan.IPMode' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",\r
         "comments": "",\r
-        "x": 1188.3339176177979,\r
-        "y": 739.471586227417,\r
-        "z": "83799888.3d8488",\r
+        "x": 1202.3547534942627,\r
+        "y": 744.4611740112305,\r
+        "z": "192759e2.8ca676",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 82bf08e..f21ff99
                     </return>\r
                 </outcome>\r
             </switch>\r
-            <switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`'>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vf-module-information.vf-module-id is a required input" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='assign'>\r
                     <block atomic="true">\r
index e42b3bd..30d7116 100644 (file)
@@ -3,7 +3,7 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
     <method rpc='sdwan-get-wan-param' mode='sync'>\r
         <block atomic="true">\r
-            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">\r
+            <for index="idx" start="0" end="`$vf-module-request-input.vf-module-input-parameters.param_length`">\r
                 <block>\r
                     <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'id'`">\r
                         <outcome value='true'>\r