Update Generic_Restart DG for Named Query
Update Generic_Restart DG to correct space after prefix for AAI Named Query
Issue-ID: APPC-268
Change-Id: I3b9a28404b32e0cc9576a69bd0f737561585ebe7
Signed-off-by: Scott Seabolt <js9808@att.com>
diff --git a/platform-logic/appc/src/main/json/APPC_method_Generic_Restart_3.0.0.json b/platform-logic/appc/src/main/json/APPC_method_Generic_Restart_3.0.0.json
index 6823cf4..2bdecfe 100644
--- a/platform-logic/appc/src/main/json/APPC_method_Generic_Restart_3.0.0.json
+++ b/platform-logic/appc/src/main/json/APPC_method_Generic_Restart_3.0.0.json
@@ -1 +1 @@
-[{"id":"c28e08a8.aafdd","type":"method","name":"Generic_Restart","xml":"<method rpc='Generic_Restart' mode='sync'>\n","comments":"","outputs":1,"x":155.00001525878906,"y":81.38096141815185,"z":"efb2d3cd.6f9f","wires":[["525173d9.9f9768"]]},{"id":"74c9c183.a2826c","type":"service-logic","name":"APPC 3.0.0","module":"APPC","version":"3.0.0","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='APPC' version='3.0.0'>","outputs":1,"x":255.14281463623047,"y":36.66666793823242,"z":"efb2d3cd.6f9f","wires":[["c28e08a8.aafdd"]]},{"id":"976c5310.b6d958","type":"dgstart","name":"DGSTART","outputs":1,"x":104.28568267822265,"y":36.6666784286499,"z":"efb2d3cd.6f9f","wires":[["74c9c183.a2826c"]]},{"id":"d88c6d4d.2e7bc8","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":127.33335494995117,"y":482.42841148376465,"z":"efb2d3cd.6f9f","wires":[["6bae6aa4.352ff4","4e931e7c.c77e5","4402.f7adfffe08","3843e9f0.0e6caa"]]},{"id":"3002b3cd.763658","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":319.0001525878906,"y":1027.7618589401245,"z":"efb2d3cd.6f9f","wires":[]},{"id":"7ae358d1.458868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736.3809013366699,"y":529.3332748413086,"z":"efb2d3cd.6f9f","wires":[["a027a3e.486c42"]]},{"id":"eb93d0ed.b7b17","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1069.6666679382324,"y":568.0475883483887,"z":"efb2d3cd.6f9f","wires":[]},{"id":"62303b37.e8cc94","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1811.3572082519531,"y":1264.952410697937,"z":"efb2d3cd.6f9f","wires":[["90d18bd7.251fc8"]]},{"id":"a50a4cca.2efd38","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":468.52392578125,"y":444.6190462112427,"z":"efb2d3cd.6f9f","wires":[]},{"id":"74318252.cb0768","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1862.9760360717773,"y":1098.5715322494506,"z":"efb2d3cd.6f9f","wires":[["faa78af4.fe2978"]]},{"id":"90d18bd7.251fc8","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":1993.3572082519531,"y":1265.952410697937,"z":"efb2d3cd.6f9f","wires":[["b836ce98.c2d36","9f1098be.0487c8","cd227dfb.8e095"]]},{"id":"cd227dfb.8e095","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2180.7857971191406,"y":1484.3809995651245,"z":"efb2d3cd.6f9f","wires":[["6ebeb5d2.446424"]]},{"id":"b836ce98.c2d36","type":"other","name":"outcome_CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":2248.214874267578,"y":1373.809588432312,"z":"efb2d3cd.6f9f","wires":[["9960b720.429068"]]},{"id":"9f1098be.0487c8","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":2193.3570861816406,"y":1267.3809995651245,"z":"efb2d3cd.6f9f","wires":[["6473e66.372b258"]]},{"id":"bd1ba349.7018d8","type":"execute","name":"execute_Restart","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].vserver.vserver-selflink`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].inventory-response-items.inventory-response-item[0].inventory-response-items.inventory-response-item[0].cloud-region.identity-url`\" />\n\n","comments":"","outputs":1,"x":1713.9763145446777,"y":1134.5714120864868,"z":"efb2d3cd.6f9f","wires":[["74318252.cb0768","62303b37.e8cc94"]]},{"id":"4402.f7adfffe08","type":"switchNode","name":"switch: vnfInfo","xml":"<switch test='`$vnfInfo`'>\n","comments":"","outputs":1,"x":497.80950927734375,"y":623.4285259246826,"z":"efb2d3cd.6f9f","wires":[["11a9f3a4.224b78"]]},{"id":"85cef4c2.c5e388","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in retrieving VNF Hierachy\" />","comments":"","x":1059.642951965332,"y":671.8094863891601,"z":"efb2d3cd.6f9f","wires":[]},{"id":"a027a3e.486c42","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":889.2381019592285,"y":530.1904697418213,"z":"efb2d3cd.6f9f","wires":[["427237ef.3aa128","eb93d0ed.b7b17"]]},{"id":"427237ef.3aa128","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in running AAI Named Query\" />\n\n","comments":"","outputs":1,"x":1058.3809852600097,"y":531.4761810302734,"z":"efb2d3cd.6f9f","wires":[["4705f9e3.2d84f4"]]},{"id":"4705f9e3.2d84f4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1200.9523429870605,"y":531.761848449707,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"afa47f95.2bf15","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":889.7380981445312,"y":624.4285564422607,"z":"efb2d3cd.6f9f","wires":[["85cef4c2.c5e388","913da193.f270e8"]]},{"id":"913da193.f270e8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in retrieving VNF Hierachy\" />","comments":"","outputs":1,"x":1045.4998054504394,"y":623.8094882965088,"z":"efb2d3cd.6f9f","wires":[["558576e5.cef198"]]},{"id":"558576e5.cef198","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1196.7856369018554,"y":624.6666316986084,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"faa78af4.fe2978","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2020.2139434814453,"y":1099.952467918396,"z":"efb2d3cd.6f9f","wires":[["d2be88a2.c0ce58","eaca44c0.8fa658"]]},{"id":"d2be88a2.c0ce58","type":"execute","name":"Report_Failure_in_Restart","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in restart for:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":2262.7857971191406,"y":1100.666766166687,"z":"efb2d3cd.6f9f","wires":[["78d6cea7.ad7914"]]},{"id":"78d6cea7.ad7914","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2512.7853088378906,"y":1100.666766166687,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"9960b720.429068","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2492.785675048828,"y":1373.952410697937,"z":"efb2d3cd.6f9f","wires":[["a7dc114e.b060f","4e8e89a5.b92628"]]},{"id":"a7dc114e.b060f","type":"execute","name":"Report_Context_not_found","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":2767.928497314453,"y":1374.952410697937,"z":"efb2d3cd.6f9f","wires":[["3349e73e.3123"]]},{"id":"3349e73e.3123","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3163.7872619628906,"y":1375.5238218307495,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"6473e66.372b258","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2486.7862854003906,"y":1267.3809995651245,"z":"efb2d3cd.6f9f","wires":[["85aca546.950d98","4e8e89a5.b92628"]]},{"id":"85aca546.950d98","type":"execute","name":"Report_Error_occoured_while_restarting_the_server","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while restarting the server:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":2850.214385986328,"y":1268.238055229187,"z":"efb2d3cd.6f9f","wires":[["46ff16c7.47a864"]]},{"id":"46ff16c7.47a864","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3162.7862854003906,"y":1267.3809995651245,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"3b81a4e0.801948","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":395.4285430908203,"y":281.6984214782715,"z":"efb2d3cd.6f9f","wires":[["24478c4a.97445c"]]},{"id":"525173d9.9f9768","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":177.2856674194336,"y":133.95242881774902,"z":"efb2d3cd.6f9f","wires":[["3b81a4e0.801948","ea869050.d0e8a8","bfee3bf8.6cdc08"]]},{"id":"9d5a80f1.21cfc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":732.5714263916016,"y":169.76204586029053,"z":"efb2d3cd.6f9f","wires":[]},{"id":"86965cd.8414a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":536.523796081543,"y":135.52403259277344,"z":"efb2d3cd.6f9f","wires":[["9d5a80f1.21cfc8","8e8181b6.8a37c"]]},{"id":"8e8181b6.8a37c","type":"execute","name":"Report_Error_Flattening_Payload_Json","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":817.7143020629883,"y":135.47638034820557,"z":"efb2d3cd.6f9f","wires":[["516bbf1d.b395bc"]]},{"id":"ea869050.d0e8a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":396.9999351501465,"y":135.04771900177002,"z":"efb2d3cd.6f9f","wires":[["86965cd.8414a2"]]},{"id":"13ca6872.fc2048","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":734.5714569091797,"y":252.90487384796142,"z":"efb2d3cd.6f9f","wires":[]},{"id":"402368d9.6b6274","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":547.6667556762695,"y":217.2382688522339,"z":"efb2d3cd.6f9f","wires":[["13ca6872.fc2048","dc34898e.b17a18"]]},{"id":"dc34898e.b17a18","type":"execute","name":"Report_Error_Loading_Json_Flattening_Plugin","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","outputs":1,"x":839.4285659790039,"y":217.47639179229736,"z":"efb2d3cd.6f9f","wires":[["cf770f7c.16a89"]]},{"id":"bfee3bf8.6cdc08","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":399.14286041259765,"y":217.19056224822998,"z":"efb2d3cd.6f9f","wires":[["402368d9.6b6274"]]},{"id":"6ebeb5d2.446424","type":"execute","name":"Report_Success_in_Restart","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Restart event executed successfully for ' + $VNF.VM[$i].URL`\" />\n","comments":"","outputs":1,"x":2476.6903381347656,"y":1486.0477476119995,"z":"efb2d3cd.6f9f","wires":[["4531bcb.c6d5a84","57d1b7dc.0275e"]]},{"id":"4531bcb.c6d5a84","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2734.689971923828,"y":1538.047625541687,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"57d1b7dc.0275e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2734.689971923828,"y":1486.047625541687,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"4e931e7c.c77e5","type":"get-resource","name":"AAI_Named_Query","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"named-query\" key=\"named-query-uuid = '037eb932-edac-48f5-9782-c19c0aa5a031' AND prefix='namedQueryData' \" local-only=\"false\" pfx=\"vnfInfo\" >\n","comments":"","outputs":1,"x":509.0951614379883,"y":529.9047536849976,"z":"efb2d3cd.6f9f","wires":[["7ae358d1.458868"]]},{"id":"6bae6aa4.352ff4","type":"set","name":"set","xml":"<set>\n<parameter name='namedQueryData.instance-filters.instance-filter[0].generic-vnf.vnf-id' value='`$input.action-identifiers.vnf-id`' />\n<parameter name='namedQueryData.instance-filters.instance-filter_length' value='`1`' />","comments":"","x":472.52384185791015,"y":479.6189994812012,"z":"efb2d3cd.6f9f","wires":[]},{"id":"24478c4a.97445c","type":"switchNode","name":"switch: input.action-identifiers.vnf-id","xml":"<switch test='$input.action-identifiers.vnf-id'>\n","comments":"","outputs":1,"x":188.2857208251953,"y":329.4285087585449,"z":"efb2d3cd.6f9f","wires":[["ae98abf3.0e1938","4fe3937b.c750f4"]]},{"id":"ae98abf3.0e1938","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":444.5952911376953,"y":328.9285497665405,"z":"efb2d3cd.6f9f","wires":[["dff5e759.f86ce8"]]},{"id":"dff5e759.f86ce8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-message\" value=\"input.action-identifiers.vnf-id is null\" />\n","comments":"","x":851.9880218505859,"y":329.0397262573242,"z":"efb2d3cd.6f9f","wires":[]},{"id":"ef48adc4.8ea4b","type":"for","name":"for: vserver","xml":"<for index='vserverIndex' start='0' end='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-length' >\n","comments":"","outputs":1,"x":312.8570861816406,"y":826.7141904830933,"z":"efb2d3cd.6f9f","wires":[["d37528d4.4e265"]]},{"id":"3843e9f0.0e6caa","type":"switchNode","name":"switch: vnf-id equal vnf-id","xml":"<switch test='`$vnfInfo.inventory-response-item[0].generic-vnf.vnf-id == $input.action-identifiers.vnf-id`'>\n","comments":"","outputs":1,"x":528.523796081543,"y":708.7141733169556,"z":"efb2d3cd.6f9f","wires":[["6d5d0750.5ed474","5babc326.1971f"]]},{"id":"a0c06e68.57513","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":1086.7143173217773,"y":778.5237855911255,"z":"efb2d3cd.6f9f","wires":[]},{"id":"48a8e663.a597bc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":916.8094635009766,"y":731.1428556442261,"z":"efb2d3cd.6f9f","wires":[["a0c06e68.57513","e3b568f.26436d8"]]},{"id":"e3b568f.26436d8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure matching vnf-id to VNF Hierachy\" />","comments":"","outputs":1,"x":1072.5711708068847,"y":730.5237874984741,"z":"efb2d3cd.6f9f","wires":[["ac6c26ef.2272e8"]]},{"id":"ac6c26ef.2272e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1212.1903076171875,"y":729.7142806053162,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"eaca44c0.8fa658","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2278.5768127441406,"y":1183.3810300827026,"z":"efb2d3cd.6f9f","wires":[]},{"id":"879634a3.4c4338","type":"comment","name":"This should probably just log and continue other restarts","info":"","comments":"","x":2390.3570861816406,"y":1139.3810300827026,"z":"efb2d3cd.6f9f","wires":[]},{"id":"4e8e89a5.b92628","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2745.816925048828,"y":1319.3809995651245,"z":"efb2d3cd.6f9f","wires":[]},{"id":"d37528d4.4e265","type":"switchNode","name":"switch: vserver-selflink","xml":"<switch test='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].vserver.vserver-selflink'>\n","comments":"","outputs":1,"x":518.8570861816406,"y":827.3809385299683,"z":"efb2d3cd.6f9f","wires":[["7a3fb8b4.c11bb8","17f06100.54e653"]]},{"id":"1aa96a4.f19d456","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in retrieving vserver-selflink from VNF Hierachy\" />","comments":"","x":1053.714267730713,"y":875.5239143371582,"z":"efb2d3cd.6f9f","wires":[]},{"id":"3bb26c38.66c72c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":883.8094139099121,"y":828.1429843902588,"z":"efb2d3cd.6f9f","wires":[["1aa96a4.f19d456","19276690.ae4b4d"]]},{"id":"19276690.ae4b4d","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in retrieving vserver-selflink from VNF Hierachy\" />","comments":"","outputs":1,"x":1039.5711975097656,"y":827.5238828659058,"z":"efb2d3cd.6f9f","wires":[["3ffa8895.8669e8"]]},{"id":"3ffa8895.8669e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1190.8569526672363,"y":828.3810596466064,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"4079e197.d368b4","type":"switchNode","name":"switch: identity-url","xml":"<switch test='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].inventory-response-items.inventory-response-item[0].inventory-response-items.inventory-response-item[0].cloud-region.identity-url'>\n","comments":"","outputs":1,"x":757.5238037109375,"y":945.7143125534058,"z":"efb2d3cd.6f9f","wires":[["1239e71c.4c31f5","c4484652.927c6"]]},{"id":"fb1df0ec.df495","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in retrieving identity-url from VNF Hierachy\" />","comments":"","x":1313.714210510254,"y":975.5238924026489,"z":"efb2d3cd.6f9f","wires":[]},{"id":"f343c245.3e626","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1143.8093566894531,"y":928.1429624557495,"z":"efb2d3cd.6f9f","wires":[["fb1df0ec.df495","dd9be377.dae04"]]},{"id":"dd9be377.dae04","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in retrieving identity-url from VNF Hierachy\" />","comments":"","outputs":1,"x":1299.5710639953613,"y":927.5238943099976,"z":"efb2d3cd.6f9f","wires":[["8a9fbe17.103c08"]]},{"id":"8a9fbe17.103c08","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1445.8568420410156,"y":927.3810606002808,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"34f6c984.c97166","type":"switchNode","name":"switch: vm-id present","xml":"<switch test='$vm-id'>\n","comments":"","outputs":1,"x":1008.6666564941406,"y":1040.547625541687,"z":"efb2d3cd.6f9f","wires":[["8000f5b5.764778","57289157.8a7af4"]]},{"id":"8000f5b5.764778","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1232.9999351501464,"y":1117.6142377853393,"z":"efb2d3cd.6f9f","wires":[["bd1ba349.7018d8"]]},{"id":"8543bb4e.9db718","type":"switchNode","name":"switch: vserver-selflink equal vnf-id","xml":"<switch test='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].vserver.vserver-selflink == $vm-id'>\n","comments":"","outputs":1,"x":1453.333267211914,"y":1032.6142950057983,"z":"efb2d3cd.6f9f","wires":[["e2419e1e.bb482"]]},{"id":"11a9f3a4.224b78","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":702.3333778381348,"y":623.6474990844726,"z":"efb2d3cd.6f9f","wires":[["afa47f95.2bf15"]]},{"id":"6d5d0750.5ed474","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":747.3333358764648,"y":709.7141351699829,"z":"efb2d3cd.6f9f","wires":[["48a8e663.a597bc"]]},{"id":"7a3fb8b4.c11bb8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":709.6666793823242,"y":828.0476322174072,"z":"efb2d3cd.6f9f","wires":[["3bb26c38.66c72c"]]},{"id":"1239e71c.4c31f5","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":961.6666221618652,"y":928.047610282898,"z":"efb2d3cd.6f9f","wires":[["f343c245.3e626"]]},{"id":"e2419e1e.bb482","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1570.1431007385254,"y":1091.0477285385131,"z":"efb2d3cd.6f9f","wires":[["bd1ba349.7018d8"]]},{"id":"516bbf1d.b395bc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1089.1666412353515,"y":136.38096141815185,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"cf770f7c.16a89","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1137.5952072143554,"y":217.95244979858398,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"4fe3937b.c750f4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":447.50001525878906,"y":368.0476280848185,"z":"efb2d3cd.6f9f","wires":[["d88c6d4d.2e7bc8"]]},{"id":"17f06100.54e653","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":705.8333969116211,"y":871.3808832168579,"z":"efb2d3cd.6f9f","wires":[["4079e197.d368b4"]]},{"id":"57289157.8a7af4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1234.1667175292968,"y":1043.0477657318115,"z":"efb2d3cd.6f9f","wires":[["8543bb4e.9db718"]]},{"id":"c4484652.927c6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":989.1666819254556,"y":984.714294751485,"z":"efb2d3cd.6f9f","wires":[["34f6c984.c97166"]]},{"id":"5babc326.1971f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":742.5000038146973,"y":759.714213848114,"z":"efb2d3cd.6f9f","wires":[["93e5feeb.17ed6"]]},{"id":"93e5feeb.17ed6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":105.8333740234375,"y":826.3808546066284,"z":"efb2d3cd.6f9f","wires":[["ef48adc4.8ea4b","3002b3cd.763658"]]}]
+[{"id":"c28e08a8.aafdd","type":"method","name":"Generic_Restart","xml":"<method rpc='Generic_Restart' mode='sync'>\n","comments":"","outputs":1,"x":155.00001525878906,"y":81.38096141815185,"z":"efb2d3cd.6f9f","wires":[["525173d9.9f9768"]]},{"id":"74c9c183.a2826c","type":"service-logic","name":"APPC 3.0.0","module":"APPC","version":"3.0.0","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='APPC' version='3.0.0'>","outputs":1,"x":255.14281463623047,"y":36.66666793823242,"z":"efb2d3cd.6f9f","wires":[["c28e08a8.aafdd"]]},{"id":"976c5310.b6d958","type":"dgstart","name":"DGSTART","outputs":1,"x":104.28568267822265,"y":36.6666784286499,"z":"efb2d3cd.6f9f","wires":[["74c9c183.a2826c"]]},{"id":"d88c6d4d.2e7bc8","type":"block","name":"block : atomic","xml":"<block atomic='true'>\n","atomic":"true","comments":"","outputs":1,"x":127.33335494995117,"y":482.42841148376465,"z":"efb2d3cd.6f9f","wires":[["6bae6aa4.352ff4","4e931e7c.c77e5","4402.f7adfffe08","3843e9f0.0e6caa"]]},{"id":"3002b3cd.763658","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":319.0001525878906,"y":1027.7618589401245,"z":"efb2d3cd.6f9f","wires":[]},{"id":"7ae358d1.458868","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736.3809013366699,"y":529.3332748413086,"z":"efb2d3cd.6f9f","wires":[["a027a3e.486c42"]]},{"id":"eb93d0ed.b7b17","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":1069.6666679382324,"y":568.0475883483887,"z":"efb2d3cd.6f9f","wires":[]},{"id":"62303b37.e8cc94","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1811.3572082519531,"y":1264.952410697937,"z":"efb2d3cd.6f9f","wires":[["90d18bd7.251fc8"]]},{"id":"a50a4cca.2efd38","type":"comment","name":"Fetch all VMs and VNFCs from AA&I for given VNF_ID","info":"","comments":"","x":468.52392578125,"y":444.6190462112427,"z":"efb2d3cd.6f9f","wires":[]},{"id":"74318252.cb0768","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1862.9760360717773,"y":1098.5715322494506,"z":"efb2d3cd.6f9f","wires":[["faa78af4.fe2978"]]},{"id":"90d18bd7.251fc8","type":"switchNode","name":"switch","xml":"<switch test='`$RESTART_STATUS`'>\n","comments":"","outputs":1,"x":1993.3572082519531,"y":1265.952410697937,"z":"efb2d3cd.6f9f","wires":[["b836ce98.c2d36","9f1098be.0487c8","cd227dfb.8e095"]]},{"id":"cd227dfb.8e095","type":"success","name":"outcome_SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":2180.7857971191406,"y":1484.3809995651245,"z":"efb2d3cd.6f9f","wires":[["6ebeb5d2.446424"]]},{"id":"b836ce98.c2d36","type":"other","name":"outcome_CONTEXT_NOT_FOUND","xml":"<outcome value='CONTEXT_NOT_FOUND'>\n","comments":"","outputs":1,"x":2248.214874267578,"y":1373.809588432312,"z":"efb2d3cd.6f9f","wires":[["9960b720.429068"]]},{"id":"9f1098be.0487c8","type":"other","name":"outcome_ERROR","xml":"<outcome value='ERROR'>\n","comments":"","outputs":1,"x":2193.3570861816406,"y":1267.3809995651245,"z":"efb2d3cd.6f9f","wires":[["6473e66.372b258"]]},{"id":"bd1ba349.7018d8","type":"execute","name":"execute_Restart","xml":"<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='restartServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].vserver.vserver-selflink`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].inventory-response-items.inventory-response-item[0].inventory-response-items.inventory-response-item[0].cloud-region.identity-url`\" />\n\n","comments":"","outputs":1,"x":1713.9763145446777,"y":1134.5714120864868,"z":"efb2d3cd.6f9f","wires":[["74318252.cb0768","62303b37.e8cc94"]]},{"id":"4402.f7adfffe08","type":"switchNode","name":"switch: vnfInfo","xml":"<switch test='`$vnfInfo`'>\n","comments":"","outputs":1,"x":497.80950927734375,"y":623.4285259246826,"z":"efb2d3cd.6f9f","wires":[["11a9f3a4.224b78"]]},{"id":"85cef4c2.c5e388","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in retrieving VNF Hierachy\" />","comments":"","x":1059.642951965332,"y":671.8094863891601,"z":"efb2d3cd.6f9f","wires":[]},{"id":"a027a3e.486c42","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":889.2381019592285,"y":530.1904697418213,"z":"efb2d3cd.6f9f","wires":[["427237ef.3aa128","eb93d0ed.b7b17"]]},{"id":"427237ef.3aa128","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Exception in running AAI Named Query\" />\n\n","comments":"","outputs":1,"x":1058.3809852600097,"y":531.4761810302734,"z":"efb2d3cd.6f9f","wires":[["4705f9e3.2d84f4"]]},{"id":"4705f9e3.2d84f4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1200.9523429870605,"y":531.761848449707,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"afa47f95.2bf15","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":889.7380981445312,"y":624.4285564422607,"z":"efb2d3cd.6f9f","wires":[["85cef4c2.c5e388","913da193.f270e8"]]},{"id":"913da193.f270e8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in retrieving VNF Hierachy\" />","comments":"","outputs":1,"x":1045.4998054504394,"y":623.8094882965088,"z":"efb2d3cd.6f9f","wires":[["558576e5.cef198"]]},{"id":"558576e5.cef198","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1196.7856369018554,"y":624.6666316986084,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"faa78af4.fe2978","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2020.2139434814453,"y":1099.952467918396,"z":"efb2d3cd.6f9f","wires":[["d2be88a2.c0ce58","eaca44c0.8fa658"]]},{"id":"d2be88a2.c0ce58","type":"execute","name":"Report_Failure_in_Restart","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Failure in restart for:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":2262.7857971191406,"y":1100.666766166687,"z":"efb2d3cd.6f9f","wires":[["78d6cea7.ad7914"]]},{"id":"78d6cea7.ad7914","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2512.7853088378906,"y":1100.666766166687,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"9960b720.429068","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2492.785675048828,"y":1373.952410697937,"z":"efb2d3cd.6f9f","wires":[["a7dc114e.b060f","4e8e89a5.b92628"]]},{"id":"a7dc114e.b060f","type":"execute","name":"Report_Context_not_found","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Context not found:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":2767.928497314453,"y":1374.952410697937,"z":"efb2d3cd.6f9f","wires":[["3349e73e.3123"]]},{"id":"3349e73e.3123","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3163.7872619628906,"y":1375.5238218307495,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"6473e66.372b258","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":2486.7862854003906,"y":1267.3809995651245,"z":"efb2d3cd.6f9f","wires":[["85aca546.950d98","4e8e89a5.b92628"]]},{"id":"85aca546.950d98","type":"execute","name":"Report_Error_occoured_while_restarting_the_server","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Stop : Error occoured while restarting the server:' + $VNF.VM[$i].URL`\" />","comments":"","outputs":1,"x":2850.214385986328,"y":1268.238055229187,"z":"efb2d3cd.6f9f","wires":[["46ff16c7.47a864"]]},{"id":"46ff16c7.47a864","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3162.7862854003906,"y":1267.3809995651245,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"3b81a4e0.801948","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":395.4285430908203,"y":281.6984214782715,"z":"efb2d3cd.6f9f","wires":[["24478c4a.97445c"]]},{"id":"525173d9.9f9768","type":"execute","name":"execute: flatAndAddToContext","xml":"<execute plugin='org.openecomp.appc.dg.common.JsonDgUtil' method='flatAndAddToContext' >\n<parameter name=\"payload\" value=\"`$input.payload`\" />","comments":"","outputs":1,"x":177.2856674194336,"y":133.95242881774902,"z":"efb2d3cd.6f9f","wires":[["3b81a4e0.801948","ea869050.d0e8a8","bfee3bf8.6cdc08"]]},{"id":"9d5a80f1.21cfc8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","x":732.5714263916016,"y":169.76204586029053,"z":"efb2d3cd.6f9f","wires":[]},{"id":"86965cd.8414a2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":536.523796081543,"y":135.52403259277344,"z":"efb2d3cd.6f9f","wires":[["9d5a80f1.21cfc8","8e8181b6.8a37c"]]},{"id":"8e8181b6.8a37c","type":"execute","name":"Report_Error_Flattening_Payload_Json","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in flattening payload Json\" />","comments":"","outputs":1,"x":817.7143020629883,"y":135.47638034820557,"z":"efb2d3cd.6f9f","wires":[["516bbf1d.b395bc"]]},{"id":"ea869050.d0e8a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":396.9999351501465,"y":135.04771900177002,"z":"efb2d3cd.6f9f","wires":[["86965cd.8414a2"]]},{"id":"13ca6872.fc2048","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":734.5714569091797,"y":252.90487384796142,"z":"efb2d3cd.6f9f","wires":[]},{"id":"402368d9.6b6274","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":547.6667556762695,"y":217.2382688522339,"z":"efb2d3cd.6f9f","wires":[["13ca6872.fc2048","dc34898e.b17a18"]]},{"id":"dc34898e.b17a18","type":"execute","name":"Report_Error_Loading_Json_Flattening_Plugin","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","outputs":1,"x":839.4285659790039,"y":217.47639179229736,"z":"efb2d3cd.6f9f","wires":[["cf770f7c.16a89"]]},{"id":"bfee3bf8.6cdc08","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":399.14286041259765,"y":217.19056224822998,"z":"efb2d3cd.6f9f","wires":[["402368d9.6b6274"]]},{"id":"6ebeb5d2.446424","type":"execute","name":"Report_Success_in_Restart","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='reportSuccess' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"`'Restart event executed successfully for ' + $VNF.VM[$i].URL`\" />\n","comments":"","outputs":1,"x":2476.6903381347656,"y":1486.0477476119995,"z":"efb2d3cd.6f9f","wires":[["4531bcb.c6d5a84","57d1b7dc.0275e"]]},{"id":"4531bcb.c6d5a84","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2734.689971923828,"y":1538.047625541687,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"57d1b7dc.0275e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2734.689971923828,"y":1486.047625541687,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"4e931e7c.c77e5","type":"get-resource","name":"AAI_Named_Query","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"named-query\" key=\"named-query-uuid = '037eb932-edac-48f5-9782-c19c0aa5a031' AND prefix = 'namedQueryData' \" local-only=\"false\" pfx=\"vnfInfo\" >\n","comments":"","outputs":1,"x":509.0951614379883,"y":529.9047536849976,"z":"efb2d3cd.6f9f","wires":[["7ae358d1.458868"]]},{"id":"6bae6aa4.352ff4","type":"set","name":"set","xml":"<set>\n<parameter name='namedQueryData.instance-filters.instance-filter[0].generic-vnf.vnf-id' value='`$input.action-identifiers.vnf-id`' />\n<parameter name='namedQueryData.instance-filters.instance-filter_length' value='`1`' />","comments":"","x":472.52384185791015,"y":479.6189994812012,"z":"efb2d3cd.6f9f","wires":[]},{"id":"24478c4a.97445c","type":"switchNode","name":"switch: input.action-identifiers.vnf-id","xml":"<switch test='$input.action-identifiers.vnf-id'>\n","comments":"","outputs":1,"x":188.2857208251953,"y":329.4285087585449,"z":"efb2d3cd.6f9f","wires":[["ae98abf3.0e1938","4fe3937b.c750f4"]]},{"id":"ae98abf3.0e1938","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":444.5952911376953,"y":328.9285497665405,"z":"efb2d3cd.6f9f","wires":[["dff5e759.f86ce8"]]},{"id":"dff5e759.f86ce8","type":"returnFailure","name":"return failure","xml":"<return status=\"failure\">\n\t<parameter name=\"error-message\" value=\"input.action-identifiers.vnf-id is null\" />\n","comments":"","x":851.9880218505859,"y":329.0397262573242,"z":"efb2d3cd.6f9f","wires":[]},{"id":"ef48adc4.8ea4b","type":"for","name":"for: vserver","xml":"<for index='vserverIndex' start='0' end='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-length' >\n","comments":"","outputs":1,"x":312.8570861816406,"y":826.7141904830933,"z":"efb2d3cd.6f9f","wires":[["d37528d4.4e265"]]},{"id":"3843e9f0.0e6caa","type":"switchNode","name":"switch: vnf-id equal vnf-id","xml":"<switch test='`$vnfInfo.inventory-response-item[0].generic-vnf.vnf-id == $input.action-identifiers.vnf-id`'>\n","comments":"","outputs":1,"x":528.523796081543,"y":708.7141733169556,"z":"efb2d3cd.6f9f","wires":[["6d5d0750.5ed474","5babc326.1971f"]]},{"id":"a0c06e68.57513","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in loading Json flattening plugin\" />","comments":"","x":1086.7143173217773,"y":778.5237855911255,"z":"efb2d3cd.6f9f","wires":[]},{"id":"48a8e663.a597bc","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":916.8094635009766,"y":731.1428556442261,"z":"efb2d3cd.6f9f","wires":[["a0c06e68.57513","e3b568f.26436d8"]]},{"id":"e3b568f.26436d8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"apiVer\" value=\"1.01\"/>\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure matching vnf-id to VNF Hierachy\" />","comments":"","outputs":1,"x":1072.5711708068847,"y":730.5237874984741,"z":"efb2d3cd.6f9f","wires":[["ac6c26ef.2272e8"]]},{"id":"ac6c26ef.2272e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1212.1903076171875,"y":729.7142806053162,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"eaca44c0.8fa658","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2278.5768127441406,"y":1183.3810300827026,"z":"efb2d3cd.6f9f","wires":[]},{"id":"879634a3.4c4338","type":"comment","name":"This should probably just log and continue other restarts","info":"","comments":"","x":2390.3570861816406,"y":1139.3810300827026,"z":"efb2d3cd.6f9f","wires":[]},{"id":"4e8e89a5.b92628","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n","comments":"","x":2745.816925048828,"y":1319.3809995651245,"z":"efb2d3cd.6f9f","wires":[]},{"id":"d37528d4.4e265","type":"switchNode","name":"switch: vserver-selflink","xml":"<switch test='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].vserver.vserver-selflink'>\n","comments":"","outputs":1,"x":518.8570861816406,"y":827.3809385299683,"z":"efb2d3cd.6f9f","wires":[["7a3fb8b4.c11bb8","17f06100.54e653"]]},{"id":"1aa96a4.f19d456","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in retrieving vserver-selflink from VNF Hierachy\" />","comments":"","x":1053.714267730713,"y":875.5239143371582,"z":"efb2d3cd.6f9f","wires":[]},{"id":"3bb26c38.66c72c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":883.8094139099121,"y":828.1429843902588,"z":"efb2d3cd.6f9f","wires":[["1aa96a4.f19d456","19276690.ae4b4d"]]},{"id":"19276690.ae4b4d","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in retrieving vserver-selflink from VNF Hierachy\" />","comments":"","outputs":1,"x":1039.5711975097656,"y":827.5238828659058,"z":"efb2d3cd.6f9f","wires":[["3ffa8895.8669e8"]]},{"id":"3ffa8895.8669e8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1190.8569526672363,"y":828.3810596466064,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"4079e197.d368b4","type":"switchNode","name":"switch: identity-url","xml":"<switch test='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].inventory-response-items.inventory-response-item[0].inventory-response-items.inventory-response-item[0].cloud-region.identity-url'>\n","comments":"","outputs":1,"x":757.5238037109375,"y":945.7143125534058,"z":"efb2d3cd.6f9f","wires":[["1239e71c.4c31f5","c4484652.927c6"]]},{"id":"fb1df0ec.df495","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name=\"output.status.message\" value=\"Failure in retrieving identity-url from VNF Hierachy\" />","comments":"","x":1313.714210510254,"y":975.5238924026489,"z":"efb2d3cd.6f9f","wires":[]},{"id":"f343c245.3e626","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1143.8093566894531,"y":928.1429624557495,"z":"efb2d3cd.6f9f","wires":[["fb1df0ec.df495","dd9be377.dae04"]]},{"id":"dd9be377.dae04","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >\n<parameter name=\"eventId\" value=\"`$input.action-identifiers.vnf-id`\" />\n<parameter name=\"output.status.message\" value=\"Failure in retrieving identity-url from VNF Hierachy\" />","comments":"","outputs":1,"x":1299.5710639953613,"y":927.5238943099976,"z":"efb2d3cd.6f9f","wires":[["8a9fbe17.103c08"]]},{"id":"8a9fbe17.103c08","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1445.8568420410156,"y":927.3810606002808,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"34f6c984.c97166","type":"switchNode","name":"switch: vm-id present","xml":"<switch test='$vm-id'>\n","comments":"","outputs":1,"x":1008.6666564941406,"y":1040.547625541687,"z":"efb2d3cd.6f9f","wires":[["8000f5b5.764778","57289157.8a7af4"]]},{"id":"8000f5b5.764778","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1232.9999351501464,"y":1117.6142377853393,"z":"efb2d3cd.6f9f","wires":[["bd1ba349.7018d8"]]},{"id":"8543bb4e.9db718","type":"switchNode","name":"switch: vserver-selflink equal vnf-id","xml":"<switch test='vnfInfo.inventory-response-item[0].inventory-response-items.inventory-response-item[$vserverIndex].vserver.vserver-selflink == $vm-id'>\n","comments":"","outputs":1,"x":1453.333267211914,"y":1032.6142950057983,"z":"efb2d3cd.6f9f","wires":[["e2419e1e.bb482"]]},{"id":"11a9f3a4.224b78","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":702.3333778381348,"y":623.6474990844726,"z":"efb2d3cd.6f9f","wires":[["afa47f95.2bf15"]]},{"id":"6d5d0750.5ed474","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":747.3333358764648,"y":709.7141351699829,"z":"efb2d3cd.6f9f","wires":[["48a8e663.a597bc"]]},{"id":"7a3fb8b4.c11bb8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":709.6666793823242,"y":828.0476322174072,"z":"efb2d3cd.6f9f","wires":[["3bb26c38.66c72c"]]},{"id":"1239e71c.4c31f5","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":961.6666221618652,"y":928.047610282898,"z":"efb2d3cd.6f9f","wires":[["f343c245.3e626"]]},{"id":"e2419e1e.bb482","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1570.1431007385254,"y":1091.0477285385131,"z":"efb2d3cd.6f9f","wires":[["bd1ba349.7018d8"]]},{"id":"516bbf1d.b395bc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1089.1666412353515,"y":136.38096141815185,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"cf770f7c.16a89","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1137.5952072143554,"y":217.95244979858398,"z":"efb2d3cd.6f9f","wires":[[]]},{"id":"4fe3937b.c750f4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":447.50001525878906,"y":368.0476280848185,"z":"efb2d3cd.6f9f","wires":[["d88c6d4d.2e7bc8"]]},{"id":"17f06100.54e653","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":705.8333969116211,"y":871.3808832168579,"z":"efb2d3cd.6f9f","wires":[["4079e197.d368b4"]]},{"id":"57289157.8a7af4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1234.1667175292968,"y":1043.0477657318115,"z":"efb2d3cd.6f9f","wires":[["8543bb4e.9db718"]]},{"id":"c4484652.927c6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":989.1666819254556,"y":984.714294751485,"z":"efb2d3cd.6f9f","wires":[["34f6c984.c97166"]]},{"id":"5babc326.1971f","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":742.5000038146973,"y":759.714213848114,"z":"efb2d3cd.6f9f","wires":[["93e5feeb.17ed6"]]},{"id":"93e5feeb.17ed6","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":105.8333740234375,"y":826.3808546066284,"z":"efb2d3cd.6f9f","wires":[["ef48adc4.8ea4b","3002b3cd.763658"]]}]
diff --git a/platform-logic/appc/src/main/xml/APPC_method_Generic_Restart_3.0.0.xml b/platform-logic/appc/src/main/xml/APPC_method_Generic_Restart_3.0.0.xml
index 0f4e54a..5527ac5 100644
--- a/platform-logic/appc/src/main/xml/APPC_method_Generic_Restart_3.0.0.xml
+++ b/platform-logic/appc/src/main/xml/APPC_method_Generic_Restart_3.0.0.xml
@@ -40,7 +40,7 @@
<block atomic='true'>
<set>
<parameter name='namedQueryData.instance-filters.instance-filter[0].generic-vnf.vnf-id' value='`$input.action-identifiers.vnf-id`' />
-<parameter name='namedQueryData.instance-filters.instance-filter_length' value='`1`' /></set><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="named-query" key="named-query-uuid = '037eb932-edac-48f5-9782-c19c0aa5a031' AND prefix='namedQueryData' " local-only="false" pfx="vnfInfo" >
+<parameter name='namedQueryData.instance-filters.instance-filter_length' value='`1`' /></set><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="named-query" key="named-query-uuid = '037eb932-edac-48f5-9782-c19c0aa5a031' AND prefix = 'namedQueryData' " local-only="false" pfx="vnfInfo" >
<outcome value='failure'>
<block atomic='true'><execute plugin='org.openecomp.appc.dg.common.DCAEReporterPlugin' method='report' >
<parameter name="apiVer" value="1.01"/>