From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../orchestrationRequestsByServiceInstanceId.json | 200 +++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json (limited to 'vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json') diff --git a/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json b/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json new file mode 100644 index 000000000..34f18f7fb --- /dev/null +++ b/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json @@ -0,0 +1,200 @@ +{ + "requestList": [{ + "request": { + "requestId": "7f584c2c-2365-4f63-8088-592a13167621", + "startTime": "Mon, 05 Nov 2018 09:22:23 GMT", + "requestScope": "service", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelInvariantId": "1469946d-d566-467e-867b-88b29f6cb6c7", + "modelType": "service", + "modelName": "FCGI_5G_NC", + "modelVersion": "1.0", + "modelVersionId": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1", + "modelUuid": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1", + "modelInvariantUuid": "1469946d-d566-467e-867b-88b29f6cb6c7" + }, + "requestInfo": { + "source": "VID", + "instanceName": "dsfsdfsdfsdf", + "suppressRollback": false, + "requestorId": "us16807000" + }, + "subscriberInfo": { + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89" + }, + "requestParameters": { + "subscriptionServiceType": "VIRTUAL USP", + "aLaCarte": true, + "testApi": "VNF_API" + }, + "project": { + "projectName": "DFW" + }, + "owningEntity": { + "owningEntityId": "3f592a6f-459b-435e-b0d4-59959ab1d385", + "owningEntityName": "own1" + } + }, + "instanceReferences": { + "serviceInstanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb", + "serviceInstanceName": "dsfsdfsdfsdf", + "requestorId": "us16807000" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "STATUS: Service Instance was created successfully.", + "percentProgress": 100, + "finishTime": "Mon, 05 Nov 2018 09:22:35 GMT" + } + } + }, { + "request": { + "requestId": "4222a819-f137-4bf1-b352-a27e53344f46", + "startTime": "Mon, 05 Nov 2018 09:22:41 GMT", + "requestScope": "vnf", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "FCGI 0", + "modelInvariantId": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c", + "modelType": "vnf", + "modelName": "FCGI", + "modelVersion": "1.0", + "modelCustomizationUuid": "de9b7aea-9727-4a7c-8e72-292263fb61a9", + "modelVersionId": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2", + "modelCustomizationId": "de9b7aea-9727-4a7c-8e72-292263fb61a9", + "modelUuid": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2", + "modelInvariantUuid": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c", + "modelInstanceName": "FCGI 0" + }, + "requestInfo": { + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "source": "VID", + "instanceName": "FCGI", + "suppressRollback": false, + "requestorId": "us16807000" + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb", + "modelInfo": { + "modelInvariantId": "1469946d-d566-467e-867b-88b29f6cb6c7", + "modelType": "service", + "modelName": "FCGI_5G_NC", + "modelVersion": "1.0", + "modelVersionId": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1", + "modelUuid": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1", + "modelInvariantUuid": "1469946d-d566-467e-867b-88b29f6cb6c7" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "460f35aeb53542dc9f77105066483e83", + "cloudOwner": "att-aic", + "lcpCloudRegionId": "rdm5b" + }, + "requestParameters": {}, + "platform": { + "platformName": "plat1" + }, + "lineOfBusiness": { + "lineOfBusinessName": "ECOMP" + } + }, + "instanceReferences": { + "serviceInstanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb", + "vnfInstanceId": "2f668980-7dbc-4231-a67c-8b69cd266b3a", + "vnfInstanceName": "FCGI", + "requestorId": "us16807000" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "STATUS: Vnf has been created successfully.", + "percentProgress": 100, + "finishTime": "Mon, 05 Nov 2018 09:22:45 GMT" + } + } + }, { + "request": { + "requestId": "6d7a4f7f-6502-4f63-b00a-de5bf33e64dd", + "startTime": "Mon, 05 Nov 2018 09:22:49 GMT", + "requestScope": "vfModule", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "Fcgi..base_cgi..module-0", + "modelInvariantId": "eede8ca2-bbeb-441a-a42e-4a3ecc8449a1", + "modelType": "vfModule", + "modelName": "Fcgi..base_cgi..module-0", + "modelVersion": "1", + "modelCustomizationUuid": "acf03fbb-eee4-4f86-9e99-249841f3e9cb", + "modelVersionId": "38bcccc5-5902-4831-bf6d-5cd197ec6ad6", + "modelCustomizationId": "acf03fbb-eee4-4f86-9e99-249841f3e9cb", + "modelUuid": "38bcccc5-5902-4831-bf6d-5cd197ec6ad6", + "modelInvariantUuid": "eede8ca2-bbeb-441a-a42e-4a3ecc8449a1", + "modelInstanceName": "Fcgi..base_cgi..module-0" + }, + "requestInfo": { + "source": "VID", + "instanceName": "murkav", + "suppressRollback": true, + "requestorId": "us16807000" + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb", + "modelInfo": { + "modelInvariantId": "1469946d-d566-467e-867b-88b29f6cb6c7", + "modelType": "service", + "modelName": "FCGI_5G_NC", + "modelVersion": "1.0", + "modelVersionId": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1", + "modelUuid": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1", + "modelInvariantUuid": "1469946d-d566-467e-867b-88b29f6cb6c7" + } + } + }, { + "relatedInstance": { + "instanceId": "2f668980-7dbc-4231-a67c-8b69cd266b3a", + "modelInfo": { + "modelCustomizationName": "FCGI 0", + "modelInvariantId": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c", + "modelType": "vnf", + "modelName": "FCGI", + "modelVersion": "1.0", + "modelCustomizationUuid": "de9b7aea-9727-4a7c-8e72-292263fb61a9", + "modelVersionId": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2", + "modelCustomizationId": "de9b7aea-9727-4a7c-8e72-292263fb61a9", + "modelUuid": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2", + "modelInvariantUuid": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c", + "modelInstanceName": "FCGI 0" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "460f35aeb53542dc9f77105066483e83", + "cloudOwner": "att-aic", + "lcpCloudRegionId": "rdm5b" + }, + "requestParameters": { + "usePreload": false + } + }, + "instanceReferences": { + "serviceInstanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb", + "vnfInstanceId": "2f668980-7dbc-4231-a67c-8b69cd266b3a", + "vfModuleInstanceId": "227dae7e-622d-4841-b664-9bbade0ac0c8", + "vfModuleInstanceName": "murkav", + "requestorId": "us16807000" + }, + "requestStatus": { + "requestState": "IN_PROGRESS" + } + } + } + ] +} -- cgit 1.2.3-korg