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>
---
 .../src/main/resources/json/mso/modelInfo          | 42 ----------------------
 1 file changed, 42 deletions(-)
 delete mode 100755 vid-app-common/src/main/resources/json/mso/modelInfo

(limited to 'vid-app-common/src/main/resources/json/mso/modelInfo')

diff --git a/vid-app-common/src/main/resources/json/mso/modelInfo b/vid-app-common/src/main/resources/json/mso/modelInfo
deleted file mode 100755
index 56d268ce9..000000000
--- a/vid-app-common/src/main/resources/json/mso/modelInfo
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"description": "fields describing the SDC entity being operated on by the request",
-	"type": "object",
-	"properties": {
-		"modelCustomizationName": {
-			"description": "reference to the customized set of parameters associated with a model in a given service context",
-			"type": "string"
-		},
-		"modelCustomizationId": {
-			"description": "reference to the customized set of parameters associated with a model in a given service context",
-			"type": "string"
-		},
-		"modelInvariantId": {
-			"description": "Invariant UUID for the model name, irrespective of the version, as defined in SDC--authoritative",
-			"type": "string",
-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-		},
-        "modelVersionId": {
-                "description": "Version id for version",
-                "type": "string"
-            },
-		"modelName": {
-			"description": "name of the model as defined in SDC--not authoritative",
-			"type": "string"
-		},
-		"modelNameVersionId": {
-			"description": "UUID for the model name and version combination as defined in SDC--authoritative",
-			"type": "string",
-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
-		},
-		"modelType": {
-			"description": "short description of the entity being operated on",
-			"type": "string"
-		},
-		"modelVersion": {
-			"description": "the version of the model as defined in SDC--not authoritative",
-			"type": "string"
-		}
-	},
-	"required": ["modelType"]
-}
\ No newline at end of file
-- 
cgit 1.2.3-korg