[SDNC-5] Rebase SDN-C oam

Apply fixes to directed graphs and docker containers discovered during
local testing

Change-Id: Ie675ecea7aa5119fb0b3ee180997b3a420be3e1b
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 596540a90b7cd031151943062b8c259314acce93

1 files changed, 0 insertions, 4 deletions

diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-activate.json b/platform-logic/vnfapi/src/main/json/vnf-topology-activate.json
deleted file mode 100644
index 87f11f2c..00000000
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-activate.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-[{"id":"88706b6c.d7e8f8","type":"comment","name":"VNF-TOPOLOGY-ACTIVATE","info":"","comments":"","x":705,"y":56.25,"z":"bdb7525f.b82ac","wires":[]},{"id":"9919a3a0.0db84","type":"set","name":"set: order-status = Active","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Active\"/>","comments":"","outputs":1,"x":416.1111373901367,"y":392.19443130493164,"z":"bdb7525f.b82ac","wires":[[]]},{"id":"c7aef71a.0546b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":163.1111297607422,"y":159.6944465637207,"z":"bdb7525f.b82ac","wires":[["9919a3a0.0db84","d2f822b9.c0ba2","cb7a4a21.63f1a8","a2825e7b.f1f5b","997d743b.93f348","4d75942d.b062cc","4d26f461.ab756c","be925673.a43ed8"]]},{"id":"e1d7f022.0eec5","type":"method","name":"method vnf-topology-activate","xml":"<method rpc='vnf-topology-activate' mode='sync'>\n","comments":"","outputs":1,"x":205.77781677246094,"y":103.86111068725586,"z":"bdb7525f.b82ac","wires":[["c7aef71a.0546b8"]]},{"id":"8ecea6c6.be7228","type":"service-logic","name":"VNF-API 2.0.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":297.7777862548828,"y":56.86111831665039,"z":"bdb7525f.b82ac","wires":[["e1d7f022.0eec5"]]},{"id":"c14838e9.4ff538","type":"dgstart","name":"DGSTART","outputs":1,"x":132.6111297607422,"y":56.6944465637207,"z":"bdb7525f.b82ac","wires":[["8ecea6c6.be7228"]]},{"id":"d2f822b9.c0ba2","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":455.4445114135742,"y":288.5276527404785,"z":"bdb7525f.b82ac","wires":[["7fbf2884.337bd8"]]},{"id":"7fbf2884.337bd8","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":704.7778625488281,"y":288.8609619140625,"z":"bdb7525f.b82ac","wires":[["6a86c40f.3cacbc"]]},{"id":"5ab563ab.d3ac3c","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":1363.110984802246,"y":287.8610134124756,"z":"bdb7525f.b82ac","wires":[]},{"id":"997d743b.93f348","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":427.88387298583984,"y":236.73988723754883,"z":"bdb7525f.b82ac","wires":[["18372478.ff847c"]]},{"id":"18372478.ff847c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":647.3383483886719,"y":236.9217071533203,"z":"bdb7525f.b82ac","wires":[["a2862881.e98788"]]},{"id":"a2862881.e98788","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":825.4292907714844,"y":236.830810546875,"z":"bdb7525f.b82ac","wires":[]},{"id":"cb7a4a21.63f1a8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":385.22225189208984,"y":612.8610877990723,"z":"bdb7525f.b82ac","wires":[]},{"id":"6a86c40f.3cacbc","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":955.7020568847656,"y":288.2853698730469,"z":"bdb7525f.b82ac","wires":[["8c8f2029.ca786"]]},{"id":"8c8f2029.ca786","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1198.1564636230469,"y":288.28533935546875,"z":"bdb7525f.b82ac","wires":[["5ab563ab.d3ac3c"]]},{"id":"3c6838ea.3c4ff8","type":"comment","name":"once success is returned, operational-data gets saved","info":"","comments":"","x":731.6288452148438,"y":573.79541015625,"z":"bdb7525f.b82ac","wires":[]},{"id":"a2825e7b.f1f5b","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":"","outputs":1,"x":449.22481536865234,"y":340.8081398010254,"z":"bdb7525f.b82ac","wires":[[]]},{"id":"b434395d.5c9488","type":"comment","name":"request-action = VNFActivateRequest, svc-action = activate","info":"","comments":"","x":711.7222137451172,"y":96.02778053283691,"z":"bdb7525f.b82ac","wires":[]},{"id":"4d75942d.b062cc","type":"set","name":"set: service-data = input","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" />","comments":"","outputs":1,"x":413.1111373901367,"y":527.2500038146973,"z":"bdb7525f.b82ac","wires":[[]]},{"id":"4d26f461.ab756c","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":"","outputs":1,"x":383.1111373901367,"y":439.25000381469727,"z":"bdb7525f.b82ac","wires":[[]]},{"id":"25f69501.db82ca","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":741.5238571166992,"y":482.2385025024414,"z":"bdb7525f.b82ac","wires":[["8b31c6d4.18a8e8"]]},{"id":"8b31c6d4.18a8e8","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":909.6667861938477,"y":482.2385730743408,"z":"bdb7525f.b82ac","wires":[]},{"id":"baf5a37d.f9734","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","outputs":1,"x":407.4285888671875,"y":570.9642486572266,"z":"bdb7525f.b82ac","wires":[[]]},{"id":"be925673.a43ed8","type":"save","name":"update AnAI - vf-module.orchestration-status","xml":"<update plugin=\"com.att.sdnctl.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":477,"y":482.25,"z":"bdb7525f.b82ac","wires":[["25f69501.db82ca"]]}]