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>
---
 vid-app-common/src/test/resources/vf-csar.JSON | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'vid-app-common/src/test/resources/vf-csar.JSON')

diff --git a/vid-app-common/src/test/resources/vf-csar.JSON b/vid-app-common/src/test/resources/vf-csar.JSON
index 48c3f7dd7..c1b71b34f 100644
--- a/vid-app-common/src/test/resources/vf-csar.JSON
+++ b/vid-app-common/src/test/resources/vf-csar.JSON
@@ -100,7 +100,8 @@
         "itc_name_0": "get_input:greatdefect0_itc_name_0",
         "itm_flavor_name": "nv.c2r4d50",
         "itm_image_name": "NIMBUS_IXLA-ITM_8.20.EA_KVM.qcow2",
-        "vf_module_id": "get_input:greatdefect0_vf_module_id"
+        "vf_module_id": "get_input:greatdefect0_vf_module_id",
+        "ecomp_generated_naming": "false"
       },
       "type": "VF",
       "modelCustomizationName": "greatdefect 0",
@@ -117,7 +118,8 @@
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": null
+            "vfModuleLabel": null,
+            "baseModule" : false
           },
           "inputs": {
 
@@ -136,7 +138,8 @@
             "minCountInstances": 1,
             "maxCountInstances": 1,
             "initialCount": 1,
-            "vfModuleLabel": null
+            "vfModuleLabel": null,
+            "baseModule" : true
           },
           "inputs": {
 
@@ -174,5 +177,6 @@
   },
   "pnfs": {
 
-  }
+  },
+  "vnfGroups": {}
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg