diff options
author | Dan Timoney <dtimoney@att.com> | 2017-11-03 21:53:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-11-03 21:53:05 +0000 |
commit | 015799def0f582771db21095a51201a84a66dd53 (patch) | |
tree | 7d879dbdf2bec8286457743cf1b03e25c310c2c1 /platform-logic/restapi-templates/src/main | |
parent | b90b14fa042698c11d4a146cf8cb77c62b7b0ad2 (diff) | |
parent | 0eaaa3f30ccca15838262491a32d67d32bce8e09 (diff) |
Merge "Update brg activate and tunnelxconn create DGs"
Former-commit-id: f6c0fb7b0fa5a88e6c376b14356b4c4c45843467
Diffstat (limited to 'platform-logic/restapi-templates/src/main')
-rw-r--r-- | platform-logic/restapi-templates/src/main/json/brg-allotted-resource.json | 134 | ||||
-rw-r--r-- | platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json | 180 |
2 files changed, 157 insertions, 157 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 9e151fac..bac4128f 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,72 +1,72 @@ { - "brg-allotted-resource": [{ - "allotted-resource-id": ${brg-ar.allotted-resource-id}, - "allotted-resource-data": { - "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}, - "allotted-resource-id": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.allotted-resource-id}, - "parent-service-instance-id": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.parent-service-instance-id}, - "allotted-resource-type": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.allotted-resource-type} - }, - "onap-model-information": { - "model-invariant-uuid": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid}, - "model-customization-uuid": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-customization-uuid}, - "model-uuid": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid}, - "model-version": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-version} - }, - "brg-assignments": { - "vbrg-wan-ip": ${brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip}, - }, - "brg-parameters": { - } + "brg-allotted-resource": [{ + "allotted-resource-id": ${brg-ar.allotted-resource-id}, + "allotted-resource-data": { + "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}, + "allotted-resource-id": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.allotted-resource-id}, + "parent-service-instance-id": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.parent-service-instance-id}, + "allotted-resource-type": ${brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.allotted-resource-type} + }, + "onap-model-information": { + "model-invariant-uuid": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-customization-uuid}, + "model-uuid": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid}, + "model-version": ${brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-version} + }, + "brg-assignments": { + "vbrg-wan-ip": ${brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip}, + }, + "brg-parameters": { + } - }, - "allotted-resource-operation-information": { - "allotted-resource-information": { - "allotted-resource-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id}, - "allotted-resource-type": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type}, - "parent-service-instance-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id}, - "onap-model-information": { - "model-invariant-uuid": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid}, - "model-customization-uuid": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid}, - "model-uuid": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid}, - "model-version": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version} - } - }, - "sdnc-request-header": { - "svc-request-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id}, - "svc-action": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action} - }, - "request-information": { - "request-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id}, - "source": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.source}, - "order-version": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version}, - "order-number": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number}, - "notification-url": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url}, - "request-action": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action} - }, - "brg-request-input": { + }, + "allotted-resource-operation-information": { + "allotted-resource-information": { + "allotted-resource-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id}, + "allotted-resource-type": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type}, + "parent-service-instance-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id}, + "onap-model-information": { + "model-invariant-uuid": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid}, + "model-version": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version} + } + }, + "sdnc-request-header": { + "svc-request-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id}, + "svc-action": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action} + }, + "request-information": { + "request-id": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id}, + "source": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.source}, + "order-version": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version}, + "order-number": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number}, + "notification-url": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url}, + "request-action": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action} + }, + "brg-request-input": { "vgmux-bearer-ip": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip}, "vni": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni}, - "brg-wan-ip-address": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address} - } - }, - "allotted-resource-oper-status": { - "last-action": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action}, - "modify-timestamp": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp}, - "last-order-status": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-order-status}, - "create-timestamp": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp}, - "order-status": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status}, - "last-rpc-action": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action}, - "last-svc-request-id": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id} - } - }, - "allotted-resource-status" : { - "action": ${brg-ar.allotted-resource-status.action}, - "rpc-name": ${brg-ar.allotted-resource-status.rpc-name}, - "rpc-action": ${brg-ar.allotted-resource-status.rpc-action} - } - }] + "brg-wan-ip-address": ${brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address} + } + }, + "allotted-resource-oper-status": { + "last-action": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action}, + "modify-timestamp": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp}, + "last-order-status": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-order-status}, + "create-timestamp": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp}, + "order-status": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status}, + "last-rpc-action": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action}, + "last-svc-request-id": ${brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id} + } + }, + "allotted-resource-status" : { + "action": ${brg-ar.allotted-resource-status.action}, + "rpc-name": ${brg-ar.allotted-resource-status.rpc-name}, + "rpc-action": ${brg-ar.allotted-resource-status.rpc-action} + } + }] } 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} + } + }] } |