X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json;h=50f87f432d1a8765acfeb585eb2b7ef826f39b94;hb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;hp=241228f801aadfb129110dfe9a1fa0ec75015c90;hpb=b7cd528f9b720b4f820ac5eb38f01df2b16c9817;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index 241228f8..50f87f43 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -3238,7 +3238,7 @@
         "id": "83634982.62f32",
         "type": "set",
         "name": "set LEAF stuff",
-        "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+        "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
         "comments": "",
         "x": 3288.883331298828,
         "y": 1754,
@@ -3271,7 +3271,7 @@
         "id": "a78c5989.f5207",
         "type": "set",
         "name": "set ROOT stuff",
-        "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+        "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
         "comments": "",
         "x": 3269.883331298828,
         "y": 2610,
@@ -4389,8 +4389,8 @@
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
-        "x": 5188.784423828125,
-        "y": 4997.350067138672,
+        "x": 5119.783935546875,
+        "y": 4846.349884033203,
         "z": "d1eceead.adafe",
         "wires": []
     },
@@ -4401,8 +4401,8 @@
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5221.784423828125,
-        "y": 5065.350067138672,
+        "x": 5063.783935546875,
+        "y": 4895.349884033203,
         "z": "d1eceead.adafe",
         "wires": [
             [
@@ -4418,8 +4418,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5465.784454345703,
-        "y": 5037.349853515625,
+        "x": 5306.784423828125,
+        "y": 4936.349395751953,
         "z": "d1eceead.adafe",
         "wires": [
             []
@@ -4432,12 +4432,12 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5346.784423828125,
-        "y": 4963.349822998047,
+        "x": 5317.7841796875,
+        "y": 4893.349609375,
         "z": "d1eceead.adafe",
         "wires": [
             [
-                "a5ecb13c.9c7548"
+                "b2c9765c.25999"
             ]
         ]
     },
@@ -4449,8 +4449,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5473.767822265625,
-        "y": 4901.766326904297,
+        "x": 5544.767578125,
+        "y": 4900.76611328125,
         "z": "d1eceead.adafe",
         "wires": [
             [
@@ -9149,5 +9149,81 @@
         "wires": [
             []
         ]
+    },
+    {
+        "id": "b2c9765c.25999",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5113,
+        "y": 5050,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "86e944dc.0c4178",
+                "5fccecfa.290f3c",
+                "76c53fa0.8ab25"
+            ]
+        ]
+    },
+    {
+        "id": "76c53fa0.8ab25",
+        "type": "set",
+        "name": "set vpnNameToSearch",
+        "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
+        "comments": "",
+        "x": 5340,
+        "y": 4995,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "86e944dc.0c4178",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5494,
+        "y": 5047,
+        "z": "d1eceead.adafe",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5fccecfa.290f3c",
+        "type": "switchNode",
+        "name": "switch $foundVpnName",
+        "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5339,
+        "y": 5102,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "2a17f2a1.8a9c0e"
+            ]
+        ]
+    },
+    {
+        "id": "2a17f2a1.8a9c0e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5518,
+        "y": 5101,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "a5ecb13c.9c7548"
+            ]
+        ]
     }
 ]
\ No newline at end of file