Add missing backticks in test expression

Backticks were missing from test expression, causing test not to be
resolved properly.

Change-Id: I1fdc00dbe16c789837d71cc263e262b4167695f3
Issue-ID: SDNC-1022
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 7aed05b06829f287271846be9344478b02339766

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
index a7a136a..7f3106c 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
@@ -1,47 +1,47 @@
 [\r
     {\r
-        "id": "63f4b59b.216734",\r
+        "id": "eed3ed90.e90c6",\r
         "type": "comment",\r
         "name": "vf-module-topology-operation-assign",\r
         "info": "",\r
         "comments": "",\r
-        "x": 268,\r
-        "y": 45,\r
-        "z": "a314769.77ed108",\r
+        "x": 310,\r
+        "y": 66,\r
+        "z": "27e0d311.a52dec",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1dc1d8b5.caf8ef",\r
+        "id": "3f14c604.6558d2",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 88,\r
-        "y": 130,\r
-        "z": "a314769.77ed108",\r
+        "x": 130,\r
+        "y": 151,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "f41394ef.1a3d7"\r
+                "c859c3ce.5e7178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f77e300.955b76",\r
+        "id": "7da0ecb.6675294",\r
         "type": "method",\r
         "name": "vf-module-topology-operation-assign",\r
         "xml": "<method rpc='vf-module-topology-operation-assign' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 250,\r
-        "y": 233,\r
-        "z": "a314769.77ed108",\r
+        "x": 292,\r
+        "y": 254,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "3ac51b9d.77422c"\r
+                "8183c499.5946f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f41394ef.1a3d7",\r
+        "id": "c859c3ce.5e7178",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -49,170 +49,170 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 285,\r
-        "y": 175,\r
-        "z": "a314769.77ed108",\r
+        "x": 327,\r
+        "y": 196,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "2f77e300.955b76"\r
+                "7da0ecb.6675294"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43431008.7f7928",\r
+        "id": "dae0e43e.4d1ed",\r
         "type": "switchNode",\r
         "name": "so-response-url empty?",\r
-        "xml": "<switch test='length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>\n",\r
+        "xml": "<switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 392,\r
-        "y": 384,\r
-        "z": "a314769.77ed108",\r
+        "x": 434,\r
+        "y": 405,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "e3dac757.d5f66",\r
-                "a3e690eb.7f4b88"\r
+                "76c1b8d9.913768",\r
+                "6ef8865c.b25578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3dac757.d5f66",\r
+        "id": "76c1b8d9.913768",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 617,\r
-        "y": 340,\r
-        "z": "a314769.77ed108",\r
+        "x": 659,\r
+        "y": 361,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "5c050a22.e2992c"\r
+                "6cdcf088.cc5cb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3e690eb.7f4b88",\r
+        "id": "6ef8865c.b25578",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 607,\r
-        "y": 432,\r
-        "z": "a314769.77ed108",\r
+        "x": 649,\r
+        "y": 453,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "c0411a45.4e7d4"\r
+                "730228fb.eec9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c050a22.e2992c",\r
+        "id": "6cdcf088.cc5cb8",\r
         "type": "call",\r
         "name": "call vf-module-topology-operation-assign-sync",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1293,\r
-        "y": 341,\r
-        "z": "a314769.77ed108",\r
+        "x": 1335,\r
+        "y": 362,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4c116772.ba24a",\r
+        "id": "ab75c8b2.d4fc7",\r
         "type": "call",\r
         "name": "call vf-module-topology-operation-assign-async",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1382,\r
-        "y": 544,\r
-        "z": "a314769.77ed108",\r
+        "x": 1424,\r
+        "y": 565,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c0411a45.4e7d4",\r
+        "id": "730228fb.eec9d",\r
         "type": "switchNode",\r
         "name": "so-response-url = ignored URL?",\r
         "xml": "<switch test='$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == $prop.so.ignore-url'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 829,\r
-        "y": 433,\r
-        "z": "a314769.77ed108",\r
+        "x": 871,\r
+        "y": 454,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "c677e17b.35a978",\r
-                "a7cad0db.81847"\r
+                "4485febe.44dd48",\r
+                "5bc3b5df.658e44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ac51b9d.77422c",\r
+        "id": "8183c499.5946f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 168,\r
-        "y": 302,\r
-        "z": "a314769.77ed108",\r
+        "x": 210,\r
+        "y": 323,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "de741370.91f13",\r
-                "43431008.7f7928"\r
+                "91cddc4a.0b5c5",\r
+                "dae0e43e.4d1ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de741370.91f13",\r
+        "id": "91cddc4a.0b5c5",\r
         "type": "execute",\r
         "name": "execute PropertiesNode",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 389,\r
-        "y": 301,\r
-        "z": "a314769.77ed108",\r
+        "x": 431,\r
+        "y": 322,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c677e17b.35a978",\r
+        "id": "4485febe.44dd48",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1069,\r
-        "y": 432,\r
-        "z": "a314769.77ed108",\r
+        "x": 1111,\r
+        "y": 453,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "5c050a22.e2992c"\r
+                "6cdcf088.cc5cb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7cad0db.81847",\r
+        "id": "5bc3b5df.658e44",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1077,\r
-        "y": 533,\r
-        "z": "a314769.77ed108",\r
+        "x": 1119,\r
+        "y": 554,\r
+        "z": "27e0d311.a52dec",\r
         "wires": [\r
             [\r
-                "4c116772.ba24a"\r
+                "ab75c8b2.d4fc7"\r
             ]\r
         ]\r
     }\r

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json
index 345e63d..7a838d1 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json
@@ -1,47 +1,47 @@
 [\r
     {\r
-        "id": "d8152ad9.82c12",\r
+        "id": "8c2e36e8.ec79d",\r
         "type": "comment",\r
         "name": "vnf-topology-operation-assign",\r
         "info": "",\r
         "comments": "",\r
-        "x": 289,\r
-        "y": 64,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 292,\r
+        "y": 49,\r
+        "z": "63500dfc.d651b4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2dfa6d30.c20ada",\r
+        "id": "bf23b5c0.7e5d98",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 109,\r
-        "y": 149,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 112,\r
+        "y": 134,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "6fce10a9.87d3d"\r
+                "9fa83502.52906"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c77c58e8.bd4388",\r
+        "id": "ba75929f.5cc3f",\r
         "type": "method",\r
         "name": "vnf-topology-operation-assign",\r
         "xml": "<method rpc='vnf-topology-operation-assign' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 271,\r
-        "y": 252,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 274,\r
+        "y": 237,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "4626099.919e7f8"\r
+                "42e0dada.886834"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fce10a9.87d3d",\r
+        "id": "9fa83502.52906",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -49,170 +49,170 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 306,\r
-        "y": 194,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 309,\r
+        "y": 179,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "c77c58e8.bd4388"\r
+                "ba75929f.5cc3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34c5880c.3f1be8",\r
+        "id": "13070783.f89cd",\r
         "type": "switchNode",\r
         "name": "so-response-url empty?",\r
-        "xml": "<switch test='length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>\n",\r
+        "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 413,\r
-        "y": 403,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 416,\r
+        "y": 388,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "ea711693.205148",\r
-                "9c19c050.c2966"\r
+                "f34f4bcb.dd922",\r
+                "249fd627.d8094a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea711693.205148",\r
+        "id": "f34f4bcb.dd922",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 638,\r
-        "y": 359,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 641,\r
+        "y": 344,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "ef1a11b7.9f048"\r
+                "17058fd8.6a8c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c19c050.c2966",\r
+        "id": "249fd627.d8094a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 628,\r
-        "y": 451,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 631,\r
+        "y": 436,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "f7cfe715.aecd18"\r
+                "b94a1099.bd66b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef1a11b7.9f048",\r
+        "id": "17058fd8.6a8c48",\r
         "type": "call",\r
         "name": "call vnf-topology-operation-assign-sync",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1314,\r
-        "y": 360,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 1317,\r
+        "y": 345,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4b8837af.8e5f18",\r
+        "id": "bd8ba46f.b940d8",\r
         "type": "call",\r
         "name": "call vnf-topology-operation-assign-async",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1403,\r
-        "y": 563,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 1406,\r
+        "y": 548,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f7cfe715.aecd18",\r
+        "id": "b94a1099.bd66b8",\r
         "type": "switchNode",\r
         "name": "so-response-url = ignored URL?",\r
         "xml": "<switch test='$vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == $prop.so.ignore-url'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 850,\r
-        "y": 452,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 853,\r
+        "y": 437,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "585f0b6a.5484b4",\r
-                "99002e6e.d012d"\r
+                "9b3067a0.e60758",\r
+                "b25b9038.db50e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4626099.919e7f8",\r
+        "id": "42e0dada.886834",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 189,\r
-        "y": 321,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 192,\r
+        "y": 306,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "961c47b7.44b8d",\r
-                "34c5880c.3f1be8"\r
+                "b49305d6.2d75f8",\r
+                "13070783.f89cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "961c47b7.44b8d",\r
+        "id": "b49305d6.2d75f8",\r
         "type": "execute",\r
         "name": "execute PropertiesNode",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 410,\r
-        "y": 320,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 413,\r
+        "y": 305,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "585f0b6a.5484b4",\r
+        "id": "9b3067a0.e60758",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1090,\r
-        "y": 451,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 1093,\r
+        "y": 436,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "ef1a11b7.9f048"\r
+                "17058fd8.6a8c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99002e6e.d012d",\r
+        "id": "b25b9038.db50e8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1098,\r
-        "y": 552,\r
-        "z": "d1fefa2f.dc5878",\r
+        "x": 1101,\r
+        "y": 537,\r
+        "z": "63500dfc.d651b4",\r
         "wires": [\r
             [\r
-                "4b8837af.8e5f18"\r
+                "bd8ba46f.b940d8"\r
             ]\r
         ]\r
     }\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index b6cd420..f1f9ca1 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
@@ -7,7 +7,7 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
-            <switch test='length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>\r
+            <switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\r
                 <outcome value='true'>\r
                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>\r
                 </outcome>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index aaefc8e..9c6089f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
@@ -7,7 +7,7 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
-            <switch test='length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>\r
+            <switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\r
                 <outcome value='true'>\r
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' ></call>\r
                 </outcome>\r