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

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
old mode 100755 (executable)
new mode 100644 (file)
index 23a9bc7..a818eef
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -5,12 +5,16 @@ controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 # Templates
 restapi.sz.templatefile=security-zone-allotted-resource.json
 restapi.cr.templatefile=contrail-route-allotted-resource.json
+restapi.brg.templatefile=brg-allotted-resource.json
+restapi.tx.templatefile=tx-allotted-resource.json
 restapi.parentsvc.templatefile=parent-provided-allotted-resource.json
 restapi.network-ar.templatefile=network-provided-allotted-resources.json
 restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json
 # URLs
 restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
 restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/
+restapi.brg-allottedresource=/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/
+restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/
 restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
 restapi.network-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
 restapi.pm-configuration=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/

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 (executable)
new mode 100644 (file)
index b78f19e..9e151fa
--- 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 (file)
index 0000000..eed19ba
--- /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 (file)
index 0000000..3a90103
--- /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}"
+            }
+        }
+    ]
+}