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 eed19ba..a3b0237 100644 (file)
--- 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 6593f0b..dd0d017 100644 (file)
--- 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 3a90103..fde75fe 100644 (file)
--- 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}
             }
         }
     ]