summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2017-04-21 16:23:41 -0500
committerBrian Freeman <bf1936@att.com>2017-04-21 16:34:55 -0500
commitc3a4487d5ed784cfd1a30fd843c0589e9d047426 (patch)
treea094a51fcb7d5d39e5af054c6884c353ea045587
parent366b7e2ea0e15889e3de08916c4406d98d6b509d (diff)
fixed netconf port; fixed delete dg
Change-Id: I41a23f11ac72979a1e88ee703bfdcdac96c8d670 Signed-off-by: Brian Freeman <bf1936@att.com>
-rw-r--r--tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json2
-rw-r--r--tutorials/CreateAppcNetconfMount/netconf-mount-template.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json b/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json
index f3d133e2..ec7565fd 100644
--- a/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json
+++ b/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json
@@ -1 +1 @@
-[{"id":"595effb3.4be3e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":412.25,"y":1399.2500133514404,"z":"15418301.fff86d","wires":[]},{"id":"60b23844.7c8178","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":162.99996185302734,"y":172,"z":"15418301.fff86d","wires":[["13383666.4d6eda","595effb3.4be3e","97bd4dfc.622ea","3e8f0960.85a326","19d0fbea.e2bed4","e4baed03.d5511","76887d6.f23f984","a957e353.7b783"]]},{"id":"13383666.4d6eda","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":453.25,"y":1226.2500133514404,"z":"15418301.fff86d","wires":[]},{"id":"18bfbdce.8e72c2","type":"method","name":"method vnf-topology-delete","xml":"<method rpc='vnf-topology-delete' mode='sync'>\n","comments":"","outputs":1,"x":194.6666488647461,"y":121.16666412353516,"z":"15418301.fff86d","wires":[["60b23844.7c8178"]]},{"id":"13fd8823.be8278","type":"service-logic","name":"VNF-API 1.0.0-DEMO","module":"VNF-API","version":"1.0.0-DEMO","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='1.0.0-DEMO'>","outputs":1,"x":264.66661834716797,"y":69.16667175292969,"z":"15418301.fff86d","wires":[["18bfbdce.8e72c2"]]},{"id":"b1e4565e.0c0fd8","type":"dgstart","name":"DGSTART","outputs":1,"x":101.49996185302734,"y":69,"z":"15418301.fff86d","wires":[["13fd8823.be8278"]]},{"id":"6f25ff2c.14f19","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1089.9242897033691,"y":253.46213626861572,"z":"15418301.fff86d","wires":[["814b3a84.e1a2e8"]]},{"id":"814b3a84.e1a2e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1242.2574195861816,"y":253.46219730377197,"z":"15418301.fff86d","wires":[]},{"id":"19d0fbea.e2bed4","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":414.5075988769531,"y":1269.7956066131592,"z":"15418301.fff86d","wires":[]},{"id":"97bd4dfc.622ea","type":"switchNode","name":"switch:vnf-id config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":432.14385986328125,"y":171.48754501342773,"z":"15418301.fff86d","wires":[["47a7c48e.5c7f3c"]]},{"id":"47a7c48e.5c7f3c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":633.5984191894531,"y":171.66937255859375,"z":"15418301.fff86d","wires":[["d69c35cb.81ce48"]]},{"id":"d69c35cb.81ce48","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":797.189338684082,"y":171.8284730911255,"z":"15418301.fff86d","wires":[]},{"id":"3e8f0960.85a326","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":479.6439514160156,"y":1184.9875621795654,"z":"15418301.fff86d","wires":[]},{"id":"e4baed03.d5511","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.vnf-topology-information.\" value=\"\" /> \n","comments":"","x":423.6439514160156,"y":1309.9875621795654,"z":"15418301.fff86d","wires":[]},{"id":"3a240134.7a0d2e","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">","comments":"","outputs":1,"x":888.1071891784668,"y":253.76193714141846,"z":"15418301.fff86d","wires":[["6f25ff2c.14f19"]]},{"id":"a957e353.7b783","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":434.96431732177734,"y":1355.190486907959,"z":"15418301.fff86d","wires":[]},{"id":"76887d6.f23f984","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":441.00001525878906,"y":254.0833387374878,"z":"15418301.fff86d","wires":[["b1ad7cbb.8bd5e","61687779.17c318"]]},{"id":"b1ad7cbb.8bd5e","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":672.7500114440918,"y":301.72619247436523,"z":"15418301.fff86d","wires":[["598ec56f.052bfc"]]},{"id":"598ec56f.052bfc","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":869.7500534057617,"y":301.83336067199707,"z":"15418301.fff86d","wires":[["e42ccbc9.72b2e8","76f5dae3.ecbec4"]]},{"id":"61687779.17c318","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":672.250072479248,"y":253.83335304260254,"z":"15418301.fff86d","wires":[["3a240134.7a0d2e"]]},{"id":"e42ccbc9.72b2e8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1064.75,"y":302.5833339691162,"z":"15418301.fff86d","wires":[["ed5eb2d5.d3fec"]]},{"id":"ed5eb2d5.d3fec","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Either aic-cloud-region or aic-clli must be present'/>","comments":"","x":1237.25,"y":303.0833339691162,"z":"15418301.fff86d","wires":[]},{"id":"76f5dae3.ecbec4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1066,"y":345.0833339691162,"z":"15418301.fff86d","wires":[["3270e69c.b01c1a"]]},{"id":"efd3d8ce.305bb8","type":"save","name":"delete generic-vnf-l3-network","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-l3-network\" \n\tkey=\"DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1183.250015258789,"y":960.8333234786987,"z":"15418301.fff86d","wires":[["d2debfd0.9228e"]]},{"id":"81a6b5e3.b1c5c8","type":"save","name":"delete GammaResource: generic-vnf","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf\" \n\tkey=\"DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id\" \n\tlocal-only=\"true\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1206.9091796875,"y":1047.2045850753784,"z":"15418301.fff86d","wires":[["d2debfd0.9228e"]]},{"id":"fc48092d.d0a688","type":"save","name":"delete generic-vnf-vserver","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-vserver\" \n\tkey=\"DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1174.6591796875,"y":1002.2878675460815,"z":"15418301.fff86d","wires":[["d2debfd0.9228e"]]},{"id":"bd19a37e.1e6f","type":"switchNode","name":"switch: order-status = PendingDelete","xml":"<switch test=\"'$service-data.oper-status.order-status == PendingDelete'\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":1211.750015258789,"y":425.83334159851074,"z":"15418301.fff86d","wires":[["75cce353.79957c"]]},{"id":"75cce353.79957c","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1441.0833892822266,"y":426.166654586792,"z":"15418301.fff86d","wires":[["52ef3c8d.244ee4"]]},{"id":"52ef3c8d.244ee4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1593.416519165039,"y":426.16671562194824,"z":"15418301.fff86d","wires":[]},{"id":"3270e69c.b01c1a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":958.5,"y":426.0833339691162,"z":"15418301.fff86d","wires":[["efd3d8ce.305bb8","81a6b5e3.b1c5c8","fc48092d.d0a688","d3a92289.9fdd8","68d3c7c3.2c0538"]]},{"id":"d2debfd0.9228e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1469.499984741211,"y":1001.8333005905151,"z":"15418301.fff86d","wires":[["5b41e042.1bf1"]]},{"id":"5b41e042.1bf1","type":"set","name":"set: error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource\"/>","comments":"","x":1652.0000076293945,"y":1001.833309173584,"z":"15418301.fff86d","wires":[]},{"id":"d3a92289.9fdd8","type":"save","name":"delete AnAI: generic-vnf","xml":"<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\tkey=\"generic-vnf.vnf-id = $service-data.vnf-id\" \n\tlocal-only=\"false\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1165.249984741211,"y":1091.5833005905151,"z":"15418301.fff86d","wires":[["8a560d1f.dba1"]]},{"id":"8a560d1f.dba1","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1358.3407897949219,"y":1091.7120161056519,"z":"15418301.fff86d","wires":[["cc527c20.53c39"]]},{"id":"cc527c20.53c39","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Failed to delete generic-vnf from AnAI with vnf-id = '+ $service-data.vnf-id`\"/>","comments":"","x":1516.5073165893555,"y":1091.7953968048096,"z":"15418301.fff86d","wires":[]},{"id":"c31526f9.780638","type":"comment","name":"NOT checking order-status intentionally","info":"","comments":"","x":1316.000015258789,"y":390.0833396911621,"z":"15418301.fff86d","wires":[]},{"id":"fdff8c1.4f2387","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/sdnc_appc_netconf.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\"/>\n<parameter name=\"field4\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\"/>\n<parameter name=\"field5\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\"/>\n<parameter name=\"field6\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\"/>\n<parameter name=\"field7\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\"/>\n<parameter name=\"field8\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>\n<parameter name=\"field9\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\"/>\n<parameter name=\"field10\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\"/>\n","comments":"","outputs":1,"x":1753.75,"y":605,"z":"15418301.fff86d","wires":[[]]},{"id":"68d3c7c3.2c0538","type":"switchNode","name":"switch vnf type ","xml":"<switch test='`substr($preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type,22,30)`'>\n<!-- Aa27262bF2d040799b5c..base_vfw..module-0 -->","comments":"","outputs":1,"x":1153.550048828125,"y":496.5166664123535,"z":"15418301.fff86d","wires":[["fd273532.ed4fc8"]]},{"id":"fd273532.ed4fc8","type":"outcome","name":"outcome base_vfw","xml":"<outcome value='base_vfw'>\n","comments":"","outputs":1,"x":1379.5500183105469,"y":526.5166664123535,"z":"15418301.fff86d","wires":[["5aca11d.fbb82f"]]},{"id":"5aca11d.fbb82f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1593.5500183105469,"y":566.5166664123535,"z":"15418301.fff86d","wires":[["8eaec4f0.033068","664d246a.65c41c","afad195e.f3a248","fdff8c1.4f2387"]]},{"id":"8eaec4f0.033068","type":"execute","name":"excute DELETE REST NETCONF MOUNT ","xml":"<execute plugin='org.openecomp.sdnc.restapicall.RestapiCallNode' method='sendRequest' >\n\t<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/netconf-mount-template.xml'`\"/>\n\t<parameter name=\"restapiUrl\" value=\"`$prop.appcRestApi.url+'/restconf/config/network-topology:network-topology/topology/topology-netconf/node/'+$prop.vpg_hostname`\"/>\n\t<parameter name=\"restapiUser\" value=\"`$prop.appcRestApi.sdncOdl.user`\"/>\n\t<parameter name=\"restapiPassword\" value=\"`$prop.appcRestApi.sdncOdl.password`\"/>\n\t<parameter name=\"format\" value=\"xml\" />\n\t<parameter name=\"httpMethod\" value=\"delete\" />\n\t<parameter name=\"responsePrefix\" value=\"restapi-result\" />\n\t\n\t","comments":"","outputs":1,"x":1865.2999572753906,"y":908.7666149139404,"z":"15418301.fff86d","wires":[[]]},{"id":"664d246a.65c41c","type":"set","name":"set appc data","xml":"<set>\n<parameter name='prop.appcRestApi.url' value='http://appc.api.simpledemo.openecomp.org:8282' />\n<!-- 8181 when doing localhost -->\n<parameter name=\"prop.restapi.templateDir\" value=\"/opt/openecomp/sdnc/data\"/>\n<parameter name=\"prop.appcRestApi.sdncOdl.user\" value=\"admin\"/>\n<parameter name=\"prop.appcRestApi.sdncOdl.password\" value=\"Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U\"/>\n","comments":"","x":1775.0500717163086,"y":837.2666139602661,"z":"15418301.fff86d","wires":[]},{"id":"40d9cc0a.1c2c64","type":"comment","name":"Get Hostname","info":"","comments":"","x":1820.2445068359375,"y":650.5499267578125,"z":"15418301.fff86d","wires":[]},{"id":"afad195e.f3a248","type":"for","name":"for vnf-parameters","xml":"<for index='k' start='0' end=\"`$preload-data.vnf-topology-information.vnf-parameters_length`\" >\n","comments":"","outputs":1,"x":1790.2444763183594,"y":695.5500450134277,"z":"15418301.fff86d","wires":[["1027e282.a44d6d"]]},{"id":"ad66fbd9.16e548","type":"switchNode","name":"switch vpg_name_0","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-name == 'vpg_name_0'`\">\n","comments":"","outputs":1,"x":2153.244598388672,"y":801.5500755310059,"z":"15418301.fff86d","wires":[["40677ad9.8916e4"]]},{"id":"40677ad9.8916e4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2340.244598388672,"y":801.5500755310059,"z":"15418301.fff86d","wires":[["c8def15.5dbbc1"]]},{"id":"c8def15.5dbbc1","type":"set","name":"set vpg_ hostname ","xml":"<set>\n<parameter name='prop.vpg_hostname' value='`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-value`' />\n","comments":"","x":2508.244598388672,"y":802.1500816345215,"z":"15418301.fff86d","wires":[]},{"id":"1027e282.a44d6d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1963.2445983886719,"y":739.5500450134277,"z":"15418301.fff86d","wires":[["ad66fbd9.16e548"]]}] \ No newline at end of file
+[{"id":"595effb3.4be3e","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":412.25,"y":1399.2500133514404,"z":"15418301.fff86d","wires":[]},{"id":"60b23844.7c8178","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":162.99996185302734,"y":172,"z":"15418301.fff86d","wires":[["13383666.4d6eda","595effb3.4be3e","97bd4dfc.622ea","3e8f0960.85a326","19d0fbea.e2bed4","e4baed03.d5511","76887d6.f23f984","a957e353.7b783"]]},{"id":"13383666.4d6eda","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":453.25,"y":1226.2500133514404,"z":"15418301.fff86d","wires":[]},{"id":"18bfbdce.8e72c2","type":"method","name":"method vnf-topology-delete","xml":"<method rpc='vnf-topology-delete' mode='sync'>\n","comments":"","outputs":1,"x":194.6666488647461,"y":121.16666412353516,"z":"15418301.fff86d","wires":[["60b23844.7c8178"]]},{"id":"13fd8823.be8278","type":"service-logic","name":"VNF-API 1.0.0-DEMO","module":"VNF-API","version":"1.0.0-DEMO","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='1.0.0-DEMO'>","outputs":1,"x":264.66661834716797,"y":69.16667175292969,"z":"15418301.fff86d","wires":[["18bfbdce.8e72c2"]]},{"id":"b1e4565e.0c0fd8","type":"dgstart","name":"DGSTART","outputs":1,"x":101.49996185302734,"y":69,"z":"15418301.fff86d","wires":[["13fd8823.be8278"]]},{"id":"6f25ff2c.14f19","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1089.9242897033691,"y":253.46213626861572,"z":"15418301.fff86d","wires":[["814b3a84.e1a2e8"]]},{"id":"814b3a84.e1a2e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1242.2574195861816,"y":253.46219730377197,"z":"15418301.fff86d","wires":[]},{"id":"19d0fbea.e2bed4","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":414.5075988769531,"y":1269.7956066131592,"z":"15418301.fff86d","wires":[]},{"id":"97bd4dfc.622ea","type":"switchNode","name":"switch:vnf-id config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":432.14385986328125,"y":171.48754501342773,"z":"15418301.fff86d","wires":[["47a7c48e.5c7f3c"]]},{"id":"47a7c48e.5c7f3c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":633.5984191894531,"y":171.66937255859375,"z":"15418301.fff86d","wires":[["d69c35cb.81ce48"]]},{"id":"d69c35cb.81ce48","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":797.189338684082,"y":171.8284730911255,"z":"15418301.fff86d","wires":[]},{"id":"3e8f0960.85a326","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":479.6439514160156,"y":1184.9875621795654,"z":"15418301.fff86d","wires":[]},{"id":"e4baed03.d5511","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.vnf-topology-information.\" value=\"\" /> \n","comments":"","x":423.6439514160156,"y":1309.9875621795654,"z":"15418301.fff86d","wires":[]},{"id":"3a240134.7a0d2e","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">","comments":"","outputs":1,"x":888.1071891784668,"y":253.76193714141846,"z":"15418301.fff86d","wires":[["6f25ff2c.14f19","28fe83fd.b5a2ec"]]},{"id":"a957e353.7b783","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":434.96431732177734,"y":1355.190486907959,"z":"15418301.fff86d","wires":[]},{"id":"76887d6.f23f984","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":441.00001525878906,"y":254.0833387374878,"z":"15418301.fff86d","wires":[["b1ad7cbb.8bd5e","61687779.17c318"]]},{"id":"b1ad7cbb.8bd5e","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":677.035816192627,"y":376.01194190979004,"z":"15418301.fff86d","wires":[["598ec56f.052bfc"]]},{"id":"598ec56f.052bfc","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":874.0358581542969,"y":376.1191101074219,"z":"15418301.fff86d","wires":[["e42ccbc9.72b2e8","76f5dae3.ecbec4"]]},{"id":"61687779.17c318","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":672.250072479248,"y":253.83335304260254,"z":"15418301.fff86d","wires":[["3a240134.7a0d2e"]]},{"id":"e42ccbc9.72b2e8","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1069.0358047485352,"y":376.869083404541,"z":"15418301.fff86d","wires":[["ed5eb2d5.d3fec"]]},{"id":"ed5eb2d5.d3fec","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Either aic-cloud-region or aic-clli must be present'/>","comments":"","x":1241.5358047485352,"y":377.369083404541,"z":"15418301.fff86d","wires":[]},{"id":"76f5dae3.ecbec4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1070.2858047485352,"y":419.369083404541,"z":"15418301.fff86d","wires":[["3270e69c.b01c1a"]]},{"id":"efd3d8ce.305bb8","type":"save","name":"delete generic-vnf-l3-network","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-l3-network\" \n\tkey=\"DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1184.6786499023438,"y":1095.1190481185913,"z":"15418301.fff86d","wires":[["d2debfd0.9228e"]]},{"id":"81a6b5e3.b1c5c8","type":"save","name":"delete GammaResource: generic-vnf","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf\" \n\tkey=\"DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id\" \n\tlocal-only=\"true\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1208.3378143310547,"y":1181.490309715271,"z":"15418301.fff86d","wires":[["d2debfd0.9228e"]]},{"id":"fc48092d.d0a688","type":"save","name":"delete generic-vnf-vserver","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-vserver\" \n\tkey=\"DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1176.0878143310547,"y":1136.5735921859741,"z":"15418301.fff86d","wires":[["d2debfd0.9228e"]]},{"id":"bd19a37e.1e6f","type":"switchNode","name":"switch: order-status = PendingDelete","xml":"<switch test=\"'$service-data.oper-status.order-status == PendingDelete'\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":1213.1786499023438,"y":560.1190662384033,"z":"15418301.fff86d","wires":[["75cce353.79957c"]]},{"id":"75cce353.79957c","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1442.5120239257812,"y":560.4523792266846,"z":"15418301.fff86d","wires":[["52ef3c8d.244ee4"]]},{"id":"52ef3c8d.244ee4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1594.8451538085938,"y":560.4524402618408,"z":"15418301.fff86d","wires":[]},{"id":"3270e69c.b01c1a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":959.9286346435547,"y":560.3690586090088,"z":"15418301.fff86d","wires":[["efd3d8ce.305bb8","81a6b5e3.b1c5c8","fc48092d.d0a688","d3a92289.9fdd8","68d3c7c3.2c0538"]]},{"id":"d2debfd0.9228e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1470.9286193847656,"y":1136.1190252304077,"z":"15418301.fff86d","wires":[["5b41e042.1bf1"]]},{"id":"5b41e042.1bf1","type":"set","name":"set: error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource\"/>","comments":"","x":1653.4286422729492,"y":1136.1190338134766,"z":"15418301.fff86d","wires":[]},{"id":"d3a92289.9fdd8","type":"save","name":"delete AnAI: generic-vnf","xml":"<delete plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\tkey=\"generic-vnf.vnf-id = $service-data.vnf-id\" \n\tlocal-only=\"false\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1166.6786193847656,"y":1225.8690252304077,"z":"15418301.fff86d","wires":[["8a560d1f.dba1"]]},{"id":"8a560d1f.dba1","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1359.7694244384766,"y":1225.9977407455444,"z":"15418301.fff86d","wires":[["cc527c20.53c39"]]},{"id":"cc527c20.53c39","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Failed to delete generic-vnf from AnAI with vnf-id = '+ $service-data.vnf-id`\"/>","comments":"","x":1517.9359512329102,"y":1226.0811214447021,"z":"15418301.fff86d","wires":[]},{"id":"c31526f9.780638","type":"comment","name":"NOT checking order-status intentionally","info":"","comments":"","x":1317.4286499023438,"y":524.3690643310547,"z":"15418301.fff86d","wires":[]},{"id":"fdff8c1.4f2387","type":"record","name":"record","xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/sdnc_appc_netconf.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\"/>\n<parameter name=\"field4\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\"/>\n<parameter name=\"field5\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\"/>\n<parameter name=\"field6\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\"/>\n<parameter name=\"field7\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\"/>\n<parameter name=\"field8\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>\n<parameter name=\"field9\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\"/>\n<parameter name=\"field10\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\"/>\n","comments":"","outputs":1,"x":1755.1786346435547,"y":739.2857246398926,"z":"15418301.fff86d","wires":[[]]},{"id":"68d3c7c3.2c0538","type":"switchNode","name":"switch vnf type ","xml":"<switch test='`substr($preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type,22,30)`'>\n<!-- Aa27262bF2d040799b5c..base_vfw..module-0 -->","comments":"","outputs":1,"x":1154.9786834716797,"y":630.8023910522461,"z":"15418301.fff86d","wires":[["fd273532.ed4fc8"]]},{"id":"fd273532.ed4fc8","type":"outcome","name":"outcome base_vfw","xml":"<outcome value='base_vfw'>\n","comments":"","outputs":1,"x":1380.9786529541016,"y":660.8023910522461,"z":"15418301.fff86d","wires":[["5aca11d.fbb82f"]]},{"id":"5aca11d.fbb82f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1594.9786529541016,"y":700.8023910522461,"z":"15418301.fff86d","wires":[["8eaec4f0.033068","664d246a.65c41c","afad195e.f3a248","fdff8c1.4f2387"]]},{"id":"8eaec4f0.033068","type":"execute","name":"excute DELETE REST NETCONF MOUNT ","xml":"<execute plugin='org.openecomp.sdnc.restapicall.RestapiCallNode' method='sendRequest' >\n\t<!--\n\t<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/netconf-mount-template.xml'`\"/>\n\t-->\n\t<parameter name=\"restapiUrl\" value=\"`$prop.appcRestApi.url+'/restconf/config/network-topology:network-topology/topology/topology-netconf/node/'+$prop.vpg_hostname`\"/>\n\t<parameter name=\"restapiUser\" value=\"`$prop.appcRestApi.sdncOdl.user`\"/>\n\t<parameter name=\"restapiPassword\" value=\"`$prop.appcRestApi.sdncOdl.password`\"/>\n\t<parameter name=\"format\" value=\"xml\" />\n\t<parameter name=\"httpMethod\" value=\"delete\" />\n\t<!-- \n\t<parameter name=\"responsePrefix\" value=\"restapi-result\" />\n\t-->\n\t\n\t","comments":"","outputs":1,"x":1866.7285919189453,"y":1043.052339553833,"z":"15418301.fff86d","wires":[[]]},{"id":"664d246a.65c41c","type":"set","name":"set appc data","xml":"<set>\n<parameter name='prop.appcRestApi.url' value='http://appc.api.simpledemo.openecomp.org:8282' />\n<!-- 8181 when doing localhost -->\n<parameter name=\"prop.restapi.templateDir\" value=\"/opt/openecomp/sdnc/data\"/>\n<parameter name=\"prop.appcRestApi.sdncOdl.user\" value=\"admin\"/>\n<parameter name=\"prop.appcRestApi.sdncOdl.password\" value=\"Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U\"/>\n","comments":"","x":1776.4787063598633,"y":971.5523386001587,"z":"15418301.fff86d","wires":[]},{"id":"40d9cc0a.1c2c64","type":"comment","name":"Get Hostname","info":"","comments":"","x":1821.6731414794922,"y":784.8356513977051,"z":"15418301.fff86d","wires":[]},{"id":"afad195e.f3a248","type":"for","name":"for vnf-parameters","xml":"<for index='k' start='0' end=\"`$preload-data.vnf-topology-information.vnf-parameters_length`\" >\n","comments":"","outputs":1,"x":1791.673110961914,"y":829.8357696533203,"z":"15418301.fff86d","wires":[["1027e282.a44d6d"]]},{"id":"ad66fbd9.16e548","type":"switchNode","name":"switch vpg_name_0","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-name == 'vpg_name_0'`\">\n","comments":"","outputs":1,"x":2154.6732330322266,"y":935.8358001708984,"z":"15418301.fff86d","wires":[["40677ad9.8916e4"]]},{"id":"40677ad9.8916e4","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2341.6732330322266,"y":935.8358001708984,"z":"15418301.fff86d","wires":[["c8def15.5dbbc1"]]},{"id":"c8def15.5dbbc1","type":"set","name":"set vpg_ hostname ","xml":"<set>\n<parameter name='prop.vpg_hostname' value='`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-value`' />\n","comments":"","x":2509.6732330322266,"y":936.4358062744141,"z":"15418301.fff86d","wires":[]},{"id":"1027e282.a44d6d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1964.6732330322266,"y":873.8357696533203,"z":"15418301.fff86d","wires":[["ad66fbd9.16e548"]]},{"id":"28fe83fd.b5a2ec","type":"other","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":1088.571533203125,"y":305.71429443359375,"z":"15418301.fff86d","wires":[["3270e69c.b01c1a"]]}] \ No newline at end of file
diff --git a/tutorials/CreateAppcNetconfMount/netconf-mount-template.xml b/tutorials/CreateAppcNetconfMount/netconf-mount-template.xml
index 4a7ca685..1b2eb968 100644
--- a/tutorials/CreateAppcNetconfMount/netconf-mount-template.xml
+++ b/tutorials/CreateAppcNetconfMount/netconf-mount-template.xml
@@ -1,7 +1,7 @@
<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
<node-id>${prop.vpg_hostname}</node-id>
<host xmlns="urn:opendaylight:netconf-node-topology">${prop.vpg_ipaddress}</host>
- <port xmlns="urn:opendaylight:netconf-node-topology">2883</port>
+ <port xmlns="urn:opendaylight:netconf-node-topology">2831</port>
<username xmlns="urn:opendaylight:netconf-node-topology">admin</username>
<password xmlns="urn:opendaylight:netconf-node-topology">admin</password>
<tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
@@ -12,5 +12,5 @@
<between-attempts-timeout-millis xmlns="urn:opendaylight:netconf-node-topology">2000</between-attempts-timeout-millis>
<sleep-factor xmlns="urn:opendaylight:netconf-node-topology">1.5</sleep-factor>
<!-- keepalive-delay set to 0 turns off keepalives-->
- <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">120</keepalive-delay>
+ <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">125</keepalive-delay>
</node>