diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-03-20 14:35:39 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-03-23 07:47:18 +0000 |
| commit | ebe2b4d5e616a69b374fa9214255c971e014d144 (patch) | |
| tree | 081f591d03022d15a8356793615ddb8805cc1bdd | |
| parent | ac4ab50bdf312a1824388acbb9908c31f2b39c1a (diff) | |
Pretty print json files in tutorials/
Fixing json files to conform to linter rules.
Change-Id: Ib71831d153f32133eef7deb95804e9d96240f5c7
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
27 files changed, 2194 insertions, 727 deletions
diff --git a/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json b/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json index 9b6aa578..18a3e2a4 100644 --- a/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json +++ b/tutorials/Clearwater_vIMS/sdnc/preload_vnf_topology_clearwater.json @@ -1,47 +1,64 @@ { - "input": - { - "request-information": - { - "notification-url":"openecomp.org", - "order-number":"1", - "order-version":"1", - "request-action":"PreloadVNFRequest", - "request-id": "robot20" - }, - "sdnc-request-header": - { - "svc-action": "reserve", - "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify", - "svc-request-id":"robot20" - }, - "vnf-topology-information": - { - "vnf-assignments": - { - "availability-zones":[], - "vnf-networks":[], - "vnf-vms":[] - }, - "vnf-parameters": - [ - {"vnf-parameter-name":"public_net_id","vnf-parameter-value": "00000000-0000-0000-0000-000000000000"}, - {"vnf-parameter-name":"key_name","vnf-parameter-value":"cw-key"}, - {"vnf-parameter-name":"pub_key","vnf-parameter-value":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN imported-openssh-key"}, - {"vnf-parameter-name":"repo_url","vnf-parameter-value":"http://repo.cw-ngv.com/stable"}, - {"vnf-parameter-name":"zone","vnf-parameter-value":"vimstest.onap.org"}, - {"vnf-parameter-name":"dn_range_start","vnf-parameter-value":"5555551000"}, - {"vnf-parameter-name":"dn_range_length","vnf-parameter-value":"20"}, - {"vnf-parameter-name":"dnssec_key","vnf-parameter-value":"9FPdYTWhk5+LbhrqtTPQKw=="} - ], - "vnf-topology-identifier": - { - "generic-vnf-name":"vIMSVNFTEST1", - "generic-vnf-type":"vIMS_Clearwater 1", - "service-type":"1e736900-db02-4bd2-9e7b-72ac1a08c3f7", - "vnf-name":"vIMSVNFTEST1", - "vnf-type":"VimsClearwater..base_clearwater..module-0" - } + "input": { + "request-information": { + "notification-url": "openecomp.org", + "order-number": "1", + "order-version": "1", + "request-action": "PreloadVNFRequest", + "request-id": "robot20" + }, + "sdnc-request-header": { + "svc-action": "reserve", + "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify", + "svc-request-id": "robot20" + }, + "vnf-topology-information": { + "vnf-assignments": { + "availability-zones": [], + "vnf-networks": [], + "vnf-vms": [] + }, + "vnf-parameters": [ + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "00000000-0000-0000-0000-000000000000" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "cw-key" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN imported-openssh-key" + }, + { + "vnf-parameter-name": "repo_url", + "vnf-parameter-value": "http://repo.cw-ngv.com/stable" + }, + { + "vnf-parameter-name": "zone", + "vnf-parameter-value": "vimstest.onap.org" + }, + { + "vnf-parameter-name": "dn_range_start", + "vnf-parameter-value": "5555551000" + }, + { + "vnf-parameter-name": "dn_range_length", + "vnf-parameter-value": "20" + }, + { + "vnf-parameter-name": "dnssec_key", + "vnf-parameter-value": "9FPdYTWhk5+LbhrqtTPQKw==" + } + ], + "vnf-topology-identifier": { + "generic-vnf-name": "vIMSVNFTEST1", + "generic-vnf-type": "vIMS_Clearwater 1", + "service-type": "1e736900-db02-4bd2-9e7b-72ac1a08c3f7", + "vnf-name": "vIMSVNFTEST1", + "vnf-type": "VimsClearwater..base_clearwater..module-0" + } + } } - } } diff --git a/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-activate.json b/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-activate.json index 7b5ed1cd..45dbb23d 100644 --- a/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-activate.json +++ b/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-activate.json @@ -1 +1,578 @@ -[{"id":"9b515625.d22748","type":"dgstart","name":"DGSTART","outputs":1,"x":93.33332824707031,"y":36.33332824707031,"z":"669f9d98.2ac9f4","wires":[["80315e6e.63505"]]},{"id":"80315e6e.63505","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":258.49998474121094,"y":36.5,"z":"669f9d98.2ac9f4","wires":[["3c8cef4d.49542"]]},{"id":"3c8cef4d.49542","type":"method","name":"method vnf-topology-activate","xml":"<method rpc='vnf-topology-activate' mode='sync'>\n","comments":"","outputs":1,"x":166.50001525878906,"y":83.49999237060547,"z":"669f9d98.2ac9f4","wires":[["6cd2edde.1d6bd4"]]},{"id":"6cd2edde.1d6bd4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":123.83332824707031,"y":139.3333282470703,"z":"669f9d98.2ac9f4","wires":[["ab8c4330.26d2b","df0bd34b.bf0cf","d8650a48.f0bcd8","6e2d653a.a05bec","9bb6aa32.18f568","d92f94a6.8f1a28","b846b4fc.934e88","c3be1550.0013d8","40746641.fe81b8"]]},{"id":"ab8c4330.26d2b","type":"set","name":"set: order-status = Active","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Active\"/>","comments":"","x":376.83333587646484,"y":371.83331298828125,"z":"669f9d98.2ac9f4","wires":[]},{"id":"df0bd34b.bf0cf","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">\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":416.16670989990234,"y":268.1665344238281,"z":"669f9d98.2ac9f4","wires":[["22236f98.35747"]]},{"id":"d8650a48.f0bcd8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":333.9444580078125,"y":1233.5,"z":"669f9d98.2ac9f4","wires":[]},{"id":"6e2d653a.a05bec","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":409.94701385498047,"y":320.447021484375,"z":"669f9d98.2ac9f4","wires":[]},{"id":"9bb6aa32.18f568","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":388.60607147216797,"y":216.37876892089844,"z":"669f9d98.2ac9f4","wires":[["4c7aba25.1c7f44"]]},{"id":"d92f94a6.8f1a28","type":"set","name":"set: service-data = input","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" />","comments":"","x":361.8333435058594,"y":1147.888916015625,"z":"669f9d98.2ac9f4","wires":[]},{"id":"b846b4fc.934e88","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":343.83333587646484,"y":418.8888854980469,"z":"669f9d98.2ac9f4","wires":[]},{"id":"40746641.fe81b8","type":"save","name":"update AnAI - vf-module.orchestration-status","xml":"<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />","comments":"","outputs":1,"x":437.7221984863281,"y":461.8888816833496,"z":"669f9d98.2ac9f4","wires":[["738bd5ac.1e39cc"]]},{"id":"5a15cf5c.1fe94","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":938.72216796875,"y":776.3888549804688,"z":"669f9d98.2ac9f4","wires":[[]]},{"id":"c3be1550.0013d8","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":338.522216796875,"y":667.9055213928223,"z":"669f9d98.2ac9f4","wires":[["798dbf61.8ef5c"]]},{"id":"22236f98.35747","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":665.5000610351562,"y":268.4998435974121,"z":"669f9d98.2ac9f4","wires":[["b819ee7c.13f39"]]},{"id":"4c7aba25.1c7f44","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":608.060546875,"y":216.56058883666992,"z":"669f9d98.2ac9f4","wires":[["6309638d.9a29fc"]]},{"id":"738bd5ac.1e39cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":702.2460556030273,"y":461.877384185791,"z":"669f9d98.2ac9f4","wires":[["91b545b4.961ef8"]]},{"id":"798dbf61.8ef5c","type":"outcome","name":"outcome base_vfw","xml":"<outcome value='base_vfw'>\n","comments":"","outputs":1,"x":564.5221862792969,"y":697.9055213928223,"z":"669f9d98.2ac9f4","wires":[["9aacbf5a.ed983"]]},{"id":"b819ee7c.13f39","type":"switchNode","name":"switch: order-status = PendingUpdate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingUpdate`\">\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":916.4242553710938,"y":267.9242515563965,"z":"669f9d98.2ac9f4","wires":[["de1e0e32.44154"]]},{"id":"6309638d.9a29fc","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 = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`\"/>","comments":"","x":786.1514892578125,"y":216.4696922302246,"z":"669f9d98.2ac9f4","wires":[]},{"id":"91b545b4.961ef8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while updating vf-module orchestration-status in AnAI with vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":870.3889846801758,"y":461.87745475769043,"z":"669f9d98.2ac9f4","wires":[]},{"id":"9aacbf5a.ed983","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":778.5221862792969,"y":737.9055213928223,"z":"669f9d98.2ac9f4","wires":[["f6b5a926.ce9888","2c6e5e35.0760b2","c3f63154.8e521","5a15cf5c.1fe94"]]},{"id":"de1e0e32.44154","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1158.878662109375,"y":267.92422103881836,"z":"669f9d98.2ac9f4","wires":[["5f574a63.b3a724"]]},{"id":"f6b5a926.ce9888","type":"execute","name":"excute 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=\"put\" />\n\t<parameter name=\"responsePrefix\" value=\"restapi-result\" />\n\t\n\t","comments":"","outputs":1,"x":1026.5221099853516,"y":1073.9054565429688,"z":"669f9d98.2ac9f4","wires":[[]]},{"id":"2dff6fee.5d34e","type":"set","name":"set localhost data","xml":"<set>\n<parameter name='prop.appcRestApi.url' value='http://localhost:8181' />\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":1331.5221557617188,"y":746.905517578125,"z":"669f9d98.2ac9f4","wires":[]},{"id":"5f574a63.b3a724","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 last-order-status'/>","comments":"","x":1323.8331832885742,"y":267.4998950958252,"z":"669f9d98.2ac9f4","wires":[]},{"id":"e27e181e.227c48","type":"comment","name":"VNF-TOPOLOGY-ACTIVATE","info":"","comments":"","x":665.7221984863281,"y":35.88888168334961,"z":"669f9d98.2ac9f4","wires":[]},{"id":"2aacf238.e9652e","type":"comment","name":"once success is returned, operational-data gets saved","info":"","comments":"","x":669.3510437011719,"y":1228.434326171875,"z":"669f9d98.2ac9f4","wires":[]},{"id":"75691490.243aac","type":"comment","name":"request-action = VNFActivateRequest, svc-action = activate","info":"","comments":"","x":672.4444122314453,"y":75.66666221618652,"z":"669f9d98.2ac9f4","wires":[]},{"id":"bcfdeb55.ac2538","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":356.15079498291016,"y":1191.6031608581543,"z":"669f9d98.2ac9f4","wires":[]},{"id":"2c6e5e35.0760b2","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":967.5221862792969,"y":1019.9054832458496,"z":"669f9d98.2ac9f4","wires":[]},{"id":"873d2429.978de8","type":"comment","name":"Get Hostname and IP address","info":"","comments":"","x":1005.2166748046875,"y":821.9387817382812,"z":"669f9d98.2ac9f4","wires":[]},{"id":"c3f63154.8e521","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":975.2166442871094,"y":866.9388999938965,"z":"669f9d98.2ac9f4","wires":[["7112332f.7cf7ac"]]},{"id":"1c75c042.26d5d","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":1338.2167663574219,"y":972.9389305114746,"z":"669f9d98.2ac9f4","wires":[["f162e338.32bba"]]},{"id":"f162e338.32bba","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1525.2167663574219,"y":972.9389305114746,"z":"669f9d98.2ac9f4","wires":[["fb2d23d2.1064d"]]},{"id":"fb2d23d2.1064d","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":1693.2167663574219,"y":973.5389366149902,"z":"669f9d98.2ac9f4","wires":[]},{"id":"7112332f.7cf7ac","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1148.2167663574219,"y":910.9388999938965,"z":"669f9d98.2ac9f4","wires":[["1c75c042.26d5d","9dc9c622.a5ca58"]]},{"id":"9dc9c622.a5ca58","type":"switchNode","name":"switch vpg_private_ip_1","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-name == 'vpg_private_ip_1'`\">\n","comments":"","outputs":1,"x":1342.2167053222656,"y":1034.538906097412,"z":"669f9d98.2ac9f4","wires":[["43a36baf.403124"]]},{"id":"43a36baf.403124","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1527.2167053222656,"y":1032.538906097412,"z":"669f9d98.2ac9f4","wires":[["b4b98be7.2c0088"]]},{"id":"b4b98be7.2c0088","type":"set","name":"set vpg_ipaddress","xml":"<set>\n<parameter name='prop.vpg_ipaddress' value='`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-value`' />\n","comments":"","x":1696.2167053222656,"y":1030.538906097412,"z":"669f9d98.2ac9f4","wires":[]},{"id":"54b07b39.58cfd4","type":"comment","name":"unlinked AnAI update for slitesting","info":"","comments":"","x":399.1666564941406,"y":509.8888816833496,"z":"669f9d98.2ac9f4","wires":[]}]
\ No newline at end of file +[ + { + "id": "9b515625.d22748", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 93.33332824707031, + "y": 36.33332824707031, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "80315e6e.63505" + ] + ] + }, + { + "id": "80315e6e.63505", + "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": 258.49998474121094, + "y": 36.5, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "3c8cef4d.49542" + ] + ] + }, + { + "id": "3c8cef4d.49542", + "type": "method", + "name": "method vnf-topology-activate", + "xml": "<method rpc='vnf-topology-activate' mode='sync'>\n", + "comments": "", + "outputs": 1, + "x": 166.50001525878906, + "y": 83.49999237060547, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "6cd2edde.1d6bd4" + ] + ] + }, + { + "id": "6cd2edde.1d6bd4", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 123.83332824707031, + "y": 139.3333282470703, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "ab8c4330.26d2b", + "df0bd34b.bf0cf", + "d8650a48.f0bcd8", + "6e2d653a.a05bec", + "9bb6aa32.18f568", + "d92f94a6.8f1a28", + "b846b4fc.934e88", + "c3be1550.0013d8", + "40746641.fe81b8" + ] + ] + }, + { + "id": "ab8c4330.26d2b", + "type": "set", + "name": "set: order-status = Active", + "xml": "<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Active\"/>", + "comments": "", + "x": 376.83333587646484, + "y": 371.83331298828125, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "df0bd34b.bf0cf", + "type": "switchNode", + "name": "switch: order-status = PendingCreate", + "xml": "<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">\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": 416.16670989990234, + "y": 268.1665344238281, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "22236f98.35747" + ] + ] + }, + { + "id": "d8650a48.f0bcd8", + "type": "returnSuccess", + "name": "return success", + "xml": "<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />", + "comments": "", + "x": 333.9444580078125, + "y": 1233.5, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "6e2d653a.a05bec", + "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": 409.94701385498047, + "y": 320.447021484375, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "9bb6aa32.18f568", + "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": 388.60607147216797, + "y": 216.37876892089844, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "4c7aba25.1c7f44" + ] + ] + }, + { + "id": "d92f94a6.8f1a28", + "type": "set", + "name": "set: service-data = input", + "xml": "<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" />", + "comments": "", + "x": 361.8333435058594, + "y": 1147.888916015625, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "b846b4fc.934e88", + "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": 343.83333587646484, + "y": 418.8888854980469, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "40746641.fe81b8", + "type": "save", + "name": "update AnAI - vf-module.orchestration-status", + "xml": "<update plugin=\"org.openecomp.sdnc.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"active\" />", + "comments": "", + "outputs": 1, + "x": 437.7221984863281, + "y": 461.8888816833496, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "738bd5ac.1e39cc" + ] + ] + }, + { + "id": "5a15cf5c.1fe94", + "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": 938.72216796875, + "y": 776.3888549804688, + "z": "669f9d98.2ac9f4", + "wires": [ + [] + ] + }, + { + "id": "c3be1550.0013d8", + "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": 338.522216796875, + "y": 667.9055213928223, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "798dbf61.8ef5c" + ] + ] + }, + { + "id": "22236f98.35747", + "type": "other", + "name": "false", + "xml": "<outcome value='false'>", + "comments": "", + "outputs": 1, + "x": 665.5000610351562, + "y": 268.4998435974121, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "b819ee7c.13f39" + ] + ] + }, + { + "id": "4c7aba25.1c7f44", + "type": "outcomeFalse", + "name": "false", + "xml": "<outcome value='false'>\n", + "comments": "", + "outputs": 1, + "x": 608.060546875, + "y": 216.56058883666992, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "6309638d.9a29fc" + ] + ] + }, + { + "id": "738bd5ac.1e39cc", + "type": "failure", + "name": "failure", + "xml": "<outcome value='failure'>\n", + "comments": "", + "outputs": 1, + "x": 702.2460556030273, + "y": 461.877384185791, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "91b545b4.961ef8" + ] + ] + }, + { + "id": "798dbf61.8ef5c", + "type": "outcome", + "name": "outcome base_vfw", + "xml": "<outcome value='base_vfw'>\n", + "comments": "", + "outputs": 1, + "x": 564.5221862792969, + "y": 697.9055213928223, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "9aacbf5a.ed983" + ] + ] + }, + { + "id": "b819ee7c.13f39", + "type": "switchNode", + "name": "switch: order-status = PendingUpdate", + "xml": "<switch test=\"`$service-data.oper-status.order-status == PendingUpdate`\">\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": 916.4242553710938, + "y": 267.9242515563965, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "de1e0e32.44154" + ] + ] + }, + { + "id": "6309638d.9a29fc", + "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 = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`\"/>", + "comments": "", + "x": 786.1514892578125, + "y": 216.4696922302246, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "91b545b4.961ef8", + "type": "returnFailure", + "name": "return failure", + "xml": "<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while updating vf-module orchestration-status in AnAI with vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>", + "comments": "", + "x": 870.3889846801758, + "y": 461.87745475769043, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "9aacbf5a.ed983", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 778.5221862792969, + "y": 737.9055213928223, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "f6b5a926.ce9888", + "2c6e5e35.0760b2", + "c3f63154.8e521", + "5a15cf5c.1fe94" + ] + ] + }, + { + "id": "de1e0e32.44154", + "type": "other", + "name": "false", + "xml": "<outcome value='false'>", + "comments": "", + "outputs": 1, + "x": 1158.878662109375, + "y": 267.92422103881836, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "5f574a63.b3a724" + ] + ] + }, + { + "id": "f6b5a926.ce9888", + "type": "execute", + "name": "excute 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=\"put\" />\n\t<parameter name=\"responsePrefix\" value=\"restapi-result\" />\n\t\n\t", + "comments": "", + "outputs": 1, + "x": 1026.5221099853516, + "y": 1073.9054565429688, + "z": "669f9d98.2ac9f4", + "wires": [ + [] + ] + }, + { + "id": "2dff6fee.5d34e", + "type": "set", + "name": "set localhost data", + "xml": "<set>\n<parameter name='prop.appcRestApi.url' value='http://localhost:8181' />\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": 1331.5221557617188, + "y": 746.905517578125, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "5f574a63.b3a724", + "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 last-order-status'/>", + "comments": "", + "x": 1323.8331832885742, + "y": 267.4998950958252, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "e27e181e.227c48", + "type": "comment", + "name": "VNF-TOPOLOGY-ACTIVATE", + "info": "", + "comments": "", + "x": 665.7221984863281, + "y": 35.88888168334961, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "2aacf238.e9652e", + "type": "comment", + "name": "once success is returned, operational-data gets saved", + "info": "", + "comments": "", + "x": 669.3510437011719, + "y": 1228.434326171875, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "75691490.243aac", + "type": "comment", + "name": "request-action = VNFActivateRequest, svc-action = activate", + "info": "", + "comments": "", + "x": 672.4444122314453, + "y": 75.66666221618652, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "bcfdeb55.ac2538", + "type": "set", + "name": "Set final indicator to Y", + "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>", + "comments": "", + "x": 356.15079498291016, + "y": 1191.6031608581543, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "2c6e5e35.0760b2", + "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": 967.5221862792969, + "y": 1019.9054832458496, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "873d2429.978de8", + "type": "comment", + "name": "Get Hostname and IP address", + "info": "", + "comments": "", + "x": 1005.2166748046875, + "y": 821.9387817382812, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "c3f63154.8e521", + "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": 975.2166442871094, + "y": 866.9388999938965, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "7112332f.7cf7ac" + ] + ] + }, + { + "id": "1c75c042.26d5d", + "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": 1338.2167663574219, + "y": 972.9389305114746, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "f162e338.32bba" + ] + ] + }, + { + "id": "f162e338.32bba", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1525.2167663574219, + "y": 972.9389305114746, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "fb2d23d2.1064d" + ] + ] + }, + { + "id": "fb2d23d2.1064d", + "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": 1693.2167663574219, + "y": 973.5389366149902, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "7112332f.7cf7ac", + "type": "block", + "name": "block", + "xml": "<block>\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1148.2167663574219, + "y": 910.9388999938965, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "1c75c042.26d5d", + "9dc9c622.a5ca58" + ] + ] + }, + { + "id": "9dc9c622.a5ca58", + "type": "switchNode", + "name": "switch vpg_private_ip_1", + "xml": "<switch test=\"`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-name == 'vpg_private_ip_1'`\">\n", + "comments": "", + "outputs": 1, + "x": 1342.2167053222656, + "y": 1034.538906097412, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "43a36baf.403124" + ] + ] + }, + { + "id": "43a36baf.403124", + "type": "outcomeTrue", + "name": "true", + "xml": "<outcome value='true'>\n", + "comments": "", + "outputs": 1, + "x": 1527.2167053222656, + "y": 1032.538906097412, + "z": "669f9d98.2ac9f4", + "wires": [ + [ + "b4b98be7.2c0088" + ] + ] + }, + { + "id": "b4b98be7.2c0088", + "type": "set", + "name": "set vpg_ipaddress", + "xml": "<set>\n<parameter name='prop.vpg_ipaddress' value='`$preload-data.vnf-topology-information.vnf-parameters[$k].vnf-parameter-value`' />\n", + "comments": "", + "x": 1696.2167053222656, + "y": 1030.538906097412, + "z": "669f9d98.2ac9f4", + "wires": [] + }, + { + "id": "54b07b39.58cfd4", + "type": "comment", + "name": "unlinked AnAI update for slitesting", + "info": "", + "comments": "", + "x": 399.1666564941406, + "y": 509.8888816833496, + "z": "669f9d98.2ac9f4", + "wires": [] + } +] diff --git a/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json b/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json index ec7565fd..62be67b2 100644 --- a/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json +++ b/tutorials/CreateAppcNetconfMount/VNF-API_vnf-topology-delete.json @@ -1 +1,720 @@ -[{"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 +[ + { + "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" + ] + ] + } +] diff --git a/tutorials/CreateAppcNetconfMount/slitester.vnf-topology-activate.json b/tutorials/CreateAppcNetconfMount/slitester.vnf-topology-activate.json index 6410b7b4..2a917f49 100644 --- a/tutorials/CreateAppcNetconfMount/slitester.vnf-topology-activate.json +++ b/tutorials/CreateAppcNetconfMount/slitester.vnf-topology-activate.json @@ -1,53 +1,53 @@ { -"input": { -"module-name": "VNF-API", -"rpc-name": "vnf-topology-activate", -"mode": "sync", -"sli-parameter": [ -{ -"parameter-name": "preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type", -"string-value": "E636c6e5747e4eda9dbb..base_vfw..module-0" -}, -{ -"parameter-name": "preload-data.vnf-topology-information.vnf-parameters_length", -"string-value": "2" -}, -{ -"parameter-name": "preload-data.vnf-topology-information.vnf-parameters[0].vnf-parameter-name", -"string-value": "vpg_name_0" -}, -{ -"parameter-name": "preload-data.vnf-topology-information.vnf-parameters[0].vnf-parameter-value", -"string-value": "testname1" -}, -{ -"parameter-name": "preload-data.vnf-topology-information.vnf-parameters[1].vnf-parameter-name", -"string-value": "vpg_private_ip_1" -}, -{ -"parameter-name": "preload-data.vnf-topology-information.vnf-parameters[1].vnf-parameter-value", -"string-value": "10.0.0.1" -}, -{ -"parameter-name": "service-data.oper-status.order-status", -"string-value": "PendingCreate" -}, -{ -"parameter-name": "service-data.vnf-id", -"string-value": "Vfmodule_Ete_Name3d4e75c0-119d-4c8e-a6bf-179a2bb51831" -}, -{ -"parameter-name": "vnf-topology-operation-input.vnf-request-information.vnf-id", -"string-value": "Vfmodule_Ete_Name3d4e75c0-119d-4c8e-a6bf-179a2bb51831" -}, -{ -"parameter-name": "vnf-topology-operation-input.vnf-request-information.vnf-type", -"string-value": "E636c6e5747e4eda9dbb..base_vfw..module-0" -}, -{ -"parameter-name": "vnf-topology-operation-input.vnf-request-information.generic-vnf-id", -"string-value": "Vnf_Ete_Name3d4e75c0-119d-4c8e-a6bf-179a2bb51831" -} -] -} + "input": { + "module-name": "VNF-API", + "rpc-name": "vnf-topology-activate", + "mode": "sync", + "sli-parameter": [ + { + "parameter-name": "preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type", + "string-value": "E636c6e5747e4eda9dbb..base_vfw..module-0" + }, + { + "parameter-name": "preload-data.vnf-topology-information.vnf-parameters_length", + "string-value": "2" + }, + { + "parameter-name": "preload-data.vnf-topology-information.vnf-parameters[0].vnf-parameter-name", + "string-value": "vpg_name_0" + }, + { + "parameter-name": "preload-data.vnf-topology-information.vnf-parameters[0].vnf-parameter-value", + "string-value": "testname1" + }, + { + "parameter-name": "preload-data.vnf-topology-information.vnf-parameters[1].vnf-parameter-name", + "string-value": "vpg_private_ip_1" + }, + { + "parameter-name": "preload-data.vnf-topology-information.vnf-parameters[1].vnf-parameter-value", + "string-value": "10.0.0.1" + }, + { + "parameter-name": "service-data.oper-status.order-status", + "string-value": "PendingCreate" + }, + { + "parameter-name": "service-data.vnf-id", + "string-value": "Vfmodule_Ete_Name3d4e75c0-119d-4c8e-a6bf-179a2bb51831" + }, + { + "parameter-name": "vnf-topology-operation-input.vnf-request-information.vnf-id", + "string-value": "Vfmodule_Ete_Name3d4e75c0-119d-4c8e-a6bf-179a2bb51831" + }, + { + "parameter-name": "vnf-topology-operation-input.vnf-request-information.vnf-type", + "string-value": "E636c6e5747e4eda9dbb..base_vfw..module-0" + }, + { + "parameter-name": "vnf-topology-operation-input.vnf-request-information.generic-vnf-id", + "string-value": "Vnf_Ete_Name3d4e75c0-119d-4c8e-a6bf-179a2bb51831" + } + ] + } } diff --git a/tutorials/SDNC_AAIService_Adaptor/AAI_READ_TEST_aaiReadTest.json b/tutorials/SDNC_AAIService_Adaptor/AAI_READ_TEST_aaiReadTest.json index 77d78bbd..ff3fe94b 100644 --- a/tutorials/SDNC_AAIService_Adaptor/AAI_READ_TEST_aaiReadTest.json +++ b/tutorials/SDNC_AAIService_Adaptor/AAI_READ_TEST_aaiReadTest.json @@ -108,4 +108,4 @@ [] ] } -]
\ No newline at end of file +] diff --git a/tutorials/SDNC_AAIService_Adaptor/AAI_WRITE_TEST_aaiWriteTest.json b/tutorials/SDNC_AAIService_Adaptor/AAI_WRITE_TEST_aaiWriteTest.json index 4dda3ffe..81a56575 100644 --- a/tutorials/SDNC_AAIService_Adaptor/AAI_WRITE_TEST_aaiWriteTest.json +++ b/tutorials/SDNC_AAIService_Adaptor/AAI_WRITE_TEST_aaiWriteTest.json @@ -93,4 +93,4 @@ [] ] } -]
\ No newline at end of file +] diff --git a/tutorials/VoLTE/l3-dci-connection.json b/tutorials/VoLTE/l3-dci-connection.json index ef8f6892..b03f1082 100644 --- a/tutorials/VoLTE/l3-dci-connection.json +++ b/tutorials/VoLTE/l3-dci-connection.json @@ -1,13 +1,19 @@ { - "l3-dci-connect": { - "id": "${device.id}", - "name": "${device.name}", - "description": "${device.description}", - "router_id": "${device.router_id}", - "local_subnets": ["${device.local_subnets}"], - "local_network_all":false, - "evpn_irts": ["${device.evpn_irts}"], - "evpn_erts": ["${device.evpn_erts}"], - "l3_vni": "${device.wan.l3_vni}" - } + "l3-dci-connect": { + "id": "${device.id}", + "name": "${device.name}", + "description": "${device.description}", + "router_id": "${device.router_id}", + "local_subnets": [ + "${device.local_subnets}" + ], + "local_network_all": false, + "evpn_irts": [ + "${device.evpn_irts}" + ], + "evpn_erts": [ + "${device.evpn_erts}" + ], + "l3_vni": "${device.wan.l3_vni}" + } } diff --git a/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json index 300ac99d..312ad651 100644 --- a/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json +++ b/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json @@ -1,32 +1,46 @@ { - "service": "queryPolicy", - "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD", - "description": "Query policy for vFW TD", - "templateVersion": "OpenSource.version.1", - "version": "OpenSource.version.1", - "priority": "3", - "riskType": "test", - "riskLevel": "2", - "guard": "False", - "content": { - "queryProperties": [ - {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1}, - {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2}, - {"attribute":"chosen_region", "attribute_location": "chosenRegion"}, - {"attribute":"chosen_customer_id", "attribute_location": "chosenCustomerId"} - ], - "policyScope": [ - "td", - "us", - "vFW-SINK", - "vPGN" - ], - "policyType": "request_param_query", - "serviceName": "vFW_TD", - "identity": "vFW_TD_Query_Policy", - "resources": [ + "service": "queryPolicy", + "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD", + "description": "Query policy for vFW TD", + "templateVersion": "OpenSource.version.1", + "version": "OpenSource.version.1", + "priority": "3", + "riskType": "test", + "riskLevel": "2", + "guard": "False", + "content": { + "queryProperties": [ + { + "attribute": "customerLatitude", + "attribute_location": "customerLatitude", + "value": 1.1 + }, + { + "attribute": "customerLongitude", + "attribute_location": "customerLongitude", + "value": 2.2 + }, + { + "attribute": "chosen_region", + "attribute_location": "chosenRegion" + }, + { + "attribute": "chosen_customer_id", + "attribute_location": "chosenCustomerId" + } + ], + "policyScope": [ + "td", + "us", "vFW-SINK", "vPGN" - ] - } + ], + "policyType": "request_param_query", + "serviceName": "vFW_TD", + "identity": "vFW_TD_Query_Policy", + "resources": [ + "vFW-SINK", + "vPGN" + ] + } } diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json index 8df45e33..240c7325 100644 --- a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json +++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json @@ -16,26 +16,32 @@ "vFW-SINK" ], "policyType": "vnfPolicy", - "resources": ["vFW-SINK"], + "resources": [ + "vFW-SINK" + ], "applicableResources": "any", - "vnfProperties": [{ - "inventoryProvider": "aai", - "serviceType": "", - "inventoryType": "vfmodule", - "customerId": { - "get_param": "chosen_customer_id" - }, - "equipmentRole": "", - "attributes": { - "orchestrationStatus": ["active"], - "provStatus": "ACTIVE", - "cloudRegionId": { - "get_param": "chosen_region" + "vnfProperties": [ + { + "inventoryProvider": "aai", + "serviceType": "", + "inventoryType": "vfmodule", + "customerId": { + "get_param": "chosen_customer_id" }, - "service_instance_id": { - "get_param": "service_id" + "equipmentRole": "", + "attributes": { + "orchestrationStatus": [ + "active" + ], + "provStatus": "ACTIVE", + "cloudRegionId": { + "get_param": "chosen_region" + }, + "service_instance_id": { + "get_param": "service_id" + } } } - }] + ] } } diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json index 452fdb63..277d7d0d 100644 --- a/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json +++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json @@ -16,26 +16,32 @@ "vPGN" ], "policyType": "vnfPolicy", - "resources": ["vPGN"], + "resources": [ + "vPGN" + ], "applicableResources": "any", - "vnfProperties": [{ - "inventoryProvider": "aai", - "serviceType": "", - "inventoryType": "vfmodule", - "customerId": { - "get_param": "chosen_customer_id" - }, - "equipmentRole": "", - "attributes": { - "orchestrationStatus": ["active"], - "provStatus": "ACTIVE", - "cloudRegionId": { - "get_param": "chosen_region" + "vnfProperties": [ + { + "inventoryProvider": "aai", + "serviceType": "", + "inventoryType": "vfmodule", + "customerId": { + "get_param": "chosen_customer_id" }, - "service_instance_id": { - "get_param": "service_id" + "equipmentRole": "", + "attributes": { + "orchestrationStatus": [ + "active" + ], + "provStatus": "ACTIVE", + "cloudRegionId": { + "get_param": "chosen_region" + }, + "service_instance_id": { + "get_param": "service_id" + } } } - }] + ] } } diff --git a/tutorials/vFWDT/preloads/vfw-1-preload.json b/tutorials/vFWDT/preloads/vfw-1-preload.json index be42a3bd..59f9cf10 100644 --- a/tutorials/vFWDT/preloads/vfw-1-preload.json +++ b/tutorials/vFWDT/preloads/vfw-1-preload.json @@ -1,141 +1,176 @@ { - "input": { - "request-information": { - "notification-url": "openecomp.org", - "order-number": "1", - "order-version": "1", - "request-action": "PreloadVNFRequest", - "request-id": "robot12" - }, - "sdnc-request-header": { - "svc-action": "reserve", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-request-id": "robot12" - }, - "vnf-topology-information": { - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": - [{ - "vnf-parameter-name": "unprotected_private_net_id", - "vnf-parameter-value": "unprotected_net_dt" - }, { - "vnf-parameter-name": "unprotected_private_subnet_id", - "vnf-parameter-value": "unprotected_subnet_dt" - }, { - "vnf-parameter-name": "unprotected_private_net_cidr", - "vnf-parameter-value": "192.168.10.0/24" - }, { - "vnf-parameter-name": "protected_private_net_id", - "vnf-parameter-value": "protected_net_dt" - }, { - "vnf-parameter-name": "protected_private_net_cidr", - "vnf-parameter-value": "192.168.20.0/24" - }, { - "vnf-parameter-name": "protected_private_subnet_id", - "vnf-parameter-value": "protected_subnet_dt" - }, { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vfw_key" - }, { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, { - "vnf-parameter-name": "vsn_name_0", - "vnf-parameter-value": "vfw-vsn-1-dt" - }, { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "oam_onap_y3id" - }, { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "oam_onap_y3id" - }, { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, { - "vnf-parameter-name": "ext_private_net_id", - "vnf-parameter-value": "onap_oam_ext" - }, { - "vnf-parameter-name": "ext_private_subnet_id", - "vnf-parameter-value": "onap_oam_ext_sub" - }, { - "vnf-parameter-name": "ext_private_net_cidr", - "vnf-parameter-value": "10.100.0.0/16" - }, { - "vnf-parameter-name": "nexus_artifact_repo", - "vnf-parameter-value": "https://nexus.onap.org" - }, { - "vnf-parameter-name": "vfw_name_0", - "vnf-parameter-value": "vfw-vfw-1-dt" - }, { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "8080" - }, { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "external" - }, { - "vnf-parameter-name": "image_name", - "vnf-parameter-value": "ubuntu-14-04-cloud-amd64" - }, { - "vnf-parameter-name": "flavor_name", - "vnf-parameter-value": "m1.medium" - }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.4.0" - }, { - "vnf-parameter-name": "vfw_private_ip_0", - "vnf-parameter-value": "192.168.10.100" - }, { - "vnf-parameter-name": "vfw_private_ip_1", - "vnf-parameter-value": "192.168.20.100" - }, { - "vnf-parameter-name": "vfw_private_ip_2", - "vnf-parameter-value": "10.0.110.1" - }, { - "vnf-parameter-name": "vfw_private_ip_3", - "vnf-parameter-value": "10.100.100.1" - }, { - "vnf-parameter-name": "vpg_private_ip_0", - "vnf-parameter-value": "192.168.10.200" - }, { - "vnf-parameter-name": "vpg_private_ip_1", - "vnf-parameter-value": "10.0.110.2" - }, { - "vnf-parameter-name": "vpg_private_ip_2", - "vnf-parameter-value": "10.100.100.2" - }, { - "vnf-parameter-name": "vsn_private_ip_1", - "vnf-parameter-value": "10.0.110.3" - }, { - "vnf-parameter-name": "vsn_private_ip_0", - "vnf-parameter-value": "192.168.20.250" - }, { - "vnf-parameter-name": "vsn_private_ip_2", - "vnf-parameter-value": "10.100.100.3" - }, { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.4.0" - }, { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz" - }, { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "10.0.4.1" - }, { - "vnf-parameter-name": "sec_group", - "vnf-parameter-value": "onap_sg_y3id" - } - ], - "vnf-topology-identifier": { - "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535", - "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0", - "generic-vnf-name": "vfw-vsnk-dt-1", - "generic-vnf-type": "vFWSNK-DistributeTraffic 0", - "vnf-name": "vfw-dt-module-1" - } - } - } + "input": { + "request-information": { + "notification-url": "openecomp.org", + "order-number": "1", + "order-version": "1", + "request-action": "PreloadVNFRequest", + "request-id": "robot12" + }, + "sdnc-request-header": { + "svc-action": "reserve", + "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify", + "svc-request-id": "robot12" + }, + "vnf-topology-information": { + "vnf-assignments": { + "availability-zones": [], + "vnf-networks": [], + "vnf-vms": [] + }, + "vnf-parameters": [ + { + "vnf-parameter-name": "unprotected_private_net_id", + "vnf-parameter-value": "unprotected_net_dt" + }, + { + "vnf-parameter-name": "unprotected_private_subnet_id", + "vnf-parameter-value": "unprotected_subnet_dt" + }, + { + "vnf-parameter-name": "unprotected_private_net_cidr", + "vnf-parameter-value": "192.168.10.0/24" + }, + { + "vnf-parameter-name": "protected_private_net_id", + "vnf-parameter-value": "protected_net_dt" + }, + { + "vnf-parameter-name": "protected_private_net_cidr", + "vnf-parameter-value": "192.168.20.0/24" + }, + { + "vnf-parameter-name": "protected_private_subnet_id", + "vnf-parameter-value": "protected_subnet_dt" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vfw_key" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vsn_name_0", + "vnf-parameter-value": "vfw-vsn-1-dt" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "oam_onap_y3id" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "oam_onap_y3id" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "ext_private_net_id", + "vnf-parameter-value": "onap_oam_ext" + }, + { + "vnf-parameter-name": "ext_private_subnet_id", + "vnf-parameter-value": "onap_oam_ext_sub" + }, + { + "vnf-parameter-name": "ext_private_net_cidr", + "vnf-parameter-value": "10.100.0.0/16" + }, + { + "vnf-parameter-name": "nexus_artifact_repo", + "vnf-parameter-value": "https://nexus.onap.org" + }, + { + "vnf-parameter-name": "vfw_name_0", + "vnf-parameter-value": "vfw-vfw-1-dt" + }, + { + "vnf-parameter-name": "dcae_collector_port", + "vnf-parameter-value": "8080" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "external" + }, + { + "vnf-parameter-name": "image_name", + "vnf-parameter-value": "ubuntu-14-04-cloud-amd64" + }, + { + "vnf-parameter-name": "flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "install_script_version", + "vnf-parameter-value": "1.4.0" + }, + { + "vnf-parameter-name": "vfw_private_ip_0", + "vnf-parameter-value": "192.168.10.100" + }, + { + "vnf-parameter-name": "vfw_private_ip_1", + "vnf-parameter-value": "192.168.20.100" + }, + { + "vnf-parameter-name": "vfw_private_ip_2", + "vnf-parameter-value": "10.0.110.1" + }, + { + "vnf-parameter-name": "vfw_private_ip_3", + "vnf-parameter-value": "10.100.100.1" + }, + { + "vnf-parameter-name": "vpg_private_ip_0", + "vnf-parameter-value": "192.168.10.200" + }, + { + "vnf-parameter-name": "vpg_private_ip_1", + "vnf-parameter-value": "10.0.110.2" + }, + { + "vnf-parameter-name": "vpg_private_ip_2", + "vnf-parameter-value": "10.100.100.2" + }, + { + "vnf-parameter-name": "vsn_private_ip_1", + "vnf-parameter-value": "10.0.110.3" + }, + { + "vnf-parameter-name": "vsn_private_ip_0", + "vnf-parameter-value": "192.168.20.250" + }, + { + "vnf-parameter-name": "vsn_private_ip_2", + "vnf-parameter-value": "10.100.100.3" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.4.0" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz" + }, + { + "vnf-parameter-name": "dcae_collector_ip", + "vnf-parameter-value": "10.0.4.1" + }, + { + "vnf-parameter-name": "sec_group", + "vnf-parameter-value": "onap_sg_y3id" + } + ], + "vnf-topology-identifier": { + "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535", + "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0", + "generic-vnf-name": "vfw-vsnk-dt-1", + "generic-vnf-type": "vFWSNK-DistributeTraffic 0", + "vnf-name": "vfw-dt-module-1" + } + } + } } diff --git a/tutorials/vFWDT/preloads/vfw-2-preload.json b/tutorials/vFWDT/preloads/vfw-2-preload.json index 17b473ef..6bd52687 100644 --- a/tutorials/vFWDT/preloads/vfw-2-preload.json +++ b/tutorials/vFWDT/preloads/vfw-2-preload.json @@ -1,141 +1,176 @@ { - "input": { - "request-information": { - "notification-url": "openecomp.org", - "order-number": "1", - "order-version": "1", - "request-action": "PreloadVNFRequest", - "request-id": "robot12" - }, - "sdnc-request-header": { - "svc-action": "reserve", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-request-id": "robot12" - }, - "vnf-topology-information": { - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": - [{ - "vnf-parameter-name": "unprotected_private_net_id", - "vnf-parameter-value": "unprotected_net_dt" - }, { - "vnf-parameter-name": "unprotected_private_subnet_id", - "vnf-parameter-value": "unprotected_subnet_dt" - }, { - "vnf-parameter-name": "unprotected_private_net_cidr", - "vnf-parameter-value": "192.168.10.0/24" - }, { - "vnf-parameter-name": "protected_private_net_id", - "vnf-parameter-value": "protected_net_dt" - }, { - "vnf-parameter-name": "protected_private_net_cidr", - "vnf-parameter-value": "192.168.20.0/24" - }, { - "vnf-parameter-name": "protected_private_subnet_id", - "vnf-parameter-value": "protected_subnet_dt" - }, { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vfw_key" - }, { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, { - "vnf-parameter-name": "vsn_name_0", - "vnf-parameter-value": "vfw-vsn-2-dt" - }, { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "oam_onap_y3id" - }, { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "oam_onap_y3id" - }, { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, { - "vnf-parameter-name": "ext_private_net_id", - "vnf-parameter-value": "onap_oam_ext" - }, { - "vnf-parameter-name": "ext_private_subnet_id", - "vnf-parameter-value": "onap_oam_ext_sub" - }, { - "vnf-parameter-name": "ext_private_net_cidr", - "vnf-parameter-value": "10.100.0.0/16" - }, { - "vnf-parameter-name": "nexus_artifact_repo", - "vnf-parameter-value": "https://nexus.onap.org" - }, { - "vnf-parameter-name": "vfw_name_0", - "vnf-parameter-value": "vfw-vfw-2-dt" - }, { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "8080" - }, { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "external" - }, { - "vnf-parameter-name": "image_name", - "vnf-parameter-value": "ubuntu-14-04-cloud-amd64" - }, { - "vnf-parameter-name": "flavor_name", - "vnf-parameter-value": "m1.medium" - }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.4.0" - }, { - "vnf-parameter-name": "vfw_private_ip_0", - "vnf-parameter-value": "192.168.10.110" - }, { - "vnf-parameter-name": "vfw_private_ip_1", - "vnf-parameter-value": "192.168.20.110" - }, { - "vnf-parameter-name": "vfw_private_ip_2", - "vnf-parameter-value": "10.0.110.4" - }, { - "vnf-parameter-name": "vfw_private_ip_3", - "vnf-parameter-value": "10.100.100.4" - }, { - "vnf-parameter-name": "vpg_private_ip_0", - "vnf-parameter-value": "192.168.10.200" - }, { - "vnf-parameter-name": "vpg_private_ip_1", - "vnf-parameter-value": "10.0.110.2" - }, { - "vnf-parameter-name": "vpg_private_ip_2", - "vnf-parameter-value": "10.100.100.2" - }, { - "vnf-parameter-name": "vsn_private_ip_1", - "vnf-parameter-value": "10.0.110.5" - }, { - "vnf-parameter-name": "vsn_private_ip_0", - "vnf-parameter-value": "192.168.20.240" - }, { - "vnf-parameter-name": "vsn_private_ip_2", - "vnf-parameter-value": "10.100.100.5" - }, { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.4.0" - }, { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz" - }, { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "10.0.4.1" - }, { - "vnf-parameter-name": "sec_group", - "vnf-parameter-value": "onap_sg_y3id" - } - ], - "vnf-topology-identifier": { - "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535", - "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0", - "generic-vnf-name": "vfw-vsnk-dt-2", - "generic-vnf-type": "vFWSNK-DistributeTraffic 1", - "vnf-name": "vfw-dt-module-2" - } - } - } + "input": { + "request-information": { + "notification-url": "openecomp.org", + "order-number": "1", + "order-version": "1", + "request-action": "PreloadVNFRequest", + "request-id": "robot12" + }, + "sdnc-request-header": { + "svc-action": "reserve", + "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify", + "svc-request-id": "robot12" + }, + "vnf-topology-information": { + "vnf-assignments": { + "availability-zones": [], + "vnf-networks": [], + "vnf-vms": [] + }, + "vnf-parameters": [ + { + "vnf-parameter-name": "unprotected_private_net_id", + "vnf-parameter-value": "unprotected_net_dt" + }, + { + "vnf-parameter-name": "unprotected_private_subnet_id", + "vnf-parameter-value": "unprotected_subnet_dt" + }, + { + "vnf-parameter-name": "unprotected_private_net_cidr", + "vnf-parameter-value": "192.168.10.0/24" + }, + { + "vnf-parameter-name": "protected_private_net_id", + "vnf-parameter-value": "protected_net_dt" + }, + { + "vnf-parameter-name": "protected_private_net_cidr", + "vnf-parameter-value": "192.168.20.0/24" + }, + { + "vnf-parameter-name": "protected_private_subnet_id", + "vnf-parameter-value": "protected_subnet_dt" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vfw_key" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vsn_name_0", + "vnf-parameter-value": "vfw-vsn-2-dt" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "oam_onap_y3id" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "oam_onap_y3id" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "ext_private_net_id", + "vnf-parameter-value": "onap_oam_ext" + }, + { + "vnf-parameter-name": "ext_private_subnet_id", + "vnf-parameter-value": "onap_oam_ext_sub" + }, + { + "vnf-parameter-name": "ext_private_net_cidr", + "vnf-parameter-value": "10.100.0.0/16" + }, + { + "vnf-parameter-name": "nexus_artifact_repo", + "vnf-parameter-value": "https://nexus.onap.org" + }, + { + "vnf-parameter-name": "vfw_name_0", + "vnf-parameter-value": "vfw-vfw-2-dt" + }, + { + "vnf-parameter-name": "dcae_collector_port", + "vnf-parameter-value": "8080" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "external" + }, + { + "vnf-parameter-name": "image_name", + "vnf-parameter-value": "ubuntu-14-04-cloud-amd64" + }, + { + "vnf-parameter-name": "flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "install_script_version", + "vnf-parameter-value": "1.4.0" + }, + { + "vnf-parameter-name": "vfw_private_ip_0", + "vnf-parameter-value": "192.168.10.110" + }, + { + "vnf-parameter-name": "vfw_private_ip_1", + "vnf-parameter-value": "192.168.20.110" + }, + { + "vnf-parameter-name": "vfw_private_ip_2", + "vnf-parameter-value": "10.0.110.4" + }, + { + "vnf-parameter-name": "vfw_private_ip_3", + "vnf-parameter-value": "10.100.100.4" + }, + { + "vnf-parameter-name": "vpg_private_ip_0", + "vnf-parameter-value": "192.168.10.200" + }, + { + "vnf-parameter-name": "vpg_private_ip_1", + "vnf-parameter-value": "10.0.110.2" + }, + { + "vnf-parameter-name": "vpg_private_ip_2", + "vnf-parameter-value": "10.100.100.2" + }, + { + "vnf-parameter-name": "vsn_private_ip_1", + "vnf-parameter-value": "10.0.110.5" + }, + { + "vnf-parameter-name": "vsn_private_ip_0", + "vnf-parameter-value": "192.168.20.240" + }, + { + "vnf-parameter-name": "vsn_private_ip_2", + "vnf-parameter-value": "10.100.100.5" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.4.0" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz" + }, + { + "vnf-parameter-name": "dcae_collector_ip", + "vnf-parameter-value": "10.0.4.1" + }, + { + "vnf-parameter-name": "sec_group", + "vnf-parameter-value": "onap_sg_y3id" + } + ], + "vnf-topology-identifier": { + "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535", + "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0", + "generic-vnf-name": "vfw-vsnk-dt-2", + "generic-vnf-type": "vFWSNK-DistributeTraffic 1", + "vnf-name": "vfw-dt-module-2" + } + } + } } diff --git a/tutorials/vFWDT/preloads/vpkg-preload.json b/tutorials/vFWDT/preloads/vpkg-preload.json index 8a303b28..5f9bdba0 100644 --- a/tutorials/vFWDT/preloads/vpkg-preload.json +++ b/tutorials/vFWDT/preloads/vpkg-preload.json @@ -1,141 +1,176 @@ { - "input": { - "request-information": { - "notification-url": "openecomp.org", - "order-number": "1", - "order-version": "1", - "request-action": "PreloadVNFRequest", - "request-id": "robot12" - }, - "sdnc-request-header": { - "svc-action": "reserve", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-request-id": "robot12" - }, - "vnf-topology-information": { - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": - [{ - "vnf-parameter-name": "unprotected_private_net_id", - "vnf-parameter-value": "unprotected_net_dt" - }, { - "vnf-parameter-name": "unprotected_private_subnet_id", - "vnf-parameter-value": "unprotected_subnet_dt" - }, { - "vnf-parameter-name": "unprotected_private_net_cidr", - "vnf-parameter-value": "192.168.10.0/24" - }, { - "vnf-parameter-name": "protected_private_net_id", - "vnf-parameter-value": "protected_net_dt" - }, { - "vnf-parameter-name": "protected_private_net_cidr", - "vnf-parameter-value": "192.168.20.0/24" - }, { - "vnf-parameter-name": "protected_private_subnet_id", - "vnf-parameter-value": "protected_subnet_dt" - }, { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vfw_key" - }, { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, { - "vnf-parameter-name": "vsn_name_0", - "vnf-parameter-value": "vfw-vsn-0-dt" - }, { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "oam_onap_y3id" - }, { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "oam_onap_y3id" - }, { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, { - "vnf-parameter-name": "ext_private_net_id", - "vnf-parameter-value": "onap_oam_ext" - }, { - "vnf-parameter-name": "ext_private_subnet_id", - "vnf-parameter-value": "onap_oam_ext_sub" - }, { - "vnf-parameter-name": "ext_private_net_cidr", - "vnf-parameter-value": "10.100.0.0/16" - }, { - "vnf-parameter-name": "nexus_artifact_repo", - "vnf-parameter-value": "https://nexus.onap.org" - }, { - "vnf-parameter-name": "vfw_name_0", - "vnf-parameter-value": "vfw-vfw-0-dt" - }, { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "8080" - }, { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "external" - }, { - "vnf-parameter-name": "image_name", - "vnf-parameter-value": "ubuntu-14-04-cloud-amd64" - }, { - "vnf-parameter-name": "flavor_name", - "vnf-parameter-value": "m1.medium" - }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.4.0" - }, { - "vnf-parameter-name": "vfw_private_ip_0", - "vnf-parameter-value": "192.168.10.100" - }, { - "vnf-parameter-name": "vfw_private_ip_1", - "vnf-parameter-value": "192.168.20.100" - }, { - "vnf-parameter-name": "vfw_private_ip_2", - "vnf-parameter-value": "10.0.110.1" - }, { - "vnf-parameter-name": "vfw_private_ip_3", - "vnf-parameter-value": "10.100.100.1" - }, { - "vnf-parameter-name": "vpg_private_ip_0", - "vnf-parameter-value": "192.168.10.200" - }, { - "vnf-parameter-name": "vpg_private_ip_1", - "vnf-parameter-value": "10.0.110.2" - }, { - "vnf-parameter-name": "vpg_private_ip_2", - "vnf-parameter-value": "10.100.100.2" - }, { - "vnf-parameter-name": "vsn_private_ip_1", - "vnf-parameter-value": "10.0.110.3" - }, { - "vnf-parameter-name": "vsn_private_ip_0", - "vnf-parameter-value": "192.168.20.250" - }, { - "vnf-parameter-name": "vsn_private_ip_2", - "vnf-parameter-value": "10.100.100.3" - }, { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.4.0" - }, { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz" - }, { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "10.0.4.1" - }, { - "vnf-parameter-name": "sec_group", - "vnf-parameter-value": "onap_sg_y3id" - } - ], - "vnf-topology-identifier": { - "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535", - "vnf-type": "VpkgDistributetraffic..base_vpkg..module-0", - "generic-vnf-name": "vpkg-dt-1", - "generic-vnf-type": "vPKG-DistributeTraffic 0", - "vnf-name": "vpkg-dt-module-1" - } - } - } + "input": { + "request-information": { + "notification-url": "openecomp.org", + "order-number": "1", + "order-version": "1", + "request-action": "PreloadVNFRequest", + "request-id": "robot12" + }, + "sdnc-request-header": { + "svc-action": "reserve", + "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify", + "svc-request-id": "robot12" + }, + "vnf-topology-information": { + "vnf-assignments": { + "availability-zones": [], + "vnf-networks": [], + "vnf-vms": [] + }, + "vnf-parameters": [ + { + "vnf-parameter-name": "unprotected_private_net_id", + "vnf-parameter-value": "unprotected_net_dt" + }, + { + "vnf-parameter-name": "unprotected_private_subnet_id", + "vnf-parameter-value": "unprotected_subnet_dt" + }, + { + "vnf-parameter-name": "unprotected_private_net_cidr", + "vnf-parameter-value": "192.168.10.0/24" + }, + { + "vnf-parameter-name": "protected_private_net_id", + "vnf-parameter-value": "protected_net_dt" + }, + { + "vnf-parameter-name": "protected_private_net_cidr", + "vnf-parameter-value": "192.168.20.0/24" + }, + { + "vnf-parameter-name": "protected_private_subnet_id", + "vnf-parameter-value": "protected_subnet_dt" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vfw_key" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vsn_name_0", + "vnf-parameter-value": "vfw-vsn-0-dt" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "oam_onap_y3id" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "oam_onap_y3id" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "ext_private_net_id", + "vnf-parameter-value": "onap_oam_ext" + }, + { + "vnf-parameter-name": "ext_private_subnet_id", + "vnf-parameter-value": "onap_oam_ext_sub" + }, + { + "vnf-parameter-name": "ext_private_net_cidr", + "vnf-parameter-value": "10.100.0.0/16" + }, + { + "vnf-parameter-name": "nexus_artifact_repo", + "vnf-parameter-value": "https://nexus.onap.org" + }, + { + "vnf-parameter-name": "vfw_name_0", + "vnf-parameter-value": "vfw-vfw-0-dt" + }, + { + "vnf-parameter-name": "dcae_collector_port", + "vnf-parameter-value": "8080" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "external" + }, + { + "vnf-parameter-name": "image_name", + "vnf-parameter-value": "ubuntu-14-04-cloud-amd64" + }, + { + "vnf-parameter-name": "flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "install_script_version", + "vnf-parameter-value": "1.4.0" + }, + { + "vnf-parameter-name": "vfw_private_ip_0", + "vnf-parameter-value": "192.168.10.100" + }, + { + "vnf-parameter-name": "vfw_private_ip_1", + "vnf-parameter-value": "192.168.20.100" + }, + { + "vnf-parameter-name": "vfw_private_ip_2", + "vnf-parameter-value": "10.0.110.1" + }, + { + "vnf-parameter-name": "vfw_private_ip_3", + "vnf-parameter-value": "10.100.100.1" + }, + { + "vnf-parameter-name": "vpg_private_ip_0", + "vnf-parameter-value": "192.168.10.200" + }, + { + "vnf-parameter-name": "vpg_private_ip_1", + "vnf-parameter-value": "10.0.110.2" + }, + { + "vnf-parameter-name": "vpg_private_ip_2", + "vnf-parameter-value": "10.100.100.2" + }, + { + "vnf-parameter-name": "vsn_private_ip_1", + "vnf-parameter-value": "10.0.110.3" + }, + { + "vnf-parameter-name": "vsn_private_ip_0", + "vnf-parameter-value": "192.168.20.250" + }, + { + "vnf-parameter-name": "vsn_private_ip_2", + "vnf-parameter-value": "10.100.100.3" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.4.0" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz" + }, + { + "vnf-parameter-name": "dcae_collector_ip", + "vnf-parameter-value": "10.0.4.1" + }, + { + "vnf-parameter-name": "sec_group", + "vnf-parameter-value": "onap_sg_y3id" + } + ], + "vnf-topology-identifier": { + "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535", + "vnf-type": "VpkgDistributetraffic..base_vpkg..module-0", + "generic-vnf-name": "vpkg-dt-1", + "generic-vnf-type": "vPKG-DistributeTraffic 0", + "vnf-name": "vpkg-dt-module-1" + } + } + } } diff --git a/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json b/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json index 5be6627b..628cfcdc 100644 --- a/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json +++ b/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json @@ -25,4 +25,4 @@ "correlation-id": "c09ac7d1-de62-0016-2000-e63701125557-201", "version": "2.0", "type": "request" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json b/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json index fa0eb79e..a0151ecd 100644 --- a/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json +++ b/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json @@ -1,21 +1,21 @@ { - "input": { - "action": "DistributeTraffic", - "payload": "{\"configuration-parameters\":{\"file_parameter_content\":\"{\\\"fwIp\\\":\\\"192.168.10.100\\\",\\\"sinkIp\\\":\\\"192.168.20.250\\\"}\",\"node_list\":\"[vpkg-1]\"}}", - "common-header": { - "api-ver": "2.00", - "timestamp": "2019-05-20T08:18:07.244Z", - "flags": { - "force": "TRUE", - "mode": "NORMAL", - "ttl": 36000 - }, - "request-id": "8ac122fd-6261-4e72-ba5c-5384fcd0ab2b", - "originator-id": "vfw-dt-demo", - "sub-request-id": "cefe9354-809d-4dd2-ab6d-e1f9d2fa9ea3" - }, - "action-identifiers": { - "vnf-id": "2d125b4d-e120-4815-a0c7-4c4bec6c89f9" + "input": { + "action": "DistributeTraffic", + "payload": "{\"configuration-parameters\":{\"file_parameter_content\":\"{\\\"fwIp\\\":\\\"192.168.10.100\\\",\\\"sinkIp\\\":\\\"192.168.20.250\\\"}\",\"node_list\":\"[vpkg-1]\"}}", + "common-header": { + "api-ver": "2.00", + "timestamp": "2019-05-20T08:18:07.244Z", + "flags": { + "force": "TRUE", + "mode": "NORMAL", + "ttl": 36000 + }, + "request-id": "8ac122fd-6261-4e72-ba5c-5384fcd0ab2b", + "originator-id": "vfw-dt-demo", + "sub-request-id": "cefe9354-809d-4dd2-ab6d-e1f9d2fa9ea3" + }, + "action-identifiers": { + "vnf-id": "2d125b4d-e120-4815-a0c7-4c4bec6c89f9" + } } - } -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json index 9e7429a6..60c2b104 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json @@ -6,4 +6,4 @@ "artifact-type": "APPC-CONFIG", "artifact-version": "0.0.1", "artifact-contents": "{\r\n \"InventoryNames\": \"VM\",\r\n \"PlaybookName\": \"${book_name}\",\r\n \"AutoNodeList\": True,\r\n \"EnvParameters\": {\r\n \"ConfigFileName\": \"../traffic_distribution_config.json\",\r\n \"vnf_instance\": \"vfwdt\",\r\n },\r\n \"FileParameters\": {\r\n \"traffic_distribution_config.json\": \"${file_parameter_content}\"\r\n },\r\n \"Timeout\": 3600\r\n}" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json index 4269f0e1..765e0b1e 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json @@ -74,4 +74,4 @@ "scopeType": "vnf-type" } ] -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json index c99112ae..21c51733 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json @@ -6,4 +6,4 @@ "artifact-type": "APPC-CONFIG", "artifact-version": "0.1", "artifact-contents": "{\"reference_data\":[{\"action\":\"DistributeTraffic\",\"action-level\":\"vnf\",\"scope\":{\"vnf-type\":\"vFWDT 2020-02-03 14:40:/vFWDT_vPKG 81793128-bca7 0\",\"vnfc-type-list\":[],\"vnfc-type\":\"\"},\"template\":\"Y\",\"vm\":[],\"device-protocol\":\"ANSIBLE\",\"user-name\":\"admin\",\"port-number\":\"8000\",\"artifact-list\":[{\"artifact-name\":\"template_DistributeTraffic_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"config_template\"},{\"artifact-name\":\"pd_DistributeTraffic_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.yaml\",\"artifact-type\":\"parameter_definitions\"},{\"artifact-name\":\"param_DistributeTraffic_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"param_values\"}],\"scopeType\":\"vnf-type\"},{\"action\":\"AllAction\",\"action-level\":\"vnf\",\"scope\":{\"vnf-type\":\"vFWDT 2020-02-03 14:40:/vFWDT_vPKG 81793128-bca7 0\",\"vnfc-type-list\":[],\"vnfc-type\":\"\"},\"artifact-list\":[{\"artifact-name\":\"reference_AllAction_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"reference_template\"}]},{\"action\":\"DistributeTrafficCheck\",\"action-level\":\"vnf\",\"scope\":{\"vnf-type\":\"vFWDT 2020-02-03 14:40:/vFWDT_vPKG 81793128-bca7 0\",\"vnfc-type-list\":[],\"vnfc-type\":\"\"},\"template\":\"Y\",\"vm\":[],\"device-protocol\":\"ANSIBLE\",\"user-name\":\"admin\",\"port-number\":\"8000\",\"artifact-list\":[{\"artifact-name\":\"template_DistributeTrafficCheck_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"config_template\"},{\"artifact-name\":\"pd_DistributeTrafficCheck_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.yaml\",\"artifact-type\":\"parameter_definitions\"},{\"artifact-name\":\"param_DistributeTrafficCheck_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"param_values\"}],\"scopeType\":\"vnf-type\"}]}" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json index a0104861..1f364fed 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json @@ -6,4 +6,4 @@ "artifact-type": "APPC-CONFIG", "artifact-version": "0.0.1", "artifact-contents": "[{\"book_name\":\"\",\"file_parameter_content\":\"\"}]" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json index 1824592f..737e182e 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json @@ -6,4 +6,4 @@ "artifact-type": "APPC-CONFIG", "artifact-version": "0.0.1", "artifact-contents": "---\nkind: \"Property Definition\"\nversion: V1\nvnf-parameter-list:\n- name: book_name\n type: null\n description: null\n required: null\n default: null\n source: Manual\n rule-type: null\n request-keys: null\n response-keys: null\n- name: file_parameter_content\n type: null\n description: null\n required: null\n default: null\n source: Manual\n rule-type: null\n request-keys: null\n response-keys: null\n" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json index 5d029269..b3b30163 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json @@ -6,4 +6,4 @@ "artifact-type": "APPC-CONFIG", "artifact-version": "0.0.1", "artifact-contents": "[{\"book_name\":\"\",\"new-software-version\":\"\",\"existing-software-version\":\"\",\"file_parameter_content\":\"\"}]" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json index cf656f37..968d9658 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json @@ -6,4 +6,4 @@ "artifact-type": "APPC-CONFIG", "artifact-version": "0.0.1", "artifact-contents": "---\nkind: \"Property Definition\"\nversion: V1\nvnf-parameter-list:\n- name: book_name\n type: null\n description: null\n required: null\n default: null\n source: Manual\n rule-type: null\n request-keys: null\n response-keys: null\n- name: new-software-version\n type: null\n description: null\n required: null\n default: null\n source: Manual\n rule-type: null\n request-keys: null\n response-keys: null\n- name: existing-software-version\n type: null\n description: null\n required: null\n default: null\n source: Manual\n rule-type: null\n request-keys: null\n response-keys: null\n- name: file_parameter_content\n type: null\n description: null\n required: null\n default: null\n source: Manual\n rule-type: null\n request-keys: null\n response-keys: null\n" -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json index 404cd2f5..b249032b 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json @@ -10,4 +10,4 @@ "traffic_distribution_config.json": "${()=(file_parameter_content)}" }, "Timeout": 3600 -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json index 49c64d0e..c875f285 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json @@ -12,4 +12,4 @@ "config.json": "${()=(file_parameter_content)}" }, "Timeout": 3600 -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json index 404cd2f5..b249032b 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json @@ -10,4 +10,4 @@ "traffic_distribution_config.json": "${()=(file_parameter_content)}" }, "Timeout": 3600 -}
\ No newline at end of file +} diff --git a/tutorials/vFWDT/workflow/templates/hasRequest.json b/tutorials/vFWDT/workflow/templates/hasRequest.json index c9d77637..a0c678b6 100644 --- a/tutorials/vFWDT/workflow/templates/hasRequest.json +++ b/tutorials/vFWDT/workflow/templates/hasRequest.json @@ -3,7 +3,10 @@ "template": { "constraints": { "affinity_vFW_TD": { - "demands": ["vFW-SINK", "vPGN"], + "demands": [ + "vFW-SINK", + "vPGN" + ], "properties": { "category": "region", "qualifier": "same" @@ -32,57 +35,73 @@ } }, "demands": { - "vFW-SINK": [{ - "attributes": { - "global-customer-id": { - "get_param": "chosen_customer_id" + "vFW-SINK": [ + { + "attributes": { + "global-customer-id": { + "get_param": "chosen_customer_id" + }, + "cloud-region-id": { + "get_param": "chosen_region" + }, + "model-version-id": "202d2fd8-a045-4c9a-b767-2a1639c10291", + "orchestration-status": [ + "active" + ], + "model-invariant-id": "6f3fd439-fd5f-4a2d-95bc-b6bf8787001a", + "service_instance_id": { + "get_param": "service_id" + }, + "prov-status": "ACTIVE" }, - "cloud-region-id": { - "get_param": "chosen_region" - }, - "model-version-id": "202d2fd8-a045-4c9a-b767-2a1639c10291", - "orchestration-status": ["active"], - "model-invariant-id": "6f3fd439-fd5f-4a2d-95bc-b6bf8787001a", - "service_instance_id": { - "get_param": "service_id" - }, - "prov-status": "ACTIVE" - }, - "inventory_provider": "aai", - "service_resource_id": "vFW-SINK-XX", - "inventory_type": "vfmodule", - "service_type": "vFW-SINK-XX", - "excluded_candidates": [{ + "inventory_provider": "aai", + "service_resource_id": "vFW-SINK-XX", "inventory_type": "vfmodule", - "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"] - }], - "required_candidates": [{ - "inventory_type": "vfmodule", - "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"] - }] - }], - "vPGN": [{ - "attributes": { - "global-customer-id": { - "get_param": "chosen_customer_id" - }, - "cloud-region-id": { - "get_param": "chosen_region" - }, - "model-version-id": "6bfe954e-bb00-4111-be3c-33eed9d20a8c", - "orchestration-status": ["active"], - "model-invariant-id": "3f356335-7b36-41ee-8f74-72d0a2ec3ebf", - "service_instance_id": { - "get_param": "service_id" + "service_type": "vFW-SINK-XX", + "excluded_candidates": [ + { + "inventory_type": "vfmodule", + "candidate_id": [ + "e765d576-8755-4145-8536-0bb6d9b1dc9a" + ] + } + ], + "required_candidates": [ + { + "inventory_type": "vfmodule", + "candidate_id": [ + "e765d576-8755-4145-8536-0bb6d9b1dc9a" + ] + } + ] + } + ], + "vPGN": [ + { + "attributes": { + "global-customer-id": { + "get_param": "chosen_customer_id" + }, + "cloud-region-id": { + "get_param": "chosen_region" + }, + "model-version-id": "6bfe954e-bb00-4111-be3c-33eed9d20a8c", + "orchestration-status": [ + "active" + ], + "model-invariant-id": "3f356335-7b36-41ee-8f74-72d0a2ec3ebf", + "service_instance_id": { + "get_param": "service_id" + }, + "prov-status": "ACTIVE" }, - "prov-status": "ACTIVE" - }, - "inventory_provider": "aai", - "service_resource_id": "vPGN-XX", - "unique": "false", - "inventory_type": "vfmodule", - "service_type": "vPGN-XX" - }] + "inventory_provider": "aai", + "service_resource_id": "vPGN-XX", + "unique": "false", + "inventory_type": "vfmodule", + "service_type": "vPGN-XX" + } + ] }, "homing_template_version": "2017-10-10" }, diff --git a/tutorials/vFWDT/workflow/templates/osdfRequest.json b/tutorials/vFWDT/workflow/templates/osdfRequest.json index 1bef055b..1bd2ce5c 100644 --- a/tutorials/vFWDT/workflow/templates/osdfRequest.json +++ b/tutorials/vFWDT/workflow/templates/osdfRequest.json @@ -1,65 +1,63 @@ { - "requestInfo": { - "transactionId": "e576c75e-7536-4145-a1c0-d60b65bb1bb8", - "requestId": "de4f04e3-0a65-470b-9d07-8ea6c2fb3e10", - "callbackUrl": "http://0.0.0.0:9000/osdfCallback/", - "sourceId": "SO", - "requestType": "create", - "numSolutions": 100, - "optimizers": [ - "placement" - ], - "timeout": 1200 - }, - "placementInfo": { - "requestParameters": { - "chosenRegion": "RegionOne", - "chosenCustomerId": "DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2" - }, - "subscriberInfo": { - "globalSubscriberId": "dbc2c763-6383-42d6-880a-b7d5c5bc84d9", - "subscriberName": "oof-so-chm" + "requestInfo": { + "transactionId": "e576c75e-7536-4145-a1c0-d60b65bb1bb8", + "requestId": "de4f04e3-0a65-470b-9d07-8ea6c2fb3e10", + "callbackUrl": "http://0.0.0.0:9000/osdfCallback/", + "sourceId": "SO", + "requestType": "create", + "numSolutions": 100, + "optimizers": [ + "placement" + ], + "timeout": 1200 }, - "placementDemands": [ - { - "resourceModuleName": "vFW-SINK", - "serviceResourceId": "vFW-SINK-XX", - "resourceModelInfo": { - "modelInvariantId": "fda3c1e8-7653-4acd-80ef-f5755c1d3859", - "modelVersionId": "a6906768-1cae-4e78-acd1-d753ac61f3e8" + "placementInfo": { + "requestParameters": { + "chosenRegion": "RegionOne", + "chosenCustomerId": "DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2" }, - "excludedCandidates": [ - { - "identifierType": "vfmodule", - "identifiers": [ - ] - } - ], - "requiredCandidates": [ - { - "identifierType": "vfmodule", - "identifiers": [ - ] - } + "subscriberInfo": { + "globalSubscriberId": "dbc2c763-6383-42d6-880a-b7d5c5bc84d9", + "subscriberName": "oof-so-chm" + }, + "placementDemands": [ + { + "resourceModuleName": "vFW-SINK", + "serviceResourceId": "vFW-SINK-XX", + "resourceModelInfo": { + "modelInvariantId": "fda3c1e8-7653-4acd-80ef-f5755c1d3859", + "modelVersionId": "a6906768-1cae-4e78-acd1-d753ac61f3e8" + }, + "excludedCandidates": [ + { + "identifierType": "vfmodule", + "identifiers": [] + } + ], + "requiredCandidates": [ + { + "identifierType": "vfmodule", + "identifiers": [] + } + ] + }, + { + "resourceModuleName": "vPGN", + "serviceResourceId": "vPGN-XX", + "unique": "false", + "resourceModelInfo": { + "modelInvariantId": "f2f88e29-d571-49ef-aea3-b8d13900c16f", + "modelVersionId": "3ccebc76-66e1-47c8-aee9-98f30d08db97" + } + } ] - }, - { - "resourceModuleName": "vPGN", - "serviceResourceId": "vPGN-XX", - "unique": "false", - "resourceModelInfo": { - "modelInvariantId": "f2f88e29-d571-49ef-aea3-b8d13900c16f", - "modelVersionId": "3ccebc76-66e1-47c8-aee9-98f30d08db97" + }, + "serviceInfo": { + "serviceInstanceId": "209fb01e-60ca-4325-b074-c5ad4e0499f8", + "serviceName": "TD", + "modelInfo": { + "modelInvariantId": "TD-invariantId", + "modelVersionId": "TD-versionId" } - } - ] - }, - "serviceInfo": { - "serviceInstanceId": "209fb01e-60ca-4325-b074-c5ad4e0499f8", - "serviceName": "TD", - "modelInfo": { - "modelInvariantId": "TD-invariantId", - "modelVersionId": "TD-versionId" } - } -}
\ No newline at end of file +} |