From 7d1a46869fc2130835fb3217b4c72232b2b53e39 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 23 Jan 2020 16:27:28 -0500
Subject: [PATCH] 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
---
 ...CE-API_vf-module-topology-operation-assign.json | 140 ++++++++++-----------
 ...RESOURCE-API_vnf-topology-operation-assign.json | 140 ++++++++++-----------
 ...RCE-API_vf-module-topology-operation-assign.xml |   2 +-
 ...-RESOURCE-API_vnf-topology-operation-assign.xml |   2 +-
 4 files changed, 142 insertions(+), 142 deletions(-)

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 a7a136a3..7f3106cb 100644
--- 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 @@
 [
     {
-        "id": "63f4b59b.216734",
+        "id": "eed3ed90.e90c6",
         "type": "comment",
         "name": "vf-module-topology-operation-assign",
         "info": "",
         "comments": "",
-        "x": 268,
-        "y": 45,
-        "z": "a314769.77ed108",
+        "x": 310,
+        "y": 66,
+        "z": "27e0d311.a52dec",
         "wires": []
     },
     {
-        "id": "1dc1d8b5.caf8ef",
+        "id": "3f14c604.6558d2",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 88,
-        "y": 130,
-        "z": "a314769.77ed108",
+        "x": 130,
+        "y": 151,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "f41394ef.1a3d7"
+                "c859c3ce.5e7178"
             ]
         ]
     },
     {
-        "id": "2f77e300.955b76",
+        "id": "7da0ecb.6675294",
         "type": "method",
         "name": "vf-module-topology-operation-assign",
         "xml": "<method rpc='vf-module-topology-operation-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 250,
-        "y": 233,
-        "z": "a314769.77ed108",
+        "x": 292,
+        "y": 254,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "3ac51b9d.77422c"
+                "8183c499.5946f"
             ]
         ]
     },
     {
-        "id": "f41394ef.1a3d7",
+        "id": "c859c3ce.5e7178",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -49,170 +49,170 @@
         "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": 285,
-        "y": 175,
-        "z": "a314769.77ed108",
+        "x": 327,
+        "y": 196,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "2f77e300.955b76"
+                "7da0ecb.6675294"
             ]
         ]
     },
     {
-        "id": "43431008.7f7928",
+        "id": "dae0e43e.4d1ed",
         "type": "switchNode",
         "name": "so-response-url empty?",
-        "xml": "<switch test='length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>\n",
+        "xml": "<switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 392,
-        "y": 384,
-        "z": "a314769.77ed108",
+        "x": 434,
+        "y": 405,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "e3dac757.d5f66",
-                "a3e690eb.7f4b88"
+                "76c1b8d9.913768",
+                "6ef8865c.b25578"
             ]
         ]
     },
     {
-        "id": "e3dac757.d5f66",
+        "id": "76c1b8d9.913768",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 617,
-        "y": 340,
-        "z": "a314769.77ed108",
+        "x": 659,
+        "y": 361,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "5c050a22.e2992c"
+                "6cdcf088.cc5cb8"
             ]
         ]
     },
     {
-        "id": "a3e690eb.7f4b88",
+        "id": "6ef8865c.b25578",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 607,
-        "y": 432,
-        "z": "a314769.77ed108",
+        "x": 649,
+        "y": 453,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "c0411a45.4e7d4"
+                "730228fb.eec9d"
             ]
         ]
     },
     {
-        "id": "5c050a22.e2992c",
+        "id": "6cdcf088.cc5cb8",
         "type": "call",
         "name": "call vf-module-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1293,
-        "y": 341,
-        "z": "a314769.77ed108",
+        "x": 1335,
+        "y": 362,
+        "z": "27e0d311.a52dec",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c116772.ba24a",
+        "id": "ab75c8b2.d4fc7",
         "type": "call",
         "name": "call vf-module-topology-operation-assign-async",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1382,
-        "y": 544,
-        "z": "a314769.77ed108",
+        "x": 1424,
+        "y": 565,
+        "z": "27e0d311.a52dec",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0411a45.4e7d4",
+        "id": "730228fb.eec9d",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == $prop.so.ignore-url'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 829,
-        "y": 433,
-        "z": "a314769.77ed108",
+        "x": 871,
+        "y": 454,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "c677e17b.35a978",
-                "a7cad0db.81847"
+                "4485febe.44dd48",
+                "5bc3b5df.658e44"
             ]
         ]
     },
     {
-        "id": "3ac51b9d.77422c",
+        "id": "8183c499.5946f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 168,
-        "y": 302,
-        "z": "a314769.77ed108",
+        "x": 210,
+        "y": 323,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "de741370.91f13",
-                "43431008.7f7928"
+                "91cddc4a.0b5c5",
+                "dae0e43e.4d1ed"
             ]
         ]
     },
     {
-        "id": "de741370.91f13",
+        "id": "91cddc4a.0b5c5",
         "type": "execute",
         "name": "execute PropertiesNode",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 389,
-        "y": 301,
-        "z": "a314769.77ed108",
+        "x": 431,
+        "y": 322,
+        "z": "27e0d311.a52dec",
         "wires": [
             []
         ]
     },
     {
-        "id": "c677e17b.35a978",
+        "id": "4485febe.44dd48",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069,
-        "y": 432,
-        "z": "a314769.77ed108",
+        "x": 1111,
+        "y": 453,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "5c050a22.e2992c"
+                "6cdcf088.cc5cb8"
             ]
         ]
     },
     {
-        "id": "a7cad0db.81847",
+        "id": "5bc3b5df.658e44",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077,
-        "y": 533,
-        "z": "a314769.77ed108",
+        "x": 1119,
+        "y": 554,
+        "z": "27e0d311.a52dec",
         "wires": [
             [
-                "4c116772.ba24a"
+                "ab75c8b2.d4fc7"
             ]
         ]
     }
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 345e63d2..7a838d15 100644
--- 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 @@
 [
     {
-        "id": "d8152ad9.82c12",
+        "id": "8c2e36e8.ec79d",
         "type": "comment",
         "name": "vnf-topology-operation-assign",
         "info": "",
         "comments": "",
-        "x": 289,
-        "y": 64,
-        "z": "d1fefa2f.dc5878",
+        "x": 292,
+        "y": 49,
+        "z": "63500dfc.d651b4",
         "wires": []
     },
     {
-        "id": "2dfa6d30.c20ada",
+        "id": "bf23b5c0.7e5d98",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 109,
-        "y": 149,
-        "z": "d1fefa2f.dc5878",
+        "x": 112,
+        "y": 134,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "6fce10a9.87d3d"
+                "9fa83502.52906"
             ]
         ]
     },
     {
-        "id": "c77c58e8.bd4388",
+        "id": "ba75929f.5cc3f",
         "type": "method",
         "name": "vnf-topology-operation-assign",
         "xml": "<method rpc='vnf-topology-operation-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 271,
-        "y": 252,
-        "z": "d1fefa2f.dc5878",
+        "x": 274,
+        "y": 237,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "4626099.919e7f8"
+                "42e0dada.886834"
             ]
         ]
     },
     {
-        "id": "6fce10a9.87d3d",
+        "id": "9fa83502.52906",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -49,170 +49,170 @@
         "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": 306,
-        "y": 194,
-        "z": "d1fefa2f.dc5878",
+        "x": 309,
+        "y": 179,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "c77c58e8.bd4388"
+                "ba75929f.5cc3f"
             ]
         ]
     },
     {
-        "id": "34c5880c.3f1be8",
+        "id": "13070783.f89cd",
         "type": "switchNode",
         "name": "so-response-url empty?",
-        "xml": "<switch test='length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>\n",
+        "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 413,
-        "y": 403,
-        "z": "d1fefa2f.dc5878",
+        "x": 416,
+        "y": 388,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "ea711693.205148",
-                "9c19c050.c2966"
+                "f34f4bcb.dd922",
+                "249fd627.d8094a"
             ]
         ]
     },
     {
-        "id": "ea711693.205148",
+        "id": "f34f4bcb.dd922",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 638,
-        "y": 359,
-        "z": "d1fefa2f.dc5878",
+        "x": 641,
+        "y": 344,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "ef1a11b7.9f048"
+                "17058fd8.6a8c48"
             ]
         ]
     },
     {
-        "id": "9c19c050.c2966",
+        "id": "249fd627.d8094a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 628,
-        "y": 451,
-        "z": "d1fefa2f.dc5878",
+        "x": 631,
+        "y": 436,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "f7cfe715.aecd18"
+                "b94a1099.bd66b8"
             ]
         ]
     },
     {
-        "id": "ef1a11b7.9f048",
+        "id": "17058fd8.6a8c48",
         "type": "call",
         "name": "call vnf-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1314,
-        "y": 360,
-        "z": "d1fefa2f.dc5878",
+        "x": 1317,
+        "y": 345,
+        "z": "63500dfc.d651b4",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b8837af.8e5f18",
+        "id": "bd8ba46f.b940d8",
         "type": "call",
         "name": "call vnf-topology-operation-assign-async",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-async' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1403,
-        "y": 563,
-        "z": "d1fefa2f.dc5878",
+        "x": 1406,
+        "y": 548,
+        "z": "63500dfc.d651b4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f7cfe715.aecd18",
+        "id": "b94a1099.bd66b8",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='$vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == $prop.so.ignore-url'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 850,
-        "y": 452,
-        "z": "d1fefa2f.dc5878",
+        "x": 853,
+        "y": 437,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "585f0b6a.5484b4",
-                "99002e6e.d012d"
+                "9b3067a0.e60758",
+                "b25b9038.db50e8"
             ]
         ]
     },
     {
-        "id": "4626099.919e7f8",
+        "id": "42e0dada.886834",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 189,
-        "y": 321,
-        "z": "d1fefa2f.dc5878",
+        "x": 192,
+        "y": 306,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "961c47b7.44b8d",
-                "34c5880c.3f1be8"
+                "b49305d6.2d75f8",
+                "13070783.f89cd"
             ]
         ]
     },
     {
-        "id": "961c47b7.44b8d",
+        "id": "b49305d6.2d75f8",
         "type": "execute",
         "name": "execute PropertiesNode",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 410,
-        "y": 320,
-        "z": "d1fefa2f.dc5878",
+        "x": 413,
+        "y": 305,
+        "z": "63500dfc.d651b4",
         "wires": [
             []
         ]
     },
     {
-        "id": "585f0b6a.5484b4",
+        "id": "9b3067a0.e60758",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1090,
-        "y": 451,
-        "z": "d1fefa2f.dc5878",
+        "x": 1093,
+        "y": 436,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "ef1a11b7.9f048"
+                "17058fd8.6a8c48"
             ]
         ]
     },
     {
-        "id": "99002e6e.d012d",
+        "id": "b25b9038.db50e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1098,
-        "y": 552,
-        "z": "d1fefa2f.dc5878",
+        "x": 1101,
+        "y": 537,
+        "z": "63500dfc.d651b4",
         "wires": [
             [
-                "4b8837af.8e5f18"
+                "bd8ba46f.b940d8"
             ]
         ]
     }
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 b6cd4203..f1f9ca10 100644
--- 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' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
-            <switch test='length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>
+            <switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>
                 <outcome value='true'>
                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>
                 </outcome>
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 aaefc8e4..9c6089fb 100644
--- 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' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
-            <switch test='length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0'>
+            <switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>
                 <outcome value='true'>
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' ></call>
                 </outcome>
-- 
2.16.6