From 93bb9d70960c1eba2659e05f323531a1859a6c15 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 20 Oct 2017 11:46:26 -0400 Subject: Fix tunnelxconn DGs Tunnelxconn DGs had cut/paste errors (referred to security-zone incorrectly). Also, restapi templates were missing. Change-Id: Ib7aad71796301632e9269aa9e3e5e5fd266d7a94 Issue-ID: SDNC-139 Signed-off-by: Dan Timoney Former-commit-id: 76c06d99c067aa7be038e496753caee30ee01d0b --- .../json/contrail-route-allotted-resource.json | 102 +++++++++++++++++++++ .../json/network-provided-allotted-resources.json | 10 ++ .../json/parent-provided-allotted-resource.json | 9 ++ .../main/json/security-zone-allotted-resource.json | 78 ++++++++++++++++ .../main/json/tunnelxconn-allotted-resource.json | 72 +++++++++++++++ .../main/json/vnf-provided-allotted-resources.json | 10 ++ 6 files changed, 281 insertions(+) create mode 100755 platform-logic/restapi-templates/src/main/json/contrail-route-allotted-resource.json create mode 100755 platform-logic/restapi-templates/src/main/json/network-provided-allotted-resources.json create mode 100755 platform-logic/restapi-templates/src/main/json/parent-provided-allotted-resource.json create mode 100755 platform-logic/restapi-templates/src/main/json/security-zone-allotted-resource.json create mode 100755 platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json create mode 100755 platform-logic/restapi-templates/src/main/json/vnf-provided-allotted-resources.json (limited to 'platform-logic/restapi-templates/src/main/json') diff --git a/platform-logic/restapi-templates/src/main/json/contrail-route-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/contrail-route-allotted-resource.json new file mode 100755 index 00000000..dd3a743b --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/contrail-route-allotted-resource.json @@ -0,0 +1,102 @@ +{ + "contrail-route-allotted-resource": [{ + "allotted-resource-id": ${ar.allotted-resource-id}, + "allotted-resource-data": { + "contrail-route-topology": { + "allotted-resource-identifiers": { + "consuming-service-instance-id": ${ar.allotted-resource-data.contrail-route-topology.allotted-resource-identifiers.consuming-service-instance-id}, + "allotted-resource-name": ${ar.allotted-resource-data.contrail-route-topology.allotted-resource-identifiers.allotted-resource-name}, + "allotted-resource-id": ${ar.allotted-resource-data.contrail-route-topology.allotted-resource-identifiers.allotted-resource-id}, + "parent-service-instance-id": ${ar.allotted-resource-data.contrail-route-topology.allotted-resource-identifiers.parent-service-instance-id}, + "allotted-resource-type": ${ar.allotted-resource-data.contrail-route-topology.allotted-resource-identifiers.allotted-resource-type} + }, + "onap-model-information": { + "model-invariant-uuid": ${ar.allotted-resource-data.contrail-route-topology.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${ar.allotted-resource-data.contrail-route-topology.onap-model-information.model-customization-uuid}, + "model-uuid": ${ar.allotted-resource-data.contrail-route-topology.onap-model-information.model-uuid}, + "model-version": ${ar.allotted-resource-data.contrail-route-topology.onap-model-information.model-version} + }, + "contrail-route-assignments": { + "fq-name": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.fq-name}, + "contrail-id": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.contrail-id}, + "vlan-tag": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.vlan-tag}, + "source-network": { + "network-id": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.source-network.network-id}, + "network-role": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.source-network.network-role} + }, + "dest-network": { + "network-id": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.dest-network.network-id}, + "network-role": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.dest-network.network-role} + }, + "contrail-applied-service": { + "service-instance-id": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.contrail-applied-service.service-instance-id}, + "vnf-id": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.contrail-applied-service.vnf-id}, + "contrail-fqdn": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-assignments.contrail-applied-service.contrail-fqdn} + } + }, + "contrail-route-parameters": { + "param" : [ + ${repeat:ar.allotted-resource-data.contrail-route-topology.contrail-route-parameters_length: + { + "name": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-parameters[${1}].name}, + "value": ${ar.allotted-resource-data.contrail-route-topology.contrail-route-parameters[${1}].value} + } + } + ] + } + }, + "allotted-resource-operation-information": { + "allotted-resource-information": { + "allotted-resource-id": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id}, + "allotted-resource-type": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type}, + "parent-service-instance-id": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id}, + "onap-model-information": { + "model-invariant-uuid": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid}, + "model-version": ${ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version} + } + }, + "sdnc-request-header": { + "svc-request-id": ${ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id}, + "svc-action": ${ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action} + }, + "request-information": { + "request-id": ${ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id}, + "source": ${ar.allotted-resource-data.allotted-resource-operation-information.request-information.source}, + "order-version": ${ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version}, + "order-number": ${ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number}, + "notification-url": ${ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url}, + "request-action": ${ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action} + }, + "contrail-route-request-input": { + "source-network": { + "network-id": ${ar.allotted-resource-data.allotted-resource-operation-information.contrail-route-request-input.source-network.network-id}, + "network-role": ${ar.allotted-resource-data.allotted-resource-operation-information.contrail-route-request-input.source-network.network-role} + }, + "dest-network": { + "network-id": ${ar.allotted-resource-data.allotted-resource-operation-information.contrail-route-request-input.dest-network.network-id}, + "network-role": ${ar.allotted-resource-data.allotted-resource-operation-information.contrail-route-request-input.dest-network.network-role} + }, + "contrail-applied-service-info": { + "service-instance-id" : ${ar.allotted-resource-data.allotted-resource-operation-information.contrail-route-request-input.contrail-applied-service-info.service-instance-id} + } + } + }, + "allotted-resource-oper-status": { + "last-action": ${ar.allotted-resource-data.allotted-resource-oper-status.last-action}, + "modify-timestamp": ${ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp}, + "last-order-status": ${ar.allotted-resource-data.allotted-resource-oper-status.last-order-status}, + "create-timestamp": ${ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp}, + "order-status": ${ar.allotted-resource-data.allotted-resource-oper-status.order-status}, + "last-rpc-action": ${ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action}, + "last-svc-request-id": ${ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id} + } + }, + "allotted-resource-status" : { + "action": ${ar.allotted-resource-status.action}, + "rpc-name": ${ar.allotted-resource-status.rpc-name}, + "rpc-action": ${ar.allotted-resource-status.rpc-action} + } + }] +} diff --git a/platform-logic/restapi-templates/src/main/json/network-provided-allotted-resources.json b/platform-logic/restapi-templates/src/main/json/network-provided-allotted-resources.json new file mode 100755 index 00000000..663eba46 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/network-provided-allotted-resources.json @@ -0,0 +1,10 @@ +{ + network-provided-allotted-resources: + { + "network-provided-ar-id": [ + ${repeat:net-ar.network-provided-allotted-resources.network-provided-ar-id_length: + ${net-ar.network-provided-allotted-resources.network-provided-ar-id[${1}]}, + } + ] + } +} diff --git a/platform-logic/restapi-templates/src/main/json/parent-provided-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/parent-provided-allotted-resource.json new file mode 100755 index 00000000..e6daf0b8 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/parent-provided-allotted-resource.json @@ -0,0 +1,9 @@ +{ + "provided-allotted-resource": [ + { + "allotted-resource-id": ${tmp.ar.allotted-resource-id}, + "allotted-resource-pointer": ${tmp.ar.self-link}, + "allotted-resource-type": ${tmp.ar.allotted-resource-type} + } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/security-zone-allotted-resource.json b/platform-logic/restapi-templates/src/main/json/security-zone-allotted-resource.json new file mode 100755 index 00000000..71b85038 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/security-zone-allotted-resource.json @@ -0,0 +1,78 @@ +{ + "security-zone-allotted-resource": [{ + "allotted-resource-id": ${sz-ar.allotted-resource-id}, + "allotted-resource-data": { + "security-zone-topology": { + "allotted-resource-identifiers": { + "consuming-service-instance-id": ${sz-ar.allotted-resource-data.security-zone-topology.allotted-resource-identifiers.consuming-service-instance-id}, + "allotted-resource-name": ${sz-ar.allotted-resource-data.security-zone-topology.allotted-resource-identifiers.allotted-resource-name}, + "allotted-resource-id": ${sz-ar.allotted-resource-data.security-zone-topology.allotted-resource-identifiers.allotted-resource-id}, + "parent-service-instance-id": ${sz-ar.allotted-resource-data.security-zone-topology.allotted-resource-identifiers.parent-service-instance-id}, + "allotted-resource-type": ${sz-ar.allotted-resource-data.security-zone-topology.allotted-resource-identifiers.allotted-resource-type} + }, + "onap-model-information": { + "model-invariant-uuid": ${sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-customization-uuid}, + "model-uuid": ${sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-uuid}, + "model-version": ${sz-ar.allotted-resource-data.security-zone-topology.onap-model-information.model-version} + }, + "security-zone-assignments": { + "trusted-network-role": ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.trusted-network-role}, + "security-zone-name-trusted": ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-name-trusted}, + "security-zone-name-untrusted": ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-name-untrusted}, + "untrusted-network-role": ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.untrusted-network-role}, + "security-zone-service-instance-id" : ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-service-instance-id}, + "security-zone-vnf-id" : ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.security-zone-vnf-id}, + "vlan-tag": ${sz-ar.allotted-resource-data.security-zone-topology.security-zone-assignments.vlan-tag} + }, + "security-zone-parameters": { + } + + }, + "allotted-resource-operation-information": { + "allotted-resource-information": { + "allotted-resource-id": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-id}, + "allotted-resource-type": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.allotted-resource-type}, + "parent-service-instance-id": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.parent-service-instance-id}, + "onap-model-information": { + "model-invariant-uuid": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-uuid}, + "model-version": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.onap-model-information.model-version} + } + }, + "sdnc-request-header": { + "svc-request-id": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id}, + "svc-action": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-action} + }, + "request-information": { + "request-id": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-id}, + "source": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.source}, + "order-version": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-version}, + "order-number": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.order-number}, + "notification-url": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.notification-url}, + "request-action": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action} + }, + "security-zone-request-input": { + "vlan-tag": ${sz-ar.allotted-resource-data.allotted-resource-operation-information.security-zone-request-input.vlan-tag}, + "trusted-network-role" : ${sz-ar.allotted-resource-data.allotted-resource-operation-information.security-zone-request-input.trusted-network-role}, + "untrusted-network-role" : ${sz-ar.allotted-resource-data.allotted-resource-operation-information.security-zone-request-input.untrusted-network-role} + } + }, + "allotted-resource-oper-status": { + "last-action": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action}, + "modify-timestamp": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.modify-timestamp}, + "last-order-status": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.last-order-status}, + "create-timestamp": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp}, + "order-status": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status}, + "last-rpc-action": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action}, + "last-svc-request-id": ${sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id} + } + }, + "allotted-resource-status" : { + "action": ${sz-ar.allotted-resource-status.action}, + "rpc-name": ${sz-ar.allotted-resource-status.rpc-name}, + "rpc-action": ${sz-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 new file mode 100755 index 00000000..810b0b97 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/tunnelxconn-allotted-resource.json @@ -0,0 +1,72 @@ +{ + "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}, + }, + "tunnelxconn-parameters": { + } + + }, + "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} + } + }] +} diff --git a/platform-logic/restapi-templates/src/main/json/vnf-provided-allotted-resources.json b/platform-logic/restapi-templates/src/main/json/vnf-provided-allotted-resources.json new file mode 100755 index 00000000..3c73fe4c --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/vnf-provided-allotted-resources.json @@ -0,0 +1,10 @@ +{ + vnf-provided-allotted-resources: + { + "vnf-provided-ar-id": [ + ${repeat:vnf-ar.vnf-provided-allotted-resources.vnf-provided-ar-id_length: + ${vnf-ar.vnf-provided-allotted-resources.vnf-provided-ar-id[${1}]}, + } + ] + } +} -- cgit 1.2.3-korg