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>

1 files changed, 8 insertions, 10 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/OperationalEnvironmentTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/OperationalEnvironmentTest.java
index c2ccec008..3d649bb69 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/OperationalEnvironmentTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/OperationalEnvironmentTest.java
@@ -2,8 +2,6 @@ package org.onap.vid.aai;
 
 import org.junit.Test;
 import org.onap.vid.aai.model.RelationshipList;
-import java.util.*;
-import org.junit.Assert;
 
 public class OperationalEnvironmentTest {
 
@@ -28,7 +26,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setOperationalEnvironmentId(operationalEnvironmentId);
+        testSubject.setJsonOperationalEnvironmentId(operationalEnvironmentId);
     }
 
     @Test
@@ -48,7 +46,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setOperationalEnvironmentName(operationalEnvironmentName);
+        testSubject.setJsonOperationalEnvironmentName(operationalEnvironmentName);
     }
 
     @Test
@@ -68,7 +66,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setOperationalEnvironmentType(operationalEnvironmentType);
+        testSubject.setJsonOperationalEnvironmentType(operationalEnvironmentType);
     }
 
     @Test
@@ -88,7 +86,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setOperationalEnvironmentStatus(operationalEnvironmentStatus);
+        testSubject.setJsonOperationalEnvironmentStatus(operationalEnvironmentStatus);
     }
 
     @Test
@@ -108,7 +106,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setTenantContext(tenantContext);
+        testSubject.setJsonTenantContext(tenantContext);
     }
 
     @Test
@@ -128,7 +126,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setWorkloadContext(workloadContext);
+        testSubject.setJsonWorkloadContext(workloadContext);
     }
 
     @Test
@@ -148,7 +146,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setResourceVersion(resourceVersion);
+        testSubject.setJsonResourceVersion(resourceVersion);
     }
 
     @Test
@@ -168,7 +166,7 @@ public class OperationalEnvironmentTest {
 
         // default test
         testSubject = createTestSubject();
-        testSubject.setRelationshipList(relationshipList);
+        testSubject.setJsonRelationshipList(relationshipList);
     }
 
     @Test