From 7f70731621bcd7cdb4f4157eba0d66b3638f1519 Mon Sep 17 00:00:00 2001 From: "Cheung, Pat" Date: Thu, 4 Oct 2018 18:35:55 +0000 Subject: self-serve dg patch inclues new self-serve forking logic, added silentFailure to for loops, not to set cap name to INPUT for generate-name Change-Id: Idd3deb016533dc70611d60dd289f4c4bc40d3136 Issue-ID: CCSDK-604 Signed-off-by: Cheung, Pat Former-commit-id: 7209c246e382048781f166c2b3eeab24be7e9815 --- .../src/main/json/self-serve-capacity-release.json | 16 +++ .../src/main/json/self-serve-capacity-reserve.json | 22 ++++ .../json/self-serve-mS-mac-address-assign.json | 26 +++++ .../json/self-serve-mS-mac-address-unassign.json | 14 +++ .../json/self-serve-mS-vlan-tag-assignments.json | 14 +++ .../json/self-serve-mS-vlan-tag-unassignments.json | 11 ++ .../main/json/self-serve-vfmodule-assignments.json | 123 +++++++++++++++++++++ .../src/main/json/self-serve-vnf-assignments.json | 112 +++++++++++++++++++ 8 files changed, 338 insertions(+) create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-capacity-release.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-capacity-reserve.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-assign.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-unassign.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-assignments.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-unassignments.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json create mode 100644 platform-logic/restapi-templates/src/main/json/self-serve-vnf-assignments.json (limited to 'platform-logic/restapi-templates') diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-capacity-release.json b/platform-logic/restapi-templates/src/main/json/self-serve-capacity-release.json new file mode 100644 index 00000000..0ecfe102 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-capacity-release.json @@ -0,0 +1,16 @@ +{ + "input": { + "reservation-entity-list": [ + { + "reservation-entity-type": "${sscap.rel-entity-type}", + "reservation-entity-id": "${sscap.rel-entity-id}" + } + ], + "reservation-resource-list": [ + { + "endpoint-position": "${sscap.rel-endpoint-position}" + } + ] + } +} + diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-capacity-reserve.json b/platform-logic/restapi-templates/src/main/json/self-serve-capacity-reserve.json new file mode 100644 index 00000000..65b55c4c --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-capacity-reserve.json @@ -0,0 +1,22 @@ +{ + "input": { + "capacity-reservation-information": { + "service-model": "${sscap.res-service-model}", + "reservation-entity-list": [{ + "reservation-entity-id": "${sscap.res-entityid}", + "reservation-entity-type": "${sscap.res-entity-type}" + } + ], + "reservation-target-list": [{ + "reservation-target-type": "${sscap.res-target-type}", + "reservation-target-id": "${sscap.res-target-id}" + } + ], + "reservation-resource-list": [ + { + "endpoint-position": "${sscap.res-endpoint-position}" + } + ] + } + } + } diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-assign.json b/platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-assign.json new file mode 100644 index 00000000..2419c89b --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-assign.json @@ -0,0 +1,26 @@ +{ + "elements": [ ${repeat:ma.elements.element_length: + [ + { + "name": "policy-instance-name", + "value": ${ma.elements.element[${1}].policy-instance-name} + }, + { + "name": "vnf-host-name", + "value": ${ma.elements.element[${1}].vnf-host-name} + }, + { + "name": "cloud-param-name", + "value": ${ma.elements.element[${1}].cloud-param-name} + }, + { + "name": "sw-name", + "value": ${ma.elements.element[${1}].sw-name} + }, + { + "name": "resource-value", + "value": ${ma.elements.element[${1}].resource-value} + } + ], } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-unassign.json b/platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-unassign.json new file mode 100644 index 00000000..cdf5f905 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-mS-mac-address-unassign.json @@ -0,0 +1,14 @@ +{ + "elements": [ ${repeat:ma.elements.element_length: + [ + { + "name": "vnf-host-name", + "value": ${ma.elements.element[${1}].vnf-host-name} + }, + { + "name": "cloud-param-name", + "value": ${ma.elements.element[${1}].cloud-param-name} + } + ], } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-assignments.json b/platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-assignments.json new file mode 100644 index 00000000..acf5e656 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-assignments.json @@ -0,0 +1,14 @@ +{ + "input": [ + ${repeat:vt.request_length: + { + "policy-instance-name": ${vt.request[${1}].policy-instance-name}, + "vlan-type": ${vt.request[${1}].vlan-type}, + "resource-name": ${vt.request[${1}].resource-name}, + "resource-value": ${vt.request[${1}].resource-value}, + "scope-id": ${vt.request[${1}].scope-id}, + "vlan-tag-key": ${vt.request[${1}].vlan-tag-key} + }, + } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-unassignments.json b/platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-unassignments.json new file mode 100644 index 00000000..aeb6b364 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-mS-vlan-tag-unassignments.json @@ -0,0 +1,11 @@ +{ + "input": [ + ${repeat:vt.request_length: + { + "policy-instance-name": ${vt.request[${1}].policy-instance-name}, + "vlan-type": ${vt.request[${1}].vlan-type}, + "vlan-tag-key": ${vt.request[${1}].vlan-tag-key} + }, + } + ] +} diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json b/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json new file mode 100644 index 00000000..c62d0a3e --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-vfmodule-assignments.json @@ -0,0 +1,123 @@ +{ + "vf-module": [{ + "vf-module-id": ${vf.vf-module-id}, + "vf-module-data": { + "sdnc-request-header": { + "svc-request-id": ${vf.vf-module-data.sdnc-request-header.svc-request-id}, + "svc-action": ${vf.vf-module-data.sdnc-request-header.svc-action}, + "svc-notification-url": ${vf.vf-module-data.sdnc-request-header.svc-notification-url} + }, + "request-information": { + "request-id": ${vf.vf-module-data.request-information.request-id}, + "request-action": ${vf.vf-module-data.request-information.request-action}, + "source": ${vf.vf-module-data.request-information.source}, + "notification-url": ${vf.vf-module-data.request-information.notification-url}, + "order-number": ${vf.vf-module-data.request-information.order-number}, + "order-version": ${vf.vf-module-data.request-information.order-version} + }, + "service-information": { + "service-id": ${vf.vf-module-data.service-information.service-id}, + "subscription-service-type": ${vf.vf-module-data.service-information.subscription-service-type}, + "onap-model-information": { + "model-invariant-uuid": ${vf.vf-module-data.service-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vf-module-data.service-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vf-module-data.service-information.onap-model-information.model-uuid}, + "model-version": ${vf.vf-module-data.service-information.onap-model-information.model-version}, + "model-name": ${vf.vf-module-data.service-information.onap-model-information.model-name} + }, + "service-instance-id": ${vf.vf-module-data.service-information.service-instance-id}, + "global-customer-id": ${vf.vf-module-data.service-information.global-customer-id}, + "subscriber-name": ${vf.vf-module-data.service-information.subscriber-name} + }, + "vnf-information": { + "vnf-id": ${vf.vf-module-data.vnf-information.vnf-id}, + "vnf-type": ${vf.vf-module-data.vnf-information.vnf-type}, + "vnf-name": ${vf.vf-module-data.vnf-information.vnf-name}, + "onap-model-information": { + "model-invariant-uuid": ${vf.vf-module-data.vnf-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vf-module-data.vnf-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vf-module-data.vnf-information.onap-model-information.model-uuid}, + "model-version": ${vf.vf-module-data.vnf-information.onap-model-information.model-version}, + "model-name": ${vf.vf-module-data.vnf-information.onap-model-information.model-name} + } + }, + "vf-module-information": { + "vf-module-id": ${vf.vf-module-data.vf-module-information.vf-module-id}, + "vf-module-type": ${vf.vf-module-data.vf-module-information.vf-module-type}, + "onap-model-information": { + "model-invariant-uuid": ${vf.vf-module-data.vf-module-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vf-module-data.vf-module-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vf-module-data.vf-module-information.onap-model-information.model-uuid}, + "model-version": ${vf.vf-module-data.vf-module-information.onap-model-information.model-version}, + "model-name": ${vf.vf-module-data.vf-module-information.onap-model-information.model-name} + } + }, + "vf-module-request-input": { + "request-version": ${vf.vf-module-data.vf-module-request-input.request-version}, + "vf-module-name": ${vf.vf-module-data.vf-module-request-input.vf-module-name}, + "tenant": ${vf.vf-module-data.vf-module-request-input.tenant}, + "aic-cloud-region": ${vf.vf-module-data.vf-module-request-input.aic-cloud-region}, + "aic-clli": ${vf.vf-module-data.vf-module-request-input.aic-clli}, + "vf-module-input-parameters": { + "param": [ + ${repeat:vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length: + { + "name": ${vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[${1}].name}, + "value": ${vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[${1}].value} + }, + } + ] + } + }, + "vf-module-topology": { + "vf-module-topology-identifier": { + "vf-module-id": ${vf.vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id}, + "vf-module-name": ${vf.vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-name}, + "vf-module-type": ${vf.vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-type} + }, + "onap-model-information": { + "model-invariant-uuid": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-uuid}, + "model-version": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-version}, + "model-name": ${vf.vf-module-data.vf-module-topology.onap-model-information.model-name} + }, + "vf-module-parameters": { + "param": [ + ${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param_length: + { + "name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].name}, + "value": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].value}, + "resource-resolution-data": { + "resource-key": [ + ${repeat:vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key_length: + { + "name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key[${2}].name}, + "value": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.resource-key[${2}].value} + }, + } + ], + "status": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.status}, + "capability-name": ${vf.vf-module-data.vf-module-topology.vf-module-parameters.param[${1}].resource-resolution-data.capability-name} + }, + }, + } + ] + }, + "tenant": ${vf.vf-module-data.vf-module-topology.tenant}, + "aic-cloud-region": ${vf.vf-module-data.vf-module-topology.aic-cloud-region}, + "aic-clli": ${vf.vf-module-data.vf-module-topology.aic-clli}, + "sdnc-generated-cloud-resources": ${vf.vf-module-data.vf-module-topology.sdnc-generated-cloud-resources} + }, + "vf-module-level-oper-status": { + "order-status": ${vf.vf-module-data.vf-module-level-oper-status.order-status}, + "last-rpc-action": ${vf.vf-module-data.vf-module-level-oper-status.last-rpc-action}, + "last-action": ${vf.vf-module-data.vf-module-level-oper-status.last-action}, + "last-svc-request-id": ${vf.vf-module-data.vf-module-level-oper-status.last-svc-request-id}, + "last-order-status": ${vf.vf-module-data.vf-module-level-oper-status.last-order-status}, + "create-timestamp": ${vf.vf-module-data.vf-module-level-oper-status.create-timestamp}, + "modify-timestamp": ${vf.vf-module-data.vf-module-level-oper-status.modify-timestamp} + } + } + }] +} diff --git a/platform-logic/restapi-templates/src/main/json/self-serve-vnf-assignments.json b/platform-logic/restapi-templates/src/main/json/self-serve-vnf-assignments.json new file mode 100644 index 00000000..666e9189 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/self-serve-vnf-assignments.json @@ -0,0 +1,112 @@ +{ + "vnf": [{ + "vnf-id": ${vf.vnf-id}, + "vnf-data": { + "sdnc-request-header": { + "svc-request-id": ${vf.vnf-data.sdnc-request-header.svc-request-id}, + "svc-action": ${vf.vnf-data.sdnc-request-header.svc-action}, + "svc-notification-url": ${vf.vnf-data.sdnc-request-header.svc-notification-url} + }, + "request-information": { + "request-id": ${vf.vnf-data.request-information.request-id}, + "request-action": ${vf.vnf-data.request-information.request-action}, + "source": ${vf.vnf-data.request-information.source}, + "notification-url": ${vf.vnf-data.request-information.notification-url}, + "order-number": ${vf.vnf-data.request-information.order-number}, + "order-version": ${vf.vnf-data.request-information.order-version} + }, + "service-information": { + "service-id": ${vf.vnf-data.service-information.service-id}, + "subscription-service-type": ${vf.vnf-data.service-information.subscription-service-type}, + "onap-model-information": { + "model-invariant-uuid": ${vf.vnf-data.service-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vnf-data.service-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vnf-data.service-information.onap-model-information.model-uuid}, + "model-version": ${vf.vnf-data.service-information.onap-model-information.model-version}, + "model-name": ${vf.vnf-data.service-information.onap-model-information.model-name} + }, + "service-instance-id": ${vf.vnf-data.service-information.service-instance-id}, + "global-customer-id": ${vf.vnf-data.service-information.global-customer-id}, + "subscriber-name": ${vf.vnf-data.service-information.subscriber-name} + }, + "vnf-information": { + "vnf-id": ${vf.vnf-data.vnf-information.vnf-id}, + "vnf-type": ${vf.vnf-data.vnf-information.vnf-type}, + "vnf-name": ${vf.vnf-data.vnf-information.vnf-name}, + "onap-model-information": { + "model-invariant-uuid": ${vf.vnf-data.vnf-information.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vnf-data.vnf-information.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vnf-data.vnf-information.onap-model-information.model-uuid}, + "model-version": ${vf.vnf-data.vnf-information.onap-model-information.model-version}, + "model-name": ${vf.vnf-data.vnf-information.onap-model-information.model-name} + } + }, + "vnf-request-input": { + "request-version": ${vf.vnf-data.vnf-request-input.request-version}, + "vnf-name": ${vf.vnf-data.vnf-request-input.vnf-name}, + "tenant": ${vf.vnf-data.vnf-request-input.tenant}, + "aic-cloud-region": ${vf.vnf-data.vnf-request-input.aic-cloud-region}, + "aic-clli": ${vf.vnf-data.vnf-request-input.aic-clli}, + "vnf-input-parameters": { + "param": [ + ${repeat:vf.vnf-data.vnf-request-input.vnf-input-parameters.param_length: + { + "name": ${vf.vnf-data.vnf-request-input.vnf-input-parameters.param[${1}].name}, + "value": ${vf.vnf-data.vnf-request-input.vnf-input-parameters.param[${1}].value} + }, + } + ] + } + }, + "vnf-topology": { + "vnf-topology-identifier-structure": { + "vnf-id": ${vf.vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id}, + "vnf-name": ${vf.vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name}, + "vnf-type": ${vf.vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type} + }, + "onap-model-information": { + "model-invariant-uuid": ${vf.vnf-data.vnf-topology.onap-model-information.model-invariant-uuid}, + "model-customization-uuid": ${vf.vnf-data.vnf-topology.onap-model-information.model-customization-uuid}, + "model-uuid": ${vf.vnf-data.vnf-topology.onap-model-information.model-uuid}, + "model-version": ${vf.vnf-data.vnf-topology.onap-model-information.model-version}, + "model-name": ${vf.vnf-data.vnf-topology.onap-model-information.model-name} + }, + "vnf-parameters-data": { + "param": [ + ${repeat:vf.vnf-data.vnf-topology.vnf-parameters-data.param_length: + { + "name": ${vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].name}, + "value": ${vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].value}, + "resource-resolution-data": { + "resource-key": [ + ${repeat:vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].resource-resolution-data.resource-key_length: + { + "name": ${vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].resource-resolution-data.resource-key[${2}].name}, + "value": ${vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].resource-resolution-data.resource-key[${2}].value} + }, + } + ], + "status": ${vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].resource-resolution-data.status}, + "capability-name": ${vf.vnf-data.vnf-topology.vnf-parameters-data.param[${1}].resource-resolution-data.capability-name} + }, + }, + } + ] + }, + "tenant": ${vf.vnf-data.vnf-topology.tenant}, + "aic-cloud-region": ${vf.vnf-data.vnf-topology.aic-cloud-region}, + "aic-clli": ${vf.vnf-data.vnf-topology.aic-clli} + "sdnc-generated-cloud-resources": ${vf.vnf-data.vnf-topology.sdnc-generated-cloud-resources} + }, + "vnf-level-oper-status": { + "order-status": ${vf.vnf-data.vnf-level-oper-status.order-status}, + "last-rpc-action": ${vf.vnf-data.vnf-level-oper-status.last-rpc-action}, + "last-action": ${vf.vnf-data.vnf-level-oper-status.last-action}, + "last-svc-request-id": ${vf.vnf-data.vnf-level-oper-status.last-svc-request-id}, + "last-order-status": ${vf.vnf-data.vnf-level-oper-status.last-order-status}, + "create-timestamp": ${vf.vnf-data.vnf-level-oper-status.create-timestamp}, + "modify-timestamp": ${vf.vnf-data.vnf-level-oper-status.modify-timestamp} + } + } + }] +} -- cgit 1.2.3-korg