summaryrefslogtreecommitdiffstats
path: root/platform-logic
diff options
context:
space:
mode:
authorMarcus Williams <marcus.williams@intel.com>2017-10-30 19:23:47 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-30 19:23:47 +0000
commitdacfab59cf41eaf95b3a87ec48124a1a51a21df7 (patch)
tree3b25374c4d8016cfc85f9c3435c7512128784d67 /platform-logic
parent95fb049d01e6193782a78cd3a9bd7f914a7cb11f (diff)
parent276eaa580a8e67edaa50547c71c7d389d23d8324 (diff)
Merge "GENERIC-RESOURCE-API template fixes"
Former-commit-id: b762951427de965aac2461d99017714f74b5fa15
Diffstat (limited to 'platform-logic')
-rw-r--r--[-rwxr-xr-x]platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json6
-rw-r--r--platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json5
-rw-r--r--platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json16
3 files changed, 24 insertions, 3 deletions
diff --git a/platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json
index b78f19e5..9e151fac 100755..100644
--- a/platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json
+++ b/platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json
@@ -1,8 +1,8 @@
{
- "tunnelxconn-allotted-resource": [{
+ "brg-allotted-resource": [{
"allotted-resource-id": ${brg-ar.allotted-resource-id},
"allotted-resource-data": {
- "tunnelxconn-topology": {
+ "brg-topology": {
"allotted-resource-identifiers": {
"consuming-service-instance-id": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id},
"allotted-resource-name": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.allotted-resource-name},
@@ -17,7 +17,7 @@
"model-version": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-version}
},
"brg-assignments": {
- "vbrg-wan-ip": ${brg-ar.allotted-resource-data.tunnelxconn-topology.brg-assignments.vbrg-wan-ip},
+ "vbrg-wan-ip": ${brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip},
},
"brg-parameters": {
}
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
new file mode 100644
index 00000000..eed19bab
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json
@@ -0,0 +1,5 @@
+{
+ "l2": {
+ "xconnect-outgoing-interface": "${tmp.tunnel-name}"
+ }
+}
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
new file mode 100644
index 00000000..3a90103c
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json
@@ -0,0 +1,16 @@
+{
+ "interface": [
+ {
+ "enabled": "true",
+ "link-up-down-trap-enable": "enabled",
+ "name": "${tmp.tunnel-name}",
+ "type": "v3po:vxlan-tunnel",
+ "vxlan": {
+ "dst": "${tmp.tunnel-dest-ip}",
+ "encap-vrf-id": "0",
+ "src": "${tmp.tunnel-src-ip}",
+ "vni": "${tmp.tunnel-vni}"
+ }
+ }
+ ]
+}