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, 5 insertions, 11 deletions

diff --git a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
index ddbebac95..d46db77fd 100644
--- a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
+++ b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
@@ -9,8 +9,7 @@
             "modelInvariantId": "c9817f08-07b2-458b-a02f-cd5407ee7a7b",
             "modelVersionId": "0e0bb964-e687-4439-9a9e-de9cd1ff5367",
             "modelName": "ws-service",
-            "modelVersion": "1.0",
-            "additionalProperties": {}
+            "modelVersion": "1.0"
           }
         }
       },
@@ -24,16 +23,14 @@
             "modelName": "ws-sp",
             "modelVersion": "1.0",
             "modelCustomizationName": "ws-sp 0",
-            "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986",
-            "additionalProperties": {}
+            "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986"
           }
         }
       }
     ],
     "cloudConfiguration": {
       "lcpCloudRegionId": "RegionOne",
-      "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e",
-      "additionalProperties": {}
+      "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e"
     },
     "modelInfo": {
       "modelCustomizationName": "WsSp..base_ws..module-0",
@@ -43,18 +40,15 @@
       "modelName": "WsSp..base_ws..module-0",
       "modelNameVersionId": null,
       "modelType": "vfModule",
-      "modelVersion": "1",
-      "additionalProperties": {}
+      "modelVersion": "1"
     },
     "requestInfo": {
       "instanceName": "ws-test-0310-8_NaN",
       "source": "VID",
       "suppressRollback": false,
-      "requestorId": "demo",
-      "additionalProperties": {}
+      "requestorId": "demo"
     },
     "requestParameters": {
-      "additionalProperties": {}
     },
     "configurationParameters": [
       {