1 files changed, 122 insertions, 37 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index c2d67a4b..c2241024 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -60,7 +60,6 @@
     "z": "afcbb687.85236",
     "wires": [
       [
-        "e2f31eb5.a183e",
         "ade3e35c.b5b59",
         "7c2f72f7.87d2ac",
         "8d5aeff7.32c67",
@@ -76,7 +75,8 @@
         "aec2b21c.351b48",
         "fd85e187.c7dde",
         "4308a2c5.6e7bac",
-        "8381990.da591e8"
+        "8381990.da591e8",
+        "ced212e0.c44f6"
       ]
     ]
   },
@@ -84,7 +84,7 @@
     "id": "f1c4e62c.acf5f",
     "type": "execute",
     "name": "execute RestApiCallNode Create IPWAN L3VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1167.0001831054688,
@@ -98,10 +98,10 @@
     "id": "e2f31eb5.a183e",
     "type": "set",
     "name": "set controller data",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 790.0000610351562,
-    "y": 281.9999694824219,
+    "x": 1266.0000610351562,
+    "y": 271.9999694824219,
     "z": "afcbb687.85236",
     "wires": []
   },
@@ -112,8 +112,8 @@
     "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 850.6666259765625,
-    "y": 403.6666259765625,
+    "x": 807.6666259765625,
+    "y": 187.6666259765625,
     "z": "afcbb687.85236",
     "wires": [
       [
@@ -199,8 +199,8 @@
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 832.5,
-    "y": 220.99996948242188,
+    "x": 823.5,
+    "y": 337.9999694824219,
     "z": "afcbb687.85236",
     "wires": [
       [
@@ -217,12 +217,12 @@
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1157.5,
-    "y": 151.99996948242188,
+    "x": 1068.5,
+    "y": 283.9999694824219,
     "z": "afcbb687.85236",
     "wires": [
       [
-        "9cd190ea.6976c8"
+        "e2f31eb5.a183e"
       ]
     ]
   },
@@ -233,8 +233,8 @@
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1160.990966796875,
-    "y": 199.57400512695312,
+    "x": 1071.990966796875,
+    "y": 331.5740051269531,
     "z": "afcbb687.85236",
     "wires": [
       [
@@ -249,8 +249,8 @@
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1156.323974609375,
-    "y": 240.90731811523438,
+    "x": 1067.323974609375,
+    "y": 372.9073181152344,
     "z": "afcbb687.85236",
     "wires": [
       [
@@ -264,8 +264,8 @@
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1337.5623779296875,
-    "y": 187.8597412109375,
+    "x": 1248.5623779296875,
+    "y": 319.8597412109375,
     "z": "afcbb687.85236",
     "wires": []
   },
@@ -275,26 +275,12 @@
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1344.0965309143066,
-    "y": 236.346510887146,
+    "x": 1255.0965309143066,
+    "y": 368.346510887146,
     "z": "afcbb687.85236",
     "wires": []
   },
   {
-    "id": "9cd190ea.6976c8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1335.705322265625,
-    "y": 144.57400512695312,
-    "z": "afcbb687.85236",
-    "wires": [
-      []
-    ]
-  },
-  {
     "id": "22c32b46.de62ec",
     "type": "block",
     "name": "block",
@@ -1734,7 +1720,7 @@
     "id": "edbfaa69.4481f",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN Site Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1174,
@@ -1748,7 +1734,7 @@
     "id": "660c6e65.05f44",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN VRF Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
     "x": 1172,
@@ -1994,5 +1980,104 @@
     "y": 1404,
     "z": "afcbb687.85236",
     "wires": []
+  },
+  {
+    "id": "ced212e0.c44f6",
+    "type": "get-resource",
+    "name": "get-resource pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 801,
+    "y": 258,
+    "z": "afcbb687.85236",
+    "wires": [
+      [
+        "eadbe688.b2511",
+        "3cc9c2b7.cfb8de",
+        "8d496330.30d8c8"
+      ]
+    ]
+  },
+  {
+    "id": "eadbe688.b2511",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1123,
+    "y": 148,
+    "z": "afcbb687.85236",
+    "wires": [
+      [
+        "3db9a787.d2e218"
+      ]
+    ]
+  },
+  {
+    "id": "3cc9c2b7.cfb8de",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1126.490966796875,
+    "y": 195.57403564453125,
+    "z": "afcbb687.85236",
+    "wires": [
+      [
+        "f2ff3e53.95d6c"
+      ]
+    ]
+  },
+  {
+    "id": "8d496330.30d8c8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1121.823974609375,
+    "y": 236.9073486328125,
+    "z": "afcbb687.85236",
+    "wires": [
+      [
+        "dbc59ca.25a126"
+      ]
+    ]
+  },
+  {
+    "id": "f2ff3e53.95d6c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 1303.0623779296875,
+    "y": 183.85977172851562,
+    "z": "afcbb687.85236",
+    "wires": []
+  },
+  {
+    "id": "dbc59ca.25a126",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+    "comments": "",
+    "x": 1309.5965309143066,
+    "y": 232.34654140472412,
+    "z": "afcbb687.85236",
+    "wires": []
+  },
+  {
+    "id": "3db9a787.d2e218",
+    "type": "set",
+    "name": "set tmp.thirdparty-sdnc-id",
+    "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 1327,
+    "y": 135,
+    "z": "afcbb687.85236",
+    "wires": []
   }
 ]