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>
diff --git a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
index 993cfb2..4508599 100644
--- a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
+++ b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
@@ -28,7 +28,8 @@
"collector_node": "pprobeservice_proxy 5",
"policy_name": "policy2",
"equip_vendor": "Cisco",
- "equip_model": "Nexus 3048-TP"
+ "equip_model": "Nexus 3048-TP",
+ "ecomp_generated_naming": "false"
},
"type": "Configuration",
"modelCustomizationName": "Port Mirroring Configuration By Policy 1",
@@ -54,7 +55,8 @@
"collector_node": "pprobeservice_proxy 4",
"policy_name": "policy1",
"equip_vendor": "Cisco",
- "equip_model": "Nexus 3048-TP"
+ "equip_model": "Nexus 3048-TP",
+ "ecomp_generated_naming": "false"
},
"type": "Configuration",
"modelCustomizationName": "Port Mirroring Configuration By Policy 0",
@@ -162,5 +164,6 @@
},
"vfModules": {},
"volumeGroups": {},
- "pnfs": {}
+ "pnfs": {},
+ "vnfGroups": {}
}
\ No newline at end of file