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 --- vid-automation/conf/services | 2 +- vid-automation/conf/users | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vid-automation/conf') diff --git a/vid-automation/conf/services b/vid-automation/conf/services index c67a36626..85e0552f6 100644 --- a/vid-automation/conf/services +++ b/vid-automation/conf/services @@ -43,7 +43,7 @@ "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { "type" : "pnf", "uuid": "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "invariantUuid": "cdb90b57-ed78-4d44-a5b4-7f43a02ec632", "name": "action-data", "version": "1.0", "category": "Network L1-3", diff --git a/vid-automation/conf/users b/vid-automation/conf/users index e6d3c6ac3..e2bc05a85 100644 --- a/vid-automation/conf/users +++ b/vid-automation/conf/users @@ -13,9 +13,9 @@ "userId": "1", "password": "1" }, - "roles": ["USP VOICE___VIRTUAL USP", "MSO_1610_ST___MSO-dev-service-type", "MSO_1610_ST___VIRTUAL USP"], + "roles": ["USP VOICE___VIRTUAL USP", "USP VOICE___HOSTED COMMUNICATIONS", "MSO_1610_ST___HOSTED COMMUNICATIONS", "MSO_1610_ST___MSO-dev-service-type", "MSO_1610_ST___VIRTUAL USP"], "subscriberNames": ["USP VOICE", "MSO_1610_ST"], - "serviceTypes": ["VIRTUAL USP", "MSO-dev-service-type"], + "serviceTypes": ["VIRTUAL USP", "HOSTED COMMUNICATIONS", "MSO-dev-service-type"], "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"] }, "mobilityMobility": { -- cgit 1.2.3-korg