From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
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 <ittay.stern@att.com>
---
 .../java/org/onap/vid/aai/AaiClientInterface.java  | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java
index 901591a8c..bf97e5992 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java
@@ -1,24 +1,29 @@
 package org.onap.vid.aai;
 
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.onap.vid.aai.model.AaiGetOperationalEnvironments.OperationalEnvironmentList;
 import org.onap.vid.aai.model.AaiGetPnfs.Pnf;
 import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
-import org.onap.vid.aai.model.AaiNodeQueryResponse;
+import org.onap.vid.aai.model.CustomQuerySimpleResult;
 import org.onap.vid.aai.model.PortDetailsTranslator;
+import org.onap.vid.aai.model.Properties;
 import org.onap.vid.aai.model.ResourceType;
 import org.onap.vid.model.SubscriberList;
 import org.onap.vid.model.probes.ExternalComponentStatus;
 
 import javax.ws.rs.core.Response;
+import java.net.URI;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Oren on 7/4/17.
  */
 public interface AaiClientInterface {
 
-    AaiResponse<AaiNodeQueryResponse> searchNodeTypeByName(String name, ResourceType type);
+    boolean isNodeTypeExistsByName(String name, ResourceType type);
+
+    <T> T typedAaiGet(URI path, Class<T> clz);
 
     AaiResponse<SubscriberList> getAllSubscribers();
 
@@ -34,15 +39,11 @@ public interface AaiClientInterface {
 
     AaiResponse getAllAicZones();
 
-    AaiResponse getAicZoneForPnf(String globalCustomerId , String serviceType , String serviceId);
-
-	AaiResponse getVNFData();
-
     AaiResponse getNetworkCollectionDetails(String serviceInstanceId);
 
     AaiResponse getInstanceGroupsByCloudRegion(String cloudOwner, String cloudRegionId, String networkFunction);
 
-    Response getVNFData(String globalSubscriberId, String serviceType);
+    AaiResponse getVNFData(String globalSubscriberId, String serviceType);
 
     AaiResponse getVNFData(String globalSubscriberId, String serviceType, String serviceInstanceId);
 
@@ -69,4 +70,14 @@ public interface AaiClientInterface {
     AaiResponse getInstanceGroupsByVnfInstanceId(String vnfInstanceId);
 
     ExternalComponentStatus probeAaiGetAllSubscribers();
+
+    Response doAaiGet(String uri, boolean xml);
+
+    String getCloudOwnerByCloudRegionId(String cloudRegionId);
+
+    GetTenantsResponse getHomingDataByVfModule(String vnfInstanceId, String vfModuleId);
+
+    void resetCache(String cacheName);
+
+    Map<String, Properties> getCloudRegionAndTenantByVnfId(String vnfId);
 }
-- 
cgit 1.2.3-korg