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 --- .../aai/getCloudRegionAndTenantByVnfId.json | 119 +++++++++++++++++++++ ...orchestrationRequestsMockedMinimalResponse.json | 11 ++ .../mso/orchestrationRequestsServiceInstance.json | 19 ++++ .../responses/mso/orchestrationRequestsVnf.json | 68 ++++++++++++ 4 files changed, 217 insertions(+) create mode 100644 vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json create mode 100644 vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json create mode 100644 vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json create mode 100644 vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json (limited to 'vid-app-common/src/test/resources/responses') diff --git a/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json b/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json new file mode 100644 index 000000000..690be607b --- /dev/null +++ b/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json @@ -0,0 +1,119 @@ +{ + "results": [ + { + "id": "363687968", + "node-type": "generic-vnf", + "url": "/aai/v14/network/generic-vnfs/generic-vnf/4ac51f60-ae58-49c0-a308-f0c2dd0261cf", + "properties": { + "vnf-id": "4ac51f60-ae58-49c0-a308-f0c2dd0261cf", + "vnf-name": "zmtn23bmogx05_oam_01_rk", + "vnf-type": "vMOG_SVC_UPDATED_FLAV_OAM/vMOG_VSP_UPDATED_FLAV 0", + "service-id": "db171b8f-115c-4992-a2e3-ee04cae357e0", + "prov-status": "NVTPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1522780608709", + "model-invariant-id": "5108d7e4-f32a-44cd-8835-433a70915b8c", + "model-version-id": "bae37933-b694-4b4e-a734-db63416f9cfe", + "model-customization-id": "732305c6-d36a-47ee-a701-6f28f87b90cd", + "nf-type": "POLICY", + "nf-function": "Mobility Orchestration Gateway (MOG)", + "nf-role": "vMOG", + "nf-naming-code": "" + }, + "related-to": [ + { + "id": "193753168", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "node-type": "service-instance", + "url": "/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/7f10ffe2-548f-4168-8722-b782d05675b7" + } + ] + }, + { + "id": "264798392", + "node-type": "vserver", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84", + "properties": { + "vserver-id": "088c2bf0-80e2-4bdf-93ae-b2469fbeba84", + "vserver-name": "zrdm3mogx01oam001", + "vserver-name2": "zrdm3mogx01oam001", + "vserver-selflink": "https://compute-aic.mtn23b.cci.att.com:8774/v2/3e9a20a3e89e45f884e09df0cc2d2d2a/servers/088c2bf0-80e2-4bdf-93ae-b2469fbeba84", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1522719699848" + }, + "related-to": [ + { + "id": "211808464", + "relationship-label": "tosca.relationships.AttachesTo", + "node-type": "volume", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84/volumes/volume/28e1246e-2aeb-4a59-bb51-f20fb8e93c42" + } + ] + }, + { + "id": "67158224", + "node-type": "pserver", + "url": "/aai/v14/cloud-infrastructure/pservers/pserver/mtn23br21c009.mtn23b.cci.att.com", + "properties": { + "hostname": "mtn23br21c009.mtn23b.cci.att.com", + "pserver-id": "auto-generated-skeleton", + "in-maint": false, + "resource-version": "1538596103767" + }, + "related-to": [ + { + "id": "743800864", + "relationship-label": "org.onap.relationships.inventory.LocatedIn", + "node-type": "complex", + "url": "/aai/v14/cloud-infrastructure/complexes/complex/MDTWNJ21" + } + ] + }, + { + "id": "8757432", + "node-type": "tenant", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a", + "properties": { + "tenant-id": "3e9a20a3e89e45f884e09df0cc2d2d2a", + "tenant-name": "APPC-24595-T-IST-02C", + "resource-version": "1539855222745" + }, + "related-to": [ + { + "id": "760360992", + "relationship-label": "org.onap.relationships.inventory.Uses", + "node-type": "l3-network", + "url": "/aai/v14/network/l3-networks/l3-network/1fea0624-dac2-4997-904d-34ca1bc12fa9" + } + ] + }, + { + "id": "302227536", + "node-type": "cloud-region", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b", + "properties": { + "cloud-owner": "att-aic", + "cloud-region-id": "mtn23b", + "cloud-type": "openstack", + "owner-defined-type": "lcp", + "cloud-region-version": "3.0", + "identity-url": "https://identity-aic.mtn23b.cci.att.com:5000/v2.0", + "cloud-zone": "z1", + "complex-name": "c1", + "sriov-automation": "false", + "resource-version": "1539855222969" + }, + "related-to": [ + { + "id": "2744328", + "relationship-label": "org.onap.relationships.inventory.BelongsTo", + "node-type": "tenant", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/5452d6bd0cb34e99a3553d349456c642" + } + ] + } + ] +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json new file mode 100644 index 000000000..9af4b2aeb --- /dev/null +++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json @@ -0,0 +1,11 @@ +{ + "request": { + "requestId": "d8bbd676-4067-431f-9a5d-9843f5c199cf", + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "Vnf has been created successfully.", + "percentProgress": 100, + "finishTime": "Mon, 11 Jun 2018 12:38:56 GMT" + } + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json new file mode 100644 index 000000000..640fb2b56 --- /dev/null +++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json @@ -0,0 +1,19 @@ +{ + "request": { + "requestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c", + "startTime": "Mon, 11 Dec 2017 07:27:49 GMT", + "requestScope": "service", + "requestType": "createInstance", + "instanceReferences": { + "serviceInstanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "serviceInstanceName": "asdfasdf234234asdf", + "requestorId": "il883e" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "Service Instance was created successfully.", + "percentProgress": 100, + "finishTime": "Mon, 11 Dec 2017 07:27:53 GMT" + } + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json new file mode 100644 index 000000000..f83310427 --- /dev/null +++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json @@ -0,0 +1,68 @@ +{ + "request": { + "requestId": "d8bbd676-4067-431f-9a5d-9843f5c199cf", + "startTime": "Mon, 11 Jun 2018 12:38:50 GMT", + "requestScope": "vnf", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "2016-233_XSP_bfsa_nin2 0", + "modelInvariantId": "74dc0354-a178-43ee-91f2-ec1f288cd50d", + "modelType": "vnf", + "modelName": "2016-233_XSP_bfsa_nin2", + "modelVersion": "1.0", + "modelCustomizationUuid": "fc1add68-90c4-4ed1-ac92-b8df3087fb01", + "modelVersionId": "327138f7-0608-4774-bb2c-959332a18399", + "modelCustomizationId": "fc1add68-90c4-4ed1-ac92-b8df3087fb01", + "modelUuid": "327138f7-0608-4774-bb2c-959332a18399", + "modelInvariantUuid": "74dc0354-a178-43ee-91f2-ec1f288cd50d", + "modelInstanceName": "2016-233_XSP_bfsa_nin2 0" + }, + "requestInfo": { + "productFamilyId": "vHNPaas", + "source": "VID", + "instanceName": "VNF_TestaLaCarte", + "suppressRollback": false, + "requestorId": "lz230u" + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "dc7f4414-97ab-4055-8267-9f2dfb10f0a8", + "modelInfo": { + "modelInvariantId": "11256e47-66c8-4749-a30c-15fdcd1cc014", + "modelType": "service", + "modelName": "Dror_service1806_a_la_carte_NW", + "modelVersion": "1.0", + "modelVersionId": "88ad0fe5-56d5-4435-aaee-da5c707878df", + "modelUuid": "88ad0fe5-56d5-4435-aaee-da5c707878df", + "modelInvariantUuid": "11256e47-66c8-4749-a30c-15fdcd1cc014" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "19dfa99ba1cc4948bb868eba9e0de7ab", + "cloudOwner": "att-aic", + "lcpCloudRegionId": "test1" + }, + "requestParameters": { + "testApi": "VNF_API" + }, + "platform": { + "platformName": "RADIO-WIRELESSENGINEERING" + } + }, + "instanceReferences": { + "serviceInstanceId": "dc7f4414-97ab-4055-8267-9f2dfb10f0a8", + "vnfInstanceId": "cfeabd66-f9ac-4204-9732-157b091fe4f8", + "vnfInstanceName": "VNF_TestaLaCarte", + "requestorId": "lz230u" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "Vnf has been created successfully.", + "percentProgress": 100, + "finishTime": "Mon, 11 Jun 2018 12:38:56 GMT" + } + } +} \ No newline at end of file -- cgit 1.2.3-korg