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 --- .../src/main/java/org/onap/vid/aai/model/ResourceType.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java index 736a1aa9e..79f5272cb 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java @@ -10,10 +10,12 @@ import java.util.stream.Stream; public enum ResourceType { - SERVICE_INSTANCE("service-instance", "service-instance-name"), - GENERIC_VNF("generic-vnf", "vnf-name"), - VF_MODULE("vf-module", "vf-module-name"), - VOLUME_GROUP("volume-group", "volume-group-name"); + SERVICE_INSTANCE("service-instances", "service-instance-name"), + GENERIC_VNF("generic-vnfs", "vnf-name"), + L3_NETWORK("l3-networks", "network-name"), + VF_MODULE("vf-modules", "vf-module-name"), + INSTANCE_GROUP("instance-groups", "instance-group-name"), + VOLUME_GROUP("volume-groups", "volume-group-name"); private static Map AAI_FORMAT_MAP = Stream .of(ResourceType.values()) -- cgit 1.2.3-korg