summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-11-05 12:36:41 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-05 12:36:41 +0000
commitc93e2679d176bb444a643df1c98460e553def1e1 (patch)
tree4d0658ba56759704df0f4fdddf06182f099a04b6
parent0ead46e4dc3bf3fbf0cdf8a76cbf0c5d6e0b191b (diff)
parentb6c2f52b1244bddac8ab2d831643d6f44712254e (diff)
Merge "Fix vcp template errors, remove extra quotes"
Former-commit-id: 953f7d5dde47206a1519bcdd28137fccd8cd579b
-rw-r--r--platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json2
-rw-r--r--platform-logic/restapi-templates/src/main/json/vcpe-vpp-bridge-domain.json4
-rw-r--r--platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json8
3 files changed, 7 insertions, 7 deletions
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}
}
}
]