diff options
author | Marcus G K Williams <marcus.williams@intel.com> | 2017-11-14 08:48:46 -0800 |
---|---|---|
committer | Marcus G K Williams <marcus.williams@intel.com> | 2017-11-14 09:10:31 -0800 |
commit | a347e10eee024991ff7c0bf7487aa9e2b78f9a84 (patch) | |
tree | 4a96d671a3e6faaf1638ea9661ba6de9783dffa7 /platform-logic/generic-resource-api/src/main/json | |
parent | 42fb5723b7b11e94fc7d5ab901ae293b7fd67d7f (diff) |
Fix brg-topo DGs
1. Added get vg-mgmt-ip in brg-topo-activate
so that vg tunnel could be properple setup
2. Added get vbrg-wan-ip to brg-topo-deactivate
so that vxlan tunnels can be removed
3. Updated AA&I updates calls to include
correct brg variables for global-customer-id,
service-type and service-instance-id
Issue-Id: SDNC-195
Change-Id: I9470cd782a3bd00fa9332dd7141c28151054b75f
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
Former-commit-id: becd9978df3428354646a48c2d106177f6477695
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/json')
3 files changed, 1958 insertions, 1240 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json index b31d50be..3fa89107 100755 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json @@ -1,20 +1,20 @@ [ { - "id":"d9e7e1c2.493d3", + "id":"ceb899a7.d341c8", "type":"dgstart", "name":"DGSTART", "outputs":1, - "x":103, - "y":46, - "z":"f97ade34.d219f", + "x":153.3333282470703, + "y":103.33332824707031, + "z":"5fc74ec4.a79bd", "wires":[ [ - "9a1b0b6b.996428" + "18952f76.559ee1" ] ] }, { - "id":"9a1b0b6b.996428", + "id":"18952f76.559ee1", "type":"service-logic", "name":"GENERIC-RESOURCE-API ${project.version}", "module":"GENERIC-RESOURCE-API", @@ -22,156 +22,158 @@ "comments":"", "xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>", "outputs":1, - "x":199.23807907104492, - "y":106.95239067077637, - "z":"f97ade34.d219f", + "x":249.57140731811523, + "y":164.28571891784668, + "z":"5fc74ec4.a79bd", "wires":[ [ - "1b80fdb3.e51d42" + "179672e8.9c551d" ] ] }, { - "id":"1b80fdb3.e51d42", + "id":"179672e8.9c551d", "type":"method", "name":"brg-topology-operation-activate", "xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n", "comments":"", "outputs":1, - "x":245.15485763549805, - "y":142.19044589996338, - "z":"f97ade34.d219f", + "x":295.48818588256836, + "y":199.5237741470337, + "z":"5fc74ec4.a79bd", "wires":[ [ - "b9ef2573.e57c88" + "9f35bd45.8a6a4" ] ] }, { - "id":"b9ef2573.e57c88", + "id":"9f35bd45.8a6a4", "type":"block", "name":"block : atomic", "xml":"<block atomic=\"true\">", "atomic":"true", "comments":"", "outputs":1, - "x":140.97620391845703, - "y":1138.0237922668457, - "z":"f97ade34.d219f", - "wires":[ - [ - "b4a1686c.6724e8", - "377fb8b4.251228", - "d661220d.d848d", - "c5c60948.27fc28", - "c4711874.0ee758", - "aceb1a27.11b7a8", - "a5137e71.81a65", - "5972a9da.16e978", - "50e72018.6624", - "b3b13e68.d59bb", - "ef8d3b6f.8c3c58", - "531893c6.c405dc", - "7c4bd318.44ab8c", - "14b435e1.73803a", - "b8e9e857.b4d5e8", - "970b23d4.8d05e", - "815c3841.72ff98", - "a9cc06ef.aed3d8", - "17504c2b.5ecc04", - "13ddb22.203944e", - "75aa4c7c.d1f814", - "173f16cf.2f6b79", - "5bcb3869.fa6198", - "60d1bf52.ad3d6", - "ac82543e.0a2288", - "4a0f8ea5.474a2", - "5f66c498.33c76c", - "eab64b.710229b8", - "36e0c301.ee8e2c", - "5f18f40a.7db70c", - "ecf121e2.af8c8", - "496f8c72.09c0b4", - "9e2897fc.bd5fd8", - "fc322e28.718d1" - ] - ] - }, - { - "id":"377fb8b4.251228", + "x":191.30953216552734, + "y":1195.357120513916, + "z":"5fc74ec4.a79bd", + "wires":[ + [ + "5f6476c7.1116b8", + "1fd1cf4d.7fed61", + "db740f9d.29312", + "ecc54a34.453788", + "96b93a8e.8fa738", + "89375566.2dec58", + "af147a22.52b628", + "6f832b94.924d84", + "3806a837.de7398", + "6323c04e.54628", + "dfa3f56.72b5808", + "3b2fb4.6046004c", + "1375a965.f31cb7", + "3545827f.8f7f4e", + "27f6106d.5aed4", + "d538a2c.85a8a6", + "d0da56bf.5622e8", + "e3151796.db37b8", + "247b453a.8a26fa", + "34e00507.e2015a", + "7f06ccd3.5f4544", + "a690ec81.282ab", + "7cd4ecac.c5c874", + "afbc0299.7c62f", + "a76a910b.2c1fa", + "43cd6015.f74aa", + "a44bc809.331528", + "4ebb5d6e.3b72b4", + "94c1462c.043b88", + "890a1877.5b6b98", + "dad15ca1.13a96", + "898815a9.12a638", + "ddefeb7c.fde178", + "127d8c70.64ae14", + "59a607df.c64478", + "2b05ed04.a37c82" + ] + ] + }, + { + "id":"1fd1cf4d.7fed61", "type":"returnSuccess", "name":"return success", "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n", "comments":"", - "x":420.00017166137695, - "y":2417.3817806243896, - "z":"f97ade34.d219f", + "x":467.8335380554199, + "y":2659.7151918411255, + "z":"5fc74ec4.a79bd", "wires":[ ] }, { - "id":"b4a1686c.6724e8", + "id":"5f6476c7.1116b8", "type":"set", "name":"set output to api handler", "xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments":"", - "x":448.7540855407715, - "y":2381.5043268203735, - "z":"f97ade34.d219f", + "x":496.58745193481445, + "y":2623.8377380371094, + "z":"5fc74ec4.a79bd", "wires":[ ] }, { - "id":"b3b13e68.d59bb", + "id":"6323c04e.54628", "type":"set", "name":"set allotted-resource-oper-status", "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments":"", - "x":459.7542190551758, - "y":666.0514001846313, - "z":"f97ade34.d219f", + "x":510.0875473022461, + "y":723.3847284317017, + "z":"5fc74ec4.a79bd", "wires":[ ] }, { - "id":"c5c60948.27fc28", + "id":"ecc54a34.453788", "type":"set", "name":"set tmp.ar.self-link", "xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n", "comments":"", - "x":415.73806381225586, - "y":259.33332538604736, - "z":"f97ade34.d219f", + "x":466.0713920593262, + "y":316.6666536331177, + "z":"5fc74ec4.a79bd", "wires":[ ] }, { - "id":"d661220d.d848d", + "id":"db740f9d.29312", "type":"set", "name":"set tmp.ar.allotted-resource-id,etc", "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.all |