From 55b429cfc73802e3e52fa2f3864ecc4cdd552728 Mon Sep 17 00:00:00 2001
From: "shashikanth.vh" <shashikanth.vh@huawei.com>
Date: Fri, 7 Sep 2018 14:38:22 +0530
Subject: integration test issues fix for sdwan and sotn

Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682
---
 .../json/DataChange_update-network-to-aai.json     | 229 +++++++++++++--------
 1 file changed, 146 insertions(+), 83 deletions(-)

(limited to 'platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json')

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index c1cf62db..f82168b9 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "20435d2f.b707b2",
+    "id": "4d48ad52.66bce4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 129.01040649414062,
-    "y": 61.010414123535156,
-    "z": "3e15e6f8.d8900a",
+    "x": 116,
+    "y": 72,
+    "z": "972d7ac.f66db88",
     "wires": [
       [
-        "83ca6f8e.538a2"
+        "66f854f4.bc80cc"
       ]
     ]
   },
   {
-    "id": "83ca6f8e.538a2",
+    "id": "66f854f4.bc80cc",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,216 +22,279 @@
     "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='DataChange' version='${project.version}'>",
     "outputs": 1,
-    "x": 218.01043701171875,
-    "y": 151.8993263244629,
-    "z": "3e15e6f8.d8900a",
+    "x": 205.00003051757812,
+    "y": 162.88891220092773,
+    "z": "972d7ac.f66db88",
     "wires": [
       [
-        "5fa2f1f3.bb35e"
+        "7eee0fcc.e1d78"
       ]
     ]
   },
   {
-    "id": "5fa2f1f3.bb35e",
+    "id": "7eee0fcc.e1d78",
     "type": "method",
     "name": "method update-network-to-aai",
     "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 254.1216583251953,
-    "y": 222.23265075683594,
-    "z": "3e15e6f8.d8900a",
+    "x": 241.1112518310547,
+    "y": 233.22223663330078,
+    "z": "972d7ac.f66db88",
     "wires": [
       [
-        "44238134.7d97f"
+        "dd17da81.f85678"
       ]
     ]
   },
   {
-    "id": "44238134.7d97f",
+    "id": "dd17da81.f85678",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 479.3438415527344,
-    "y": 221.78833770751953,
-    "z": "3e15e6f8.d8900a",
+    "x": 466.33343505859375,
+    "y": 232.77792358398438,
+    "z": "972d7ac.f66db88",
     "wires": [
       [
-        "84458cb3.2004e",
-        "282c5771.31f2f8",
-        "c27c36c9.fe0038"
+        "c70a984d.cc2a48",
+        "5cf53006.e1ea9",
+        "a9f8a08c.a159f"
       ]
     ]
   },
   {
-    "id": "282c5771.31f2f8",
+    "id": "5cf53006.e1ea9",
     "type": "update",
     "name": "save network-resource",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 709.3436584472656,
-    "y": 127.01042938232422,
-    "z": "3e15e6f8.d8900a",
+    "x": 696.333251953125,
+    "y": 138.00001525878906,
+    "z": "972d7ac.f66db88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8db597cb.e2ef58",
+    "id": "bc0b4672.53b908",
     "type": "update",
     "name": "save pnf",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='network-resource.network-id = $tmp.network-id\n      AND pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 899.1215515136719,
-    "y": 179.12151336669922,
-    "z": "3e15e6f8.d8900a",
+    "x": 879.111141204834,
+    "y": 191.111102104187,
+    "z": "972d7ac.f66db88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c27c36c9.fe0038",
+    "id": "a9f8a08c.a159f",
     "type": "for",
     "name": "for each node",
     "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 685.8992614746094,
-    "y": 171.3437271118164,
-    "z": "3e15e6f8.d8900a",
+    "x": 679.8888549804688,
+    "y": 208.33331298828125,
+    "z": "972d7ac.f66db88",
     "wires": [
       [
-        "8db597cb.e2ef58",
-        "6b246a86.7d22b4",
-        "79357b97.6a6604",
-        "629488d9.a436f8",
-        "89ed3af1.c4f958"
+        "bc0b4672.53b908",
+        "6b3704fc.0bd35c",
+        "24e04af5.ddea66",
+        "9b1ff78d.8b3c08",
+        "8e9342c1.220f"
       ]
     ]
   },
   {
-    "id": "6b246a86.7d22b4",
+    "id": "6b3704fc.0bd35c",
     "type": "set",
     "name": "set network",
     "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n",
     "comments": "",
-    "x": 906.1214904785156,
-    "y": 145.23262786865234,
-    "z": "3e15e6f8.d8900a",
+    "x": 893.111083984375,
+    "y": 156.2222137451172,
+    "z": "972d7ac.f66db88",
     "wires": []
   },
   {
-    "id": "79357b97.6a6604",
+    "id": "9b1ff78d.8b3c08",
     "type": "save",
     "name": "save pnf relationship to network-resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1017.7884216308594,
-    "y": 212.45490264892578,
-    "z": "3e15e6f8.d8900a",
+    "x": 1004.7779541015625,
+    "y": 223.44447803497314,
+    "z": "972d7ac.f66db88",
     "wires": [
       []
     ]
   },
   {
-    "id": "89ed3af1.c4f958",
+    "id": "8e9342c1.220f",
     "type": "for",
     "name": "for each termination point",
     "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 950.4548645019531,
-    "y": 328.12149810791016,
-    "z": "3e15e6f8.d8900a",
+    "x": 937.4444580078125,
+    "y": 339.111083984375,
+    "z": "972d7ac.f66db88",
     "wires": [
       [
-        "6bc546b5.f87e18",
-        "8d1a709c.fbdf6",
-        "ad4de444.eb7858",
-        "bd80da47.090a88"
+        "7c32bd23.da1e04",
+        "38ff90b0.67e0b",
+        "36dd756f.9a425a"
       ]
     ]
   },
   {
-    "id": "6bc546b5.f87e18",
+    "id": "7c32bd23.da1e04",
     "type": "set",
     "name": "set termination point",
     "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
     "comments": "",
-    "x": 1217.1217346191406,
-    "y": 289.01045989990234,
-    "z": "3e15e6f8.d8900a",
+    "x": 1204.111328125,
+    "y": 300.0000457763672,
+    "z": "972d7ac.f66db88",
     "wires": []
   },
   {
-    "id": "bd80da47.090a88",
+    "id": "36dd756f.9a425a",
     "type": "update",
     "name": "save p-interface",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='network-resource.network-id = $tmp.network-id\n      AND pnf.pnf-name = $node.node-id\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $node.node-id\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1200.8254699707031,
-    "y": 357.5660171508789,
-    "z": "3e15e6f8.d8900a",
+    "x": 1187.8151397705078,
+    "y": 473.5555934906006,
+    "z": "972d7ac.f66db88",
     "wires": [
-      []
+      [
+        "310a666a.23204a",
+        "52308d76.244944"
+      ]
     ]
   },
   {
-    "id": "8d1a709c.fbdf6",
+    "id": "9b33d7c5.abef78",
     "type": "save",
     "name": "save pnf relationship to p-interface in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1278.7142639160156,
-    "y": 395.34375762939453,
-    "z": "3e15e6f8.d8900a",
+    "x": 1263.7038879394531,
+    "y": 562.333345413208,
+    "z": "972d7ac.f66db88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ad4de444.eb7858",
+    "id": "38ff90b0.67e0b",
     "type": "set",
     "name": "set unique-ltpId",
     "xml": "<set>\n<parameter name='unique-ltpId' value=\"`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`\" />\n",
     "comments": "",
-    "x": 1201.0106506347656,
-    "y": 323.1215286254883,
-    "z": "3e15e6f8.d8900a",
+    "x": 1188.000244140625,
+    "y": 334.1111145019531,
+    "z": "972d7ac.f66db88",
     "wires": []
   },
   {
-    "id": "84458cb3.2004e",
+    "id": "c70a984d.cc2a48",
     "type": "execute",
     "name": "execute",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
     "comments": "",
     "outputs": 1,
-    "x": 659.0039367675781,
-    "y": 88.00390625,
-    "z": "3e15e6f8.d8900a",
+    "x": 645.9935302734375,
+    "y": 98.99349212646484,
+    "z": "972d7ac.f66db88",
     "wires": [
       []
     ]
   },
   {
-    "id": "629488d9.a436f8",
+    "id": "24e04af5.ddea66",
     "type": "save",
     "name": "save pnf relation with esr-thirdparty-sdnc",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 986,
+    "y": 259.9934997558594,
+    "z": "972d7ac.f66db88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "310a666a.23204a",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1359.4998397827148,
+    "y": 460.7460689544678,
+    "z": "972d7ac.f66db88",
+    "wires": [
+      [
+        "fcc0153a.edfd18"
+      ]
+    ]
+  },
+  {
+    "id": "52308d76.244944",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1353.1784286499023,
+    "y": 512.9603805541992,
+    "z": "972d7ac.f66db88",
+    "wires": [
+      [
+        "1c6a1f1f.8e0f61"
+      ]
+    ]
+  },
+  {
+    "id": "fcc0153a.edfd18",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1510,
+    "y": 460,
+    "z": "972d7ac.f66db88",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1c6a1f1f.8e0f61",
+    "type": "update",
+    "name": "save p-interface",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $node.node-id\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 999.0104064941406,
-    "y": 249.00391387939453,
-    "z": "3e15e6f8.d8900a",
+    "x": 1530,
+    "y": 510,
+    "z": "972d7ac.f66db88",
     "wires": [
       []
     ]
-- 
cgit 1.2.3-korg