From 276eaa580a8e67edaa50547c71c7d389d23d8324 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 30 Oct 2017 15:03:02 -0400
Subject: GENERIC-RESOURCE-API template fixes

Add missing RESTAPI templates used by vcpe use case and fix error
in properties file

Change-Id: I008620438529244335eacbd704e355e2de80873d
Issue-ID: SDNC-151
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: af90e06e4fbd0f645467bef839ea18dfa6c415ca
---
 .../src/main/json/brg-allotted-resource.json             |  6 +++---
 .../src/main/json/vcpe-l2-interface.json                 |  5 +++++
 .../src/main/json/vcpe-vxlan-tunnel.json                 | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/vcpe-l2-interface.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/vcpe-vxlan-tunnel.json

(limited to 'platform-logic/restapi-templates/src')

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
old mode 100755
new mode 100644
index b78f19e5..9e151fac
--- 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}"
+            }
+        }
+    ]
+}
-- 
cgit 1.2.3-korg