Update brg activate and tunnelxconn create DGs

This update adds RestApiCallNode calls to tunnelxconn
create DG to configure xconnect for vCPE VNFs
and fixes order of vxlan tunnel create on brg activate
DG and tunnelxconn create DG. It also converts
tabs to spaces in brg-allotted-resource.json
and tunnelxconn-allotted-resource.json.

Issue-Id: SDNC-164
Change-Id: I72c70762df7f778ab9a8aca2040f5c424eb4dc0d
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

Former-commit-id: 90aab828a230896fa60398c3f66f6fee57c73be5

1 files changed, 90 insertions, 90 deletions

diff --git a/platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json
index 0d82bb65..d3c384d1 100644
--- a/platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json
+++ b/platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json
@@ -1,93 +1,93 @@
 {
-	"tunnelxconn-allotted-resource": [{
-		"allotted-resource-id": ${tx-ar.allotted-resource-id},
-		"allotted-resource-data": {
-			"tunnelxconn-topology": {
-				"allotted-resource-identifiers": {
-					"consuming-service-instance-id": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id},
-					"allotted-resource-name": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.allotted-resource-name},
-					"allotted-resource-id": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.allotted-resource-id},
-					"parent-service-instance-id": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.parent-service-instance-id},
-					"allotted-resource-type": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.allotted-resource-type}
-				},
-				"onap-model-information": {
-					"model-invariant-uuid": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid},
-					"model-customization-uuid": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-customization-uuid},
-					"model-uuid": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid},
-					"model-version": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version}
-				},
-				"tunnelxconn-assignments": {
-					"vni": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni},
-					"vgmux-bearer-ip": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip},
-					"vgmux-lan-ip": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip},
-					"vg-ip": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip},
-				},
-				"tunnelxconn-parameters": {
-					"param" : [
-						{	
-							"name" : "VNI",
-							"value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni}
-						},
-						{
-							"name" : "vgmux_private_ip_2",
-							"value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip},
-						},
-						{
-							"name" : "vgmux_private_ip_0",
-							"value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip}
-						},
-						{
-							"name" : "vgw_private_ip_0",
-							"value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip}
+    "tunnelxconn-allotted-resource": [{
+        "allotted-resource-id": ${tx-ar.allotted-resource-id},
+        "allotted-resource-data": {
+            "tunnelxconn-topology": {
+                "allotted-resource-identifiers": {
+                    "consuming-service-instance-id": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id},
+                    "allotted-resource-name": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.allotted-resource-name},
+                    "allotted-resource-id": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.allotted-resource-id},
+                    "parent-service-instance-id": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.parent-service-instance-id},
+                    "allotted-resource-type": ${tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.allotted-resource-type}
+                },
+                "onap-model-information": {
+                    "model-invariant-uuid": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid},
+                    "model-customization-uuid": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-customization-uuid},
+                    "model-uuid": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid},
+                    "model-version": ${tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version}
+                },
+                "tunnelxconn-assignments": {
+                    "vni": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni},
+                    "vgmux-bearer-ip": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip},
+                    "vgmux-lan-ip": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip},
+                    "vg-ip": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip},
+                },
+                "tunnelxconn-parameters": {
+                    "param" : [
+                        {
+                            "name" : "VNI",
+                            "value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni}
+                        },
+                        {
+                            "name" : "vgmux_private_ip_2",
+                            "value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip},
+                        },
+                        {
+                            "name" : "vgmux_private_ip_0",
+                            "value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip}
+                        },
+                        {
+                            "name" : "vgw_private_ip_0",
+                            "value": ${tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip}
 
-						}
-					]
-								
-				}
-				
-			},
-			"allotted-resource-operation-information": {
-			"allotted-resource-information": {
-      				"allotted-resource-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id},
-					"allotted-resource-type": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type},
-					"parent-service-instance-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id},
-					"onap-model-information": {
-						"model-invariant-uuid": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid},
-						"model-customization-uuid": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid},
-						"model-uuid": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid},
-						"model-version": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version}
-      				}
-    			},
-    			"sdnc-request-header": {
-      				"svc-request-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id},
-      				"svc-action": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action}
-    			},
-				"request-information": {
-					"request-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id},
-					"source": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.source},
-					"order-version": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version},
-					"order-number": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number},
-					"notification-url": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url},
-					"request-action": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action}
-				},
-				"tunnelxconn-request-input": {
-					"brg-wan-mac-address": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address}
-    			}
-			},
-			"allotted-resource-oper-status": {
-				"last-action": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action},
-				"modify-timestamp": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp},
-				"last-order-status": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-order-status},
-				"create-timestamp": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp},
-				"order-status": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status},
-				"last-rpc-action": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action},
-				"last-svc-request-id": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id}
-			}
-		},
-		"allotted-resource-status" : {
-			"action": ${tx-ar.allotted-resource-status.action},
-			"rpc-name": ${tx-ar.allotted-resource-status.rpc-name},
-			"rpc-action": ${tx-ar.allotted-resource-status.rpc-action}
-		}
-	}]
+                        }
+                    ]
+
+                }
+
+            },
+            "allotted-resource-operation-information": {
+            "allotted-resource-information": {
+                    "allotted-resource-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id},
+                    "allotted-resource-type": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type},
+                    "parent-service-instance-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id},
+                    "onap-model-information": {
+                        "model-invariant-uuid": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid},
+                        "model-customization-uuid": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid},
+                        "model-uuid": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid},
+                        "model-version": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version}
+                    }
+                },
+                "sdnc-request-header": {
+                    "svc-request-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id},
+                    "svc-action": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action}
+                },
+                "request-information": {
+                    "request-id": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id},
+                    "source": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.source},
+                    "order-version": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version},
+                    "order-number": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number},
+                    "notification-url": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url},
+                    "request-action": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action}
+                },
+                "tunnelxconn-request-input": {
+                    "brg-wan-mac-address": ${tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address}
+                }
+            },
+            "allotted-resource-oper-status": {
+                "last-action": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action},
+                "modify-timestamp": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp},
+                "last-order-status": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-order-status},
+                "create-timestamp": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp},
+                "order-status": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status},
+                "last-rpc-action": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action},
+                "last-svc-request-id": ${tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id}
+            }
+        },
+        "allotted-resource-status" : {
+            "action": ${tx-ar.allotted-resource-status.action},
+            "rpc-name": ${tx-ar.allotted-resource-status.rpc-name},
+            "rpc-action": ${tx-ar.allotted-resource-status.rpc-action}
+        }
+    }]
 }