From: Dan Timoney <dtimoney@att.com>
Date: Sun, 5 Nov 2017 12:36:41 +0000 (+0000)
Subject: Merge "Fix vcp template errors, remove extra quotes"
X-Git-Tag: v1.2.1~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c93e2679d176bb444a643df1c98460e553def1e1;hp=0ead46e4dc3bf3fbf0cdf8a76cbf0c5d6e0b191b;p=sdnc%2Foam.git

Merge "Fix vcp template errors, remove extra quotes"

Former-commit-id: 953f7d5dde47206a1519bcdd28137fccd8cd579b
---

diff --git a/platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json b/platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json
index eed19bab..a3b0237c 100644
--- a/platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json
+++ b/platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json
@@ -1,5 +1,5 @@
 {
     "l2": {
-        "xconnect-outgoing-interface": "${tmp.tunnel-name}"
+        "xconnect-outgoing-interface": ${tmp.tunnel-name}
     }
 }
diff --git a/platform-logic/restapi-templates/src/main/json/vcpe-vpp-bridge-domain.json b/platform-logic/restapi-templates/src/main/json/vcpe-vpp-bridge-domain.json
index 6593f0b6..dd0d0178 100644
--- a/platform-logic/restapi-templates/src/main/json/vcpe-vpp-bridge-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/vcpe-vpp-bridge-domain.json
@@ -1,7 +1,7 @@
 {
     "l2":{
-        "bridge-domain":"${tmp.bridge-domain}",
+        "bridge-domain": ${tmp.bridge-domain},
         "bridged-virtual-interface":false,
-        "split-horizon-group":"${tmp.split-horizon-group}"
+        "split-horizon-group": ${tmp.split-horizon-group}
     }
 }
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json b/platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json
index 3a90103c..fde75fe7 100644
--- a/platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json
+++ b/platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json
@@ -3,13 +3,13 @@
         {
             "enabled": "true",
             "link-up-down-trap-enable": "enabled",
-            "name": "${tmp.tunnel-name}",
+            "name": ${tmp.tunnel-name},
             "type": "v3po:vxlan-tunnel",
             "vxlan": {
-                "dst": "${tmp.tunnel-dest-ip}",
+                "dst": ${tmp.tunnel-dest-ip},
                 "encap-vrf-id": "0",
-                "src": "${tmp.tunnel-src-ip}",
-                "vni": "${tmp.tunnel-vni}"
+                "src": ${tmp.tunnel-src-ip},
+                "vni": ${tmp.tunnel-vni}
             }
         }
     ]