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>
---
 .../resources/fabric-real-sriov-configuration.json | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 vid-app-common/src/test/resources/fabric-real-sriov-configuration.json

(limited to 'vid-app-common/src/test/resources/fabric-real-sriov-configuration.json')

diff --git a/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json b/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json
new file mode 100644
index 000000000..d6efc2854
--- /dev/null
+++ b/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json
@@ -0,0 +1,51 @@
+{
+  "service": {
+    "uuid": "253f1467-fe68-4e80-ba71-308000caec31",
+    "invariantUuid": "c15fe228-7d40-4f99-afa7-10abeedf9aac",
+    "name": "SRIOV-SERVICE",
+    "version": "1.0",
+    "toscaModelURL": null,
+    "category": "Network L1-3",
+    "serviceType": "ST",
+    "serviceRole": "SR",
+    "description": "SRIOV-SERVICE",
+    "serviceEcompNaming": "true",
+    "instantiationType": "Macro",
+    "inputs": {
+
+    }
+  },
+  "vnfs": {
+
+  },
+  "networks": {
+
+  },
+  "collectionResource": {},
+  "configurations": {
+
+  },
+  "fabricConfigurations": {
+    "Fabric Configuration 0": {
+      "invariantUuid" : "2ccb488d-a119-4909-8ca5-5ecefe0ec299",
+      "uuid": "c496746f-054e-4234-88b9-aca4ebb7cbd2",
+      "customizationUuid": "9426b949-dc13-4dfe-baa0-931f42dc0e71",
+      "version": "2.0",
+      "name": "Fabric Configuration",
+      "description": "A fabric Configuration object",
+      "type": "Configuration"
+    }
+  },
+  "serviceProxies": {
+
+  },
+  "vfModules": {
+
+  },
+  "volumeGroups": {
+
+  },
+  "pnfs": {
+
+  }
+}
\ No newline at end of file
-- 
cgit 1.2.3-korg