diff options
author | Ittay Stern <ittay.stern@att.com> | 2018-12-31 17:21:27 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-01-09 20:19:55 +0200 |
commit | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch) | |
tree | 3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/main/resources/json | |
parent | 5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff) |
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>
Diffstat (limited to 'vid-app-common/src/main/resources/json')
14 files changed, 0 insertions, 350 deletions
diff --git a/vid-app-common/src/main/resources/json/mso/cloudConfiguration b/vid-app-common/src/main/resources/json/mso/cloudConfiguration deleted file mode 100755 index eb627798f..000000000 --- a/vid-app-common/src/main/resources/json/mso/cloudConfiguration +++ /dev/null @@ -1,19 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "fields communicating the cloud configuration in a standard way",
- "type": "object",
- "properties": {
- "nodeLocation": {
- "description": "Location identifier for the node",
- "type": "string"
- },
- "lcpCloudRegionId": {
- "description": "LCP Node Location identifier",
- "type": "string"
- },
- "tenantId": {
- "description": "Openstack tenant id",
- "type": "string"
- }
- }
-}
\ No newline at end of file diff --git a/vid-app-common/src/main/resources/json/mso/instanceIds b/vid-app-common/src/main/resources/json/mso/instanceIds deleted file mode 100755 index c20ea9ad1..000000000 --- a/vid-app-common/src/main/resources/json/mso/instanceIds +++ /dev/null @@ -1,29 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "instanceIds that may be associated with a particular request",
- "type": "object",
- "properties": {
- "networkInstanceId": {
- "description": "UUID for the network instance (if any)",
- "type": "string"
- },
- "serviceInstanceId": {
- "description": "UUID for the service instance",
- "type": "string"
- },
- "vfModuleInstanceId": {
- "description": "UUID for the vfModule instance (if any)",
- "type": "string"
- },
- "vnfInstanceId": {
- "description": "UUID for the vnf instance (if any)",
- "type": "string"
- },
- "volumeGroupInstanceId": {
- "description": "UUID for the volume group instance (if any)",
- "type": "string"
- }
- }
-}
-
-
\ No newline at end of file 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 diff --git a/vid-app-common/src/main/resources/json/mso/relatedInstance b/vid-app-common/src/main/resources/json/mso/relatedInstance deleted file mode 100755 index 89554a54c..000000000 --- a/vid-app-common/src/main/resources/json/mso/relatedInstance +++ /dev/null @@ -1,16 +0,0 @@ -{
- "description": "modelInfo and optional instanceId and instanceName for a model related to the modelInfo being operated on",
- "type": "object",
- "properties": {
- "instanceName": {
- "description": "optional name for the instance Id of the related model",
- "type": "string"
- },
- "instanceId": {
- "description": "instance Id for the related model",
- "type": "string"
- },
- "modelInfo": {}
- },
- "required": ["modelInfo"]
-}
\ No newline at end of file diff --git a/vid-app-common/src/main/resources/json/mso/relatedModel b/vid-app-common/src/main/resources/json/mso/relatedModel deleted file mode 100755 index a70a17183..000000000 --- a/vid-app-common/src/main/resources/json/mso/relatedModel +++ /dev/null @@ -1,15 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "modelInfo and optional instance id for a model related to the modelInfo being operated on",
- "type": "object",
- "properties": {
- "instanceId": {
- "description": "instance Id for the related model",
- "type": "string"
- },
- "modelInfo": {}
- },
- "required": [ "modelInfo" ]
-}
-
-
diff --git a/vid-app-common/src/main/resources/json/mso/request b/vid-app-common/src/main/resources/json/mso/request deleted file mode 100755 index 61f10400e..000000000 --- a/vid-app-common/src/main/resources/json/mso/request +++ /dev/null @@ -1,32 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "request structure",
- "type": "object",
- "properties": {
- "finishTime": {
- "description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
- "type": "string"
- },
- "instanceIds": {},
- "requestDetails": {},
- "requestId": {
- "description": "UUID for the request generated by the instantiation service",
- "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}$"
- },
- "requestScope": {
- "description": "short description of the entity being operated on",
- "type": "string"
- },
- "requestStatus": {},
- "requestType": {
- "description": "short description of the action being performed on the requestScope",
- "type": "string"
- },
- "startTime": {
- "description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",
- "type": "string"
- }
- },
- "required": ["requestDetails", "requestId", "requestScope", "requestType", "startTime"]
-}
\ No newline at end of file diff --git a/vid-app-common/src/main/resources/json/mso/requestDetails b/vid-app-common/src/main/resources/json/mso/requestDetails deleted file mode 100755 index c0ef53044..000000000 --- a/vid-app-common/src/main/resources/json/mso/requestDetails +++ /dev/null @@ -1,13 +0,0 @@ -{
- "description": "aggregates the context, configuraiton and detailed parameters associated with the request into a single structure",
- "properties": {
- "cloudConfiguration": {},
- "modelInfo": {},
- "relatedModelList": {},
- "requestInfo": {},
- "requestParameters": {},
- "subscriberInfo": {}
- },
- "type": "object"
-}
-
diff --git a/vid-app-common/src/main/resources/json/mso/requestError b/vid-app-common/src/main/resources/json/mso/requestError deleted file mode 100755 index 497f67192..000000000 --- a/vid-app-common/src/main/resources/json/mso/requestError +++ /dev/null @@ -1,27 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "standard request error data structure",
- "properties": {
- "messageId": {
- "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
- "type": "string"
- },
- "text": {
- "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
- "type": "string"
- },
- "url": {
- "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
- "type": "string"
- },
- "variables": {
- "description": "List of zero or more strings that represent the contents of the variables used by the message text",
- "type": "string"
- }
- },
- "required": [
- "messageId",
- "text"
- ],
- "type": "object"
-}
diff --git a/vid-app-common/src/main/resources/json/mso/requestInfo b/vid-app-common/src/main/resources/json/mso/requestInfo deleted file mode 100755 index 5fcf74c7c..000000000 --- a/vid-app-common/src/main/resources/json/mso/requestInfo +++ /dev/null @@ -1,52 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "fields providing general context information for the request",
- "properties": {
- "billingAccountNumber": {
- "description": "billing account associated with the model being operated on",
- "type": "string"
- },
- "callbackUrl": {
- "description": "client URL to use for asynchronous responses",
- "type": "string"
- },
- "correlator": {
- "description": "Optional correlationId for async callback requests",
- "type": "string"
- },
- "instanceName": {
- "description": "Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)",
- "type": "string"
- },
- "orderNumber": {
- "description": "reference to an order",
- "type": "string"
- },
- "orderVersion": {
- "description": "order version number",
- "type": "number"
- },
- "productFamilyId": {
- "description": "UUID for the product family associated with the model being operated on",
- "type": "string"
- },
- "source": {
- "description": "source of the request--not authoritative--actual source revealed via authentication",
- "type": "string"
- },
- "suppressRollback": {
- "description": "true or false boolean indicating whether rollbacks should be suppressed on failures",
- "type": "boolean"
- },
- "responseValue": {
- "description": "Is the user selected value based on the validResponses list provided to complete the manual task",
- "type": "string"
- },
- "requestorId": {
- "description": "The id of the person who initiated the completion request",
- "type": "string"
- }
- },
-
- "type": "object"
-}
\ No newline at end of file diff --git a/vid-app-common/src/main/resources/json/mso/requestParameters b/vid-app-common/src/main/resources/json/mso/requestParameters deleted file mode 100755 index 010d78713..000000000 --- a/vid-app-common/src/main/resources/json/mso/requestParameters +++ /dev/null @@ -1,23 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "type": "object",
- "properties": {
- "subscriptionServiceType": {
- "type": "string"
- },
- "userParams": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "name": {
- "type": "string"
- },
- "value": {
- "type": "string"
- }
- }
- }
- }
- }
- }
\ No newline at end of file diff --git a/vid-app-common/src/main/resources/json/mso/requestReferences b/vid-app-common/src/main/resources/json/mso/requestReferences deleted file mode 100755 index 30f641190..000000000 --- a/vid-app-common/src/main/resources/json/mso/requestReferences +++ /dev/null @@ -1,18 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "provides the instanceId and requestId associated with the request",
- "type": "object",
- "properties": {
- "instanceId": {
- "description": "UUID for the service instance",
- "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}$"
- },
- "requestId": {
- "description": "UUID for the request",
- "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}$"
- }
- },
- "required": [ "instanceId", "requestId" ]
-}
diff --git a/vid-app-common/src/main/resources/json/mso/requestStatus b/vid-app-common/src/main/resources/json/mso/requestStatus deleted file mode 100755 index 75b72151b..000000000 --- a/vid-app-common/src/main/resources/json/mso/requestStatus +++ /dev/null @@ -1,32 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "fields describing the status of a request",
- "properties": {
- "percentProgress": {
- "description": "percentage complete estimate from 0 to 100",
- "type": "number"
- },
- "requestState": {
- "description": "short description of the instantiation state",
- "type": "string"
- },
- "statusMessage": {
- "description": "additional descriptive information about the status",
- "type": "string"
- },
- "timestamp": {
- "description": "GMT Datetime the requestStatus was created e.g.: Wed, 15 Oct 2014 13:01:52 GMT",
- "type": "string"
- },
- "wasRolledBack": {
- "description": "true or false boolean indicating whether the request was rolled back",
- "type": "boolean"
- }
-
- },
- "required": [
- "requestState",
- "timestamp"
- ],
- "type": "object"
-}
diff --git a/vid-app-common/src/main/resources/json/mso/response b/vid-app-common/src/main/resources/json/mso/response deleted file mode 100755 index fa37d2db7..000000000 --- a/vid-app-common/src/main/resources/json/mso/response +++ /dev/null @@ -1,13 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "response structure",
- "type": "object",
- "code": {
- "description": "Return code",
- "type": "string"
- },
- "message": {
- "description": "Result message",
- "type": "string"
- }
-}
\ No newline at end of file diff --git a/vid-app-common/src/main/resources/json/mso/subscriberInfo b/vid-app-common/src/main/resources/json/mso/subscriberInfo deleted file mode 100755 index df787378b..000000000 --- a/vid-app-common/src/main/resources/json/mso/subscriberInfo +++ /dev/null @@ -1,19 +0,0 @@ -{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "description": "fields providing information about the subscriber associated with the request",
- "type": "object",
- "properties": {
- "globalSubscriberId": {
- "description": "global Customer Id understood by A&AI",
- "type": "string"
- },
- "subscriberCommonSiteId": {
- "description": "id representing the location of the subscriber",
- "type": "string"
- },
- "subscriberName": {
- "description": "name of the customer or subscriber",
- "type": "string"
- }
- }
-}
\ No newline at end of file |