diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-09-12 23:29:25 +0100 |
|---|---|---|
| committer | liamfallon <liam.fallon@ericsson.com> | 2018-09-12 23:54:51 +0100 |
| commit | 0e23f7634e1e1fb31454c516974613335fcea1a4 (patch) | |
| tree | bedf0e52104e62599dd091eb6292de5dc7d57f49 /plugins | |
| parent | 3ccc3d9ecd4bcd8960a2da6ecbdc7f3ac806fc67 (diff) | |
Sonar/Checkstyle in model/context/core
Checkstyle and sonar changes in the model, contexot
and core modules.
Issue-ID: POLICY-1034
Change-Id: I2d40bc877f3a548844470fc290fc89d63fa465ae
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'plugins')
27 files changed, 1178 insertions, 1178 deletions
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java index 9f1327df1..c8b1cedce 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java @@ -59,7 +59,7 @@ public class InfinispanContextDistributor extends AbstractDistributor { * (non-Javadoc) * * @see - * com.ericsson.apex.context.impl.distribution.AbstractContextDistributor#init(com.ericsson.apex + * org.onap.policy.apex.context.impl.distribution.AbstractContextDistributor#init(org.onap.policy.apex * .model.basicmodel.concepts.AxArtifactKey) */ @Override @@ -86,8 +86,8 @@ public class InfinispanContextDistributor extends AbstractDistributor { /* * (non-Javadoc) * - * @see com.ericsson.apex.core.context.impl.distribution.AbstractContextDistributor# - * getContextAlbumMap(com.ericsson.apex.core.model.concepts.AxArtifactKey) + * @see org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor# + * getContextAlbumMap(org.onap.policy.apex.core.model.concepts.AxArtifactKey) */ @Override public Map<String, Object> getContextAlbumMap(final AxArtifactKey contextAlbumKey) { @@ -103,7 +103,7 @@ public class InfinispanContextDistributor extends AbstractDistributor { /* * (non-Javadoc) * - * @see com.ericsson.apex.core.context.impl.distribution.AbstractContextDistributor#shutdown() + * @see org.onap.policy.apex.core.context.impl.distribution.AbstractContextDistributor#shutdown() */ @Override public void shutdown() { diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java index 539a732cf..16fdd85ac 100644 --- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java @@ -131,7 +131,7 @@ public class InfinispanDistributorParameters extends DistributorParameters { /* * (non-Javadoc) * - * @see com.ericsson.apex.context.parameters.DistributorParameters#toString() + * @see org.onap.policy.apex.context.parameters.DistributorParameters#toString() */ @Override public String toString() { diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc index d4ae592a1..e64d0e36a 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc @@ -1,70 +1,70 @@ { - "type": "array", - "items": { - "type": "record", - "name": "AAIInventoryResponseItem_Type", - "fields": [ - { - "name": "model_DasH_name", - "type": "string" - }, - { - "name": "extra_DasH_properties", - "type": { - "type": "record", - "name": "AAIInventoryResponseItemExtraProperties_Type", - "fields": [] - } - }, - { - "name": "generic_DasH_vnf", - "type": { - "type": "record", - "name": "AAIInventoryResponseItemGenericVNF_Type", - "fields": [ - { - "name": "vnf_DasH_id", - "type": "string" - }, - { - "name": "vnf_DasH_name", - "type": "string" - }, - { - "name": "vnf_DasH_type", - "type": "string" - }, - { - "name": "service_DasH_id", - "type": "string" - }, - { - "name": "orchestration_DasH_status", - "type": "string" - }, - { - "name": "in_DasH_maint", - "type": "boolean" - }, - { - "name": "is_DasH_closed_DasH_loop_DasH_disabled", - "type": "boolean" - }, - { - "name": "resource_DasH_version", - "type": "string" - }, - { - "name": "model_DasH_invariant_DasH_id", - "type": "string" - }, - { - "name": "model_DasH_version_DasH_id", - "type": "string" - } - ] - } - } - ] - } + "type": "array", + "items": { + "type": "record", + "name": "AAIInventoryResponseItem_Type", + "fields": [ + { + "name": "model_DasH_name", + "type": "string" + }, + { + "name": "extra_DasH_properties", + "type": { + "type": "record", + "name": "AAIInventoryResponseItemExtraProperties_Type", + "fields": [] + } + }, + { + "name": "generic_DasH_vnf", + "type": { + "type": "record", + "name": "AAIInventoryResponseItemGenericVNF_Type", + "fields": [ + { + "name": "vnf_DasH_id", + "type": "string" + }, + { + "name": "vnf_DasH_name", + "type": "string" + }, + { + "name": "vnf_DasH_type", + "type": "string" + }, + { + "name": "service_DasH_id", + "type": "string" + }, + { + "name": "orchestration_DasH_status", + "type": "string" + }, + { + "name": "in_DasH_maint", + "type": "boolean" + }, + { + "name": "is_DasH_closed_DasH_loop_DasH_disabled", + "type": "boolean" + }, + { + "name": "resource_DasH_version", + "type": "string" + }, + { + "name": "model_DasH_invariant_DasH_id", + "type": "string" + }, + { + "name": "model_DasH_version_DasH_id", + "type": "string" + } + ] + } + } + ] + } } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc index 0967d6210..b3f154542 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc @@ -1,10 +1,10 @@ { - "type": "array", "items": { - "type" : "record", - "name" : "AddressUSRecord", - "fields" : [ - {"name": "streetaddress", "type": "string"}, - {"name": "city", "type": "string"} - ] - } + "type": "array", "items": { + "type" : "record", + "name" : "AddressUSRecord", + "fields" : [ + {"name": "streetaddress", "type": "string"}, + {"name": "city", "type": "string"} + ] + } }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc index 91f391a89..2ff82f51f 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc @@ -1,3 +1,3 @@ { - "type": "array", "items": "long" + "type": "array", "items": "long" }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc index ea5c5b7b1..a698923bb 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc @@ -1,5 +1,5 @@ { - "type": "enum", - "name": "Suit", - "symbols" : ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"] + "type": "enum", + "name": "Suit", + "symbols" : ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"] }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc index 4642ef577..49c837cf4 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc @@ -1,5 +1,5 @@ { - "type" : "fixed", - "name" : "binaryData", - "size" : 64 + "type" : "fixed", + "name" : "binaryData", + "size" : 64 }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc index 2db1d696d..28071488b 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc @@ -1,76 +1,76 @@ { - "type" : "record", - "name" : "HealthCheckBody_Type", - "namespace" : "com.ericsson.apex.onap.tlgoal2017", - "fields" : [ - { - "name": "input", - "type": { - "type" : "record", - "name" : "InputRecord", - "fields" : [ - { - "name": "action", "type": "string" - }, - { - "name": "action_DasH_identifiers", - "type": { - "type" : "record", - "name" : "ActionIdentifiersRecord", - "fields" : [ - { - "name": "vnf_DasH_id", "type": "string" - } - ] - } - }, - { - "name": "common_DasH_header", - "type": { - "type" : "record", - "name" : "CommonHeaderRecord", - "fields" : [ - { - "name": "request_DasH_id", "type": "string" - }, - { - "name": "originator_DasH_id", "type": "string" - }, - { - "name": "api_DasH_ver", "type": "string" - }, - { - "name": "sub_DasH_request_DasH_id", "type": "string" - }, - { - "name": "timestamp", "type": "string" - }, - { - "name": "flags", - "type": { - "type" : "record", - "name" : "FlagsRecord", - "fields" : [ - { - "name": "ttl", "type": "string" - }, - { - "name": "force", "type": "string" - }, - { - "name": "mode", "type": "string" - } - ] - } - } - ] - } - }, - { - "name": "payload", "type": "string" - } - ] - } - } - ] + "type" : "record", + "name" : "HealthCheckBody_Type", + "namespace" : "org.onap.policy.apex.onap.tlgoal2017", + "fields" : [ + { + "name": "input", + "type": { + "type" : "record", + "name" : "InputRecord", + "fields" : [ + { + "name": "action", "type": "string" + }, + { + "name": "action_DasH_identifiers", + "type": { + "type" : "record", + "name" : "ActionIdentifiersRecord", + "fields" : [ + { + "name": "vnf_DasH_id", "type": "string" + } + ] + } + }, + { + "name": "common_DasH_header", + "type": { + "type" : "record", + "name" : "CommonHeaderRecord", + "fields" : [ + { + "name": "request_DasH_id", "type": "string" + }, + { + "name": "originator_DasH_id", "type": "string" + }, + { + "name": "api_DasH_ver", "type": "string" + }, + { + "name": "sub_DasH_request_DasH_id", "type": "string" + }, + { + "name": "timestamp", "type": "string" + }, + { + "name": "flags", + "type": { + "type" : "record", + "name" : "FlagsRecord", + "fields" : [ + { + "name": "ttl", "type": "string" + }, + { + "name": "force", "type": "string" + }, + { + "name": "mode", "type": "string" + } + ] + } + } + ] + } + }, + { + "name": "payload", "type": "string" + } + ] + } + } + ] } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc index f8457c690..5728fef62 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc @@ -1,10 +1,10 @@ { - "type": "map", "values": { - "type" : "record", - "name" : "AddressUSRecord", - "fields" : [ - {"name": "streetaddress", "type": "string"}, - {"name": "city", "type": "string"} - ] - } + "type": "map", "values": { + "type" : "record", + "name" : "AddressUSRecord", + "fields" : [ + {"name": "streetaddress", "type": "string"}, + {"name": "city", "type": "string"} + ] + } }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc index 48c476065..ddffb4bbc 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc @@ -1,10 +1,10 @@ { - "type": "map", "values": { - "type" : "record", - "name" : "AddressUSRecord", - "fields" : [ - {"name": "street_DasH_address", "type": "string"}, - {"name": "the_DoT_city", "type": "string"} - ] - } + "type": "map", "values": { + "type" : "record", + "name" : "AddressUSRecord", + "fields" : [ + {"name": "street_DasH_address", "type": "string"}, + {"name": "the_DoT_city", "type": "string"} + ] + } }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc index 0bb3729ed..5717ee47e 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc @@ -1,3 +1,3 @@ { - "type": "map", "values": "long" + "type": "map", "values": "long" }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc index 274735532..9790e6c8e 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc @@ -1,172 +1,172 @@ { - "type": "record", - "name": "User", - "namespace": "com.example.avro", - "doc": "This is a user record in a fictitious to-do-list management app. It supports arbitrary grouping and nesting of items, and allows you to add items by email or by tweeting.\n\nNote this app doesn't actually exist. The schema is just a demo for [Avrodoc](https://github.com/ept/avrodoc)!", - "fields": [ + "type": "record", + "name": "User", + "namespace": "com.example.avro", + "doc": "This is a user record in a fictitious to-do-list management app. It supports arbitrary grouping and nesting of items, and allows you to add items by email or by tweeting.\n\nNote this app doesn't actually exist. The schema is just a demo for [Avrodoc](https://github.com/ept/avrodoc)!", + "fields": [ {"name": "firstname", "type": "string"}, {"name": "lastname", "type": "string"}, - { - "name": "address", - "type": { - "type" : "record", - "name" : "AddressUSRecord", - "fields" : [ - {"name": "streetaddress", "type": "string"}, - {"name": "city", "type": "string"} - ] - } - }, - { - "name": "id", - "doc": "System-assigned numeric user ID. Cannot be changed by the user.", - "type": "int" - }, - { - "name": "username", - "doc": "The username chosen by the user. Can be changed by the user.", - "type": "string" - }, - { - "name": "passwordHash", - "doc": "The user's password, hashed using [scrypt](http://www.tarsnap.com/scrypt.html).", - "type": "string" - }, - { - "name": "signupDate", - "doc": "Timestamp (milliseconds since epoch) when the user signed up", - "type": "long" - }, - { - "name": "emailAddresses", - "doc": "All email addresses on the user's account", - "type": { - "type": "array", - "items": { - "type": "record", - "name": "EmailAddress", - "doc": "Stores details about an email address that a user has associated with their account.", - "fields": [ - { - "name": "address", - "doc": "The email address, e.g. `foo@example.com`", - "type": "string" - }, - { - "name": "verified", - "doc": "true if the user has clicked the link in a confirmation email to this address.", - "type": "boolean", - "default": false - }, - { - "name": "dateAdded", - "doc": "Timestamp (milliseconds since epoch) when the email address was added to the account.", - "type": "long" - }, - { - "name": "dateBounced", - "doc": "Timestamp (milliseconds since epoch) when an email sent to this address last bounced. Reset to null when the address no longer bounces.", - "type": ["null", "long"] - } - ] - } - } - }, - { - "name": "twitterAccounts", - "doc": "All Twitter accounts that the user has OAuthed", - "type": { - "type": "array", - "items": { - "type": "record", - "name": "TwitterAccount", - "doc": "Stores access credentials for one Twitter account, as granted to us by the user by OAuth.", - "fields": [ - { - "name": "status", - "doc": "Indicator of whether this authorization is currently active, or has been revoked", - "type": { - "type": "enum", - "name": "OAuthStatus", - "doc": "* `PENDING`: the user has started authorizing, but not yet finished\n* `ACTIVE`: the token should work\n* `DENIED`: the user declined the authorization\n* `EXPIRED`: the token used to work, but now it doesn't\n* `REVOKED`: the user has explicitly revoked the token", - "symbols": ["PENDING", "ACTIVE", "DENIED", "EXPIRED", "REVOKED"] - } - }, - { - "name": "userId", - "doc": "Twitter's numeric ID for this user", - "type": "long" - }, - { - "name": "screenName", - "doc": "The twitter username for this account (can be changed by the user)", - "type": "string" - }, - { - "name": "oauthToken", - "doc": "The OAuth token for this Twitter account", - "type": "string" - }, - { - "name": "oauthTokenSecret", - "doc": "The OAuth secret, used for signing requests on behalf of this Twitter account. `null` whilst the OAuth flow is not yet complete.", - "type": ["null", "string"] - }, - { - "name": "dateAuthorized", - "doc": "Timestamp (milliseconds since epoch) when the user last authorized this Twitter account", - "type": "long" - } - ] - } - } - }, - { - "name": "toDoItems", - "doc": "The top-level items in the user's to-do list", - "type": { - "type": "array", - "items": { - "type": "record", - "name": "ToDoItem", - "doc": "A record is one node in a To-Do item tree (every record can contain nested sub-records).", - "fields": [ - { - "name": "status", - "doc": "User-selected state for this item (e.g. whether or not it is marked as done)", - "type": { - "type": "enum", - "name": "ToDoStatus", - "doc": "* `HIDDEN`: not currently visible, e.g. because it becomes actionable in future\n* `ACTIONABLE`: appears in the current to-do list\n* `DONE`: marked as done, but still appears in the list\n* `ARCHIVED`: marked as done and no longer visible\n* `DELETED`: not done and removed from list (preserved for undo purposes)", - "symbols": ["HIDDEN", "ACTIONABLE", "DONE", "ARCHIVED", "DELETED"] - } - }, - { - "name": "title", - "doc": "One-line summary of the item", - "type": "string" - }, - { - "name": "description", - "doc": "Detailed description (may contain HTML markup)", - "type": ["null", "string"] - }, - { - "name": "snoozeDate", - "doc": "Timestamp (milliseconds since epoch) at which the item should go from `HIDDEN` to `ACTIONABLE` status", - "type": ["null", "long"] - }, - { - "name": "subItems", - "doc": "List of children of this to-do tree node", - "type": { - "type": "array", - "items": "ToDoItem" - } - } - ] - } - } - } - ] + { + "name": "address", + "type": { + "type" : "record", + "name" : "AddressUSRecord", + "fields" : [ + {"name": "streetaddress", "type": "string"}, + {"name": "city", "type": "string"} + ] + } + }, + { + "name": "id", + "doc": "System-assigned numeric user ID. Cannot be changed by the user.", + "type": "int" + }, + { + "name": "username", + "doc": "The username chosen by the user. Can be changed by the user.", + "type": "string" + }, + { + "name": "passwordHash", + "doc": "The user's password, hashed using [scrypt](http://www.tarsnap.com/scrypt.html).", + "type": "string" + }, + { + "name": "signupDate", + "doc": "Timestamp (milliseconds since epoch) when the user signed up", + "type": "long" + }, + { + "name": "emailAddresses", + "doc": "All email addresses on the user's account", + "type": { + "type": "array", + "items": { + "type": "record", + "name": "EmailAddress", + "doc": "Stores details about an email address that a user has associated with their account.", + "fields": [ + { + "name": "address", + "doc": "The email address, e.g. `foo@example.com`", + "type": "string" + }, + { + "name": "verified", + "doc": "true if the user has clicked the link in a confirmation email to this address.", + "type": "boolean", + "default": false + }, + { + "name": "dateAdded", + "doc": "Timestamp (milliseconds since epoch) when the email address was added to the account.", + "type": "long" + }, + { + "name": "dateBounced", + "doc": "Timestamp (milliseconds since epoch) when an email sent to this address last bounced. Reset to null when the address no longer bounces.", + "type": ["null", "long"] + } + ] + } + } + }, + { + "name": "twitterAccounts", + "doc": "All Twitter accounts that the user has OAuthed", + "type": { + "type": "array", + "items": { + "type": "record", + "name": "TwitterAccount", + "doc": "Stores access credentials for one Twitter account, as granted to us by the user by OAuth.", + "fields": [ + { + "name": "status", + "doc": "Indicator of whether this authorization is currently active, or has been revoked", + "type": { + "type": "enum", + "name": "OAuthStatus", + "doc": "* `PENDING`: the user has started authorizing, but not yet finished\n* `ACTIVE`: the token should work\n* `DENIED`: the user declined the authorization\n* `EXPIRED`: the token used to work, but now it doesn't\n* `REVOKED`: the user has explicitly revoked the token", + "symbols": ["PENDING", "ACTIVE", "DENIED", "EXPIRED", "REVOKED"] + } + }, + { + "name": "userId", + "doc": "Twitter's numeric ID for this user", + "type": "long" + }, + { + "name": "screenName", + "doc": "The twitter username for this account (can be changed by the user)", + "type": "string" + }, + { + "name": "oauthToken", + "doc": "The OAuth token for this Twitter account", + "type": "string" + }, + { + "name": "oauthTokenSecret", + "doc": "The OAuth secret, used for signing requests on behalf of this Twitter account. `null` whilst the OAuth flow is not yet complete.", + "type": ["null", "string"] + }, + { + "name": "dateAuthorized", + "doc": "Timestamp (milliseconds since epoch) when the user last authorized this Twitter account", + "type": "long" + } + ] + } + } + }, + { + "name": "toDoItems", + "doc": "The top-level items in the user's to-do list", + "type": { + "type": "array", + "items": { + "type": "record", + "name": "ToDoItem", + "doc": "A record is one node in a To-Do item tree (every record can contain nested sub-records).", + "fields": [ + { + "name": "status", + "doc": "User-selected state for this item (e.g. whether or not it is marked as done)", + "type": { + "type": "enum", + "name": "ToDoStatus", + "doc": "* `HIDDEN`: not currently visible, e.g. because it becomes actionable in future\n* `ACTIONABLE`: appears in the current to-do list\n* `DONE`: marked as done, but still appears in the list\n* `ARCHIVED`: marked as done and no longer visible\n* `DELETED`: not done and removed from list (preserved for undo purposes)", + "symbols": ["HIDDEN", "ACTIONABLE", "DONE", "ARCHIVED", "DELETED"] + } + }, + { + "name": "title", + "doc": "One-line summary of the item", + "type": "string" + }, + { + "name": "description", + "doc": "Detailed description (may contain HTML markup)", + "type": ["null", "string"] + }, + { + "name": "snoozeDate", + "doc": "Timestamp (milliseconds since epoch) at which the item should go from `HIDDEN` to `ACTIONABLE` status", + "type": ["null", "long"] + }, + { + "name": "subItems", + "doc": "List of children of this to-do tree node", + "type": { + "type": "array", + "items": "ToDoItem" + } + } + ] + } + } + } + ] } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc index 102641b44..cb8b4e29e 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc @@ -1,172 +1,172 @@ { - "type": "record", - "name": "User", - "namespace": "com.example.avro", - "doc": "This is a user record in a fictitious to-do-list management app. It supports arbitrary grouping and nesting of items, and allows you to add items by email or by tweeting.\n\nNote this app doesn't actually exist. The schema is just a demo for [Avrodoc](https://github.com/ept/avrodoc)!", - "fields": [ + "type": "record", + "name": "User", + "namespace": "com.example.avro", + "doc": "This is a user record in a fictitious to-do-list management app. It supports arbitrary grouping and nesting of items, and allows you to add items by email or by tweeting.\n\nNote this app doesn't actually exist. The schema is just a demo for [Avrodoc](https://github.com/ept/avrodoc)!", + "fields": [ {"name": "firstname", "type": "string"}, {"name": "lastname", "type": "string"}, - { - "name": "address", - "type": { - "type" : "record", - "name" : "AddressUSRecord", - "fields" : [ - {"name": "streetaddress_DasH_1", "type": "string"}, - {"name": "city", "type": "string"} - ] - } - }, - { - "name": "id", - "doc": "System-assigned numeric user ID. Cannot be changed by the user.", - "type": "int" - }, - { - "name": "username", - "doc": "The username chosen by the user. Can be changed by the user.", - "type": "string" - }, - { - "name": "passwordHash", - "doc": "The user's password, hashed using [scrypt](http://www.tarsnap.com/scrypt.html).", - "type": "string" - }, - { - "name": "signupDate", - "doc": "Timestamp (milliseconds since epoch) when the user signed up", - "type": "long" - }, - { - "name": "email_DoT_Addresses", - "doc": "All email addresses on the user's account", - "type": { - "type": "array", - "items": { - "type": "record", - "name": "EmailAddress", - "doc": "Stores details about an email address that a user has associated with their account.", - "fields": [ - { - "name": "address", - "doc": "The email address, e.g. `foo@example.com`", - "type": "string" - }, - { - "name": "verified", - "doc": "true if the user has clicked the link in a confirmation email to this address.", - "type": "boolean", - "default": false - }, - { - "name": "dateAdded", - "doc": "Timestamp (milliseconds since epoch) when the email address was added to the account.", - "type": "long" - }, - { - "name": "dateBounced", - "doc": "Timestamp (milliseconds since epoch) when an email sent to this address last bounced. Reset to null when the address no longer bounces.", - "type": ["null", "long"] - } - ] - } - } - }, - { - "name": "twitterAccounts", - "doc": "All Twitter accounts that the user has OAuthed", - "type": { - "type": "array", - "items": { - "type": "record", - "name": "TwitterAccount", - "doc": "Stores access credentials for one Twitter account, as granted to us by the user by OAuth.", - "fields": [ - { - "name": "status", - "doc": "Indicator of whether this authorization is currently active, or has been revoked", - "type": { - "type": "enum", - "name": "OAuthStatus", - "doc": "* `PENDING`: the user has started authorizing, but not yet finished\n* `ACTIVE`: the token should work\n* `DENIED`: the user declined the authorization\n* `EXPIRED`: the token used to work, but now it doesn't\n* `REVOKED`: the user has explicitly revoked the token", - "symbols": ["PENDING", "ACTIVE", "DENIED", "EXPIRED", "REVOKED"] - } - }, - { - "name": "userId", - "doc": "Twitter's numeric ID for this user", - "type": "long" - }, - { - "name": "screenName", - "doc": "The twitter username for this account (can be changed by the user)", - "type": "string" - }, - { - "name": "oauthToken", - "doc": "The OAuth token for this Twitter account", - "type": "string" - }, - { - "name": "oauthTokenSecret", - "doc": "The OAuth secret, used for signing requests on behalf of this Twitter account. `null` whilst the OAuth flow is not yet complete.", - "type": ["null", "string"] - }, - { - "name": "dateAuthorized", - "doc": "Timestamp (milliseconds since epoch) when the user last authorized this Twitter account", - "type": "long" - } - ] - } - } - }, - { - "name": "toDoItems", - "doc": "The top-level items in the user's to-do list", - "type": { - "type": "array", - "items": { - "type": "record", - "name": "ToDoItem", - "doc": "A record is one node in a To-Do item tree (every record can contain nested sub-records).", - "fields": [ - { - "name": "status", - "doc": "User-selected state for this item (e.g. whether or not it is marked as done)", - "type": { - "type": "enum", - "name": "ToDoStatus", - "doc": "* `HIDDEN`: not currently visible, e.g. because it becomes actionable in future\n* `ACTIONABLE`: appears in the current to-do list\n* `DONE`: marked as done, but still appears in the list\n* `ARCHIVED`: marked as done and no longer visible\n* `DELETED`: not done and removed from list (preserved for undo purposes)", - "symbols": ["HIDDEN", "ACTIONABLE", "DONE", "ARCHIVED", "DELETED"] - } - }, - { - "name": "title_DasH_long", - "doc": "One-line summary of the item", - "type": "string" - }, - { - "name": "description", - "doc": "Detailed description (may contain HTML markup)", - "type": ["null", "string"] - }, - { - "name": "snoozeDate", - "doc": "Timestamp (milliseconds since epoch) at which the item should go from `HIDDEN` to `ACTIONABLE` status", - "type": ["null", "long"] - }, - { - "name": "subItems", - "doc": "List of children of this to-do tree node", - "type": { - "type": "array", - "items": "ToDoItem" - } - } - ] - } - } - } - ] + { + "name": "address", + "type": { + "type" : "record", + "name" : "AddressUSRecord", + "fields" : [ + {"name": "streetaddress_DasH_1", "type": "string"}, + {"name": "city", "type": "string"} + ] + } + }, + { + "name": "id", + "doc": "System-assigned numeric user ID. Cannot be changed by the user.", + "type": "int" + }, + { + "name": "username", + "doc": "The username chosen by the user. Can be changed by the user.", + "type": "string" + }, + { + "name": "passwordHash", + "doc": "The user's password, hashed using [scrypt](http://www.tarsnap.com/scrypt.html).", + "type": "string" + }, + { + "name": "signupDate", + "doc": "Timestamp (milliseconds since epoch) when the user signed up", + "type": "long" + }, + { + "name": "email_DoT_Addresses", + "doc": "All email addresses on the user's account", + "type": { + "type": "array", + "items": { + "type": "record", + "name": "EmailAddress", + "doc": "Stores details about an email address that a user has associated with their account.", + "fields": [ + { + "name": "address", + "doc": "The email address, e.g. `foo@example.com`", + "type": "string" + }, + { + "name": "verified", + "doc": "true if the user has clicked the link in a confirmation email to this address.", + "type": "boolean", + "default": false + }, + { + "name": "dateAdded", + "doc": "Timestamp (milliseconds since epoch) when the email address was added to the account.", + "type": "long" + }, + { + "name": "dateBounced", + "doc": "Timestamp (milliseconds since epoch) when an email sent to this address last bounced. Reset to null when the address no longer bounces.", + "type": ["null", "long"] + } + ] + } + } + }, + { + "name": "twitterAccounts", + "doc": "All Twitter accounts that the user has OAuthed", + "type": { + "type": "array", + "items": { + "type": "record", + "name": "TwitterAccount", + "doc": "Stores access credentials for one Twitter account, as granted to us by the user by OAuth.", + "fields": [ + { + "name": "status", + "doc": "Indicator of whether this authorization is currently active, or has been revoked", + "type": { + "type": "enum", + "name": "OAuthStatus", + "doc": "* `PENDING`: the user has started authorizing, but not yet finished\n* `ACTIVE`: the token should work\n* `DENIED`: the user declined the authorization\n* `EXPIRED`: the token used to work, but now it doesn't\n* `REVOKED`: the user has explicitly revoked the token", + "symbols": ["PENDING", "ACTIVE", "DENIED", "EXPIRED", "REVOKED"] + } + }, + { + "name": "userId", + "doc": "Twitter's numeric ID for this user", + "type": "long" + }, + { + "name": "screenName", + "doc": "The twitter username for this account (can be changed by the user)", + "type": "string" + }, + { + "name": "oauthToken", + "doc": "The OAuth token for this Twitter account", + "type": "string" + }, + { + "name": "oauthTokenSecret", + "doc": "The OAuth secret, used for signing requests on behalf of this Twitter account. `null` whilst the OAuth flow is not yet complete.", + "type": ["null", "string"] + }, + { + "name": "dateAuthorized", + "doc": "Timestamp (milliseconds since epoch) when the user last authorized this Twitter account", + "type": "long" + } + ] + } + } + }, + { + "name": "toDoItems", + "doc": "The top-level items in the user's to-do list", + "type": { + "type": "array", + "items": { + "type": "record", + "name": "ToDoItem", + "doc": "A record is one node in a To-Do item tree (every record can contain nested sub-records).", + "fields": [ + { + "name": "status", + "doc": "User-selected state for this item (e.g. whether or not it is marked as done)", + "type": { + "type": "enum", + "name": "ToDoStatus", + "doc": "* `HIDDEN`: not currently visible, e.g. because it becomes actionable in future\n* `ACTIONABLE`: appears in the current to-do list\n* `DONE`: marked as done, but still appears in the list\n* `ARCHIVED`: marked as done and no longer visible\n* `DELETED`: not done and removed from list (preserved for undo purposes)", + "symbols": ["HIDDEN", "ACTIONABLE", "DONE", "ARCHIVED", "DELETED"] + } + }, + { + "name": "title_DasH_long", + "doc": "One-line summary of the item", + "type": "string" + }, + { + "name": "description", + "doc": "Detailed description (may contain HTML markup)", + "type": ["null", "string"] + }, + { + "name": "snoozeDate", + "doc": "Timestamp (milliseconds since epoch) at which the item should go from `HIDDEN` to `ACTIONABLE` status", + "type": ["null", "long"] + }, + { + "name": "subItems", + "doc": "List of children of this to-do tree node", + "type": { + "type": "array", + "items": "ToDoItem" + } + } + ] + } + } + } + ] } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc index b9aac36f9..3a3297d0b 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc @@ -1,7 +1,7 @@ { "type" : "record", "name" : "VPNActEvent", - "namespace" : "com.ericsson.apex.domains.vpn.events", + "namespace" : "org.onap.policy.apex.domains.vpn.events", "fields" : [ {"name": "nameSpace", "type": "string"}, {"name": "name", "type": "string"}, @@ -11,14 +11,14 @@ {"name": "LinkMap", "type": { "type" : "record", "name" : "LinkMap", - "namespace" : "com.ericsson.apex.domains.vpn", + "namespace" : "org.onap.policy.apex.domains.vpn", "fields" : [ ] } }, {"name": "CustomerMap", "type": { "type" : "record", "name" : "CustomerMap", - "namespace" : "com.ericsson.apex.domains.vpn", + "namespace" : "org.onap.policy.apex.domains.vpn", "fields" : [ ] } } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc index 5936bb21f..16afc712e 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc @@ -1,34 +1,34 @@ { - "type" : "record", - "name" : "VPNActEvent", - "namespace" : "com.ericsson.apex.domains.vpn.events", - "fields" : [ - {"name": "nameSpace", "type": "string"}, - {"name": "name", "type": "string"}, - {"name": "version", "type": "string"}, - {"name": "source", "type": "string"}, - {"name": "target", "type": "string"}, - {"name": "LinkMap", "type": { - "type" : "record", - "name" : "LinkMap", - "namespace" : "com.ericsson.apex.domains.vpn", - "fields" : [ ] - } - }, - {"name": "CustomerMap", "type": { - "type" : "record", - "name" : "CustomerMap", - "namespace" : "com.ericsson.apex.domains.vpn", - "fields" : [ ] - } - }, - {"name": "CustomerMap1", "type": "com.ericsson.apex.domains.vpn.CustomerMap"}, - { - "name" : "CustomerMapArray", - "type": { - "type": "array", - "items": "com.ericsson.apex.domains.vpn.CustomerMap" - } - } - ] + "type" : "record", + "name" : "VPNActEvent", + "namespace" : "org.onap.policy.apex.domains.vpn.events", + "fields" : [ + {"name": "nameSpace", "type": "string"}, + {"name": "name", "type": "string"}, + {"name": "version", "type": "string"}, + {"name": "source", "type": "string"}, + {"name": "target", "type": "string"}, + {"name": "LinkMap", "type": { + "type" : "record", + "name" : "LinkMap", + "namespace" : "org.onap.policy.apex.domains.vpn", + "fields" : [ ] + } + }, + {"name": "CustomerMap", "type": { + "type" : "record", + "name" : "CustomerMap", + "namespace" : "org.onap.policy.apex.domains.vpn", + "fields" : [ ] + } + }, + {"name": "CustomerMap1", "type": "org.onap.policy.apex.domains.vpn.CustomerMap"}, + { + "name" : "CustomerMapArray", + "type": { + "type": "array", + "items": "org.onap.policy.apex.domains.vpn.CustomerMap" + } + } + ] } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc index 96b6050fb..01774133c 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc @@ -1,30 +1,30 @@ { - "namespace": "example.avro", - "type": "record", - "name": "User", - "fields": [ - { - "name": "name", - "type": "string" - }, - { - "name": "favourite_number", - "type": [ - "null", - "int" - ] - }, - { - "name": "favourite_colour", - "type": [ - "null", - "string" - ] - }, - { - "name": "favourite_group", - "type": ["null", "string"], - "default": "null" - } - ] + "namespace": "example.avro", + "type": "record", + "name": "User", + "fields": [ + { + "name": "name", + "type": "string" + }, + { + "name": "favourite_number", + "type": [ + "null", + "int" + ] + }, + { + "name": "favourite_colour", + "type": [ + "null", + "string" + ] + }, + { + "name": "favourite_group", + "type": ["null", "string"], + "default": "null" + } + ] }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json index 25ca3af8a..f690d6b42 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json @@ -1,20 +1,20 @@ [ - { - "model-name": "service-instance", - "generic-vnf": { - "vnf-id": "de7cc3ab-0212-47df-9e64-da1c79234deb", - "vnf-name": "ZRDM2MMEX39", - "vnf-type": "vMME Svc Jul 14/vMME VF Jul 14 1", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "orchestration-status": "active", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1503082370097", - "model-invariant-id": "82194af1-3c2c-485a-8f44-420e22a9eaa4", - "model-version-id": "46b92144-923a-4d20-b85a-3cbd847668a9" - }, - "extra-properties": { - - } - } + { + "model-name": "service-instance", + "generic-vnf": { + "vnf-id": "de7cc3ab-0212-47df-9e64-da1c79234deb", + "vnf-name": "ZRDM2MMEX39", + "vnf-type": "vMME Svc Jul 14/vMME VF Jul 14 1", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "orchestration-status": "active", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1503082370097", + "model-invariant-id": "82194af1-3c2c-485a-8f44-420e22a9eaa4", + "model-version-id": "46b92144-923a-4d20-b85a-3cbd847668a9" + }, + "extra-properties": { + + } + } ] diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json index 41cfc5c17..59615b824 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json @@ -1,302 +1,302 @@ [ - { - "model-name": "vFW", - "generic-vnf": { - "vnf-id": "vFirewall_demo_app", - "vnf-name": "vFirewall_demo_app", - "vnf-type": "vFW", - "service-id": "vFirewall_demo_app", - "orchestration-status": "running", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509456799110", - "model-invariant-id": "vFirewall", - "model-version-id": "vFW" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "vserver": { - "vserver-id": "5b06cf36-40a0-4bcb-bde9-849aa4702d67", - "vserver-name": "vFW", - "vserver-name2": "vFW", - "prov-status": "Running", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/466979b815b5415ba14ada713e6e1846/servers/5b06cf36-40a0-4bcb-bde9-849aa4702d67", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509047869791" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "vnfc": { - "vnfc-name": "VNFC_vGMUX_demo_app2", - "nfc-naming-code": "vGMUXCODE2", - "nfc-function": "vGMUX", - "prov-status": "Running", - "orchestration-status": "Error", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509407048855" - }, - "extra-properties": { - - } - }, - { - "tenant": { - "tenant-id": "466979b815b5415ba14ada713e6e1846", - "tenant-name": "Integration", - "resource-version": "1508920100541" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "cloud-region": { - "cloud-owner": "pod25", - "cloud-region-id": "RegionOne", - "identity-url": "http://10.12.25.2:5000/v3", - "sriov-automation": false, - "resource-version": "1509048416263" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "esr-system-info": { - "esr-system-info-id": "432ac032-e996-41f2-84ed-9c7a1766eb29", - "system-name": "example-system-name-val-29070", - "type": "example-type-val-85254", - "vendor": "example-vendor-val-94515", - "version": "example-version-val-71880", - "service-url": "http://10.12.25.2:5000/v3", - "user-name": "demo", - "password": "onapdemo", - "system-type": "VIM", - "ssl-cacert": "example-ssl-cacert-val-75021", - "ssl-insecure": true, - "ip-address": "example-ip-address-val-44431", - "port": "example-port-val-93234", - "cloud-domain": "Default", - "default-tenant": "Integration", - "resource-version": "1508920101033" - }, - "extra-properties": { - - } - } - ] - } - } - ] - } - } - ] - } - }, - { - "vserver": { - "vserver-id": "0c52905c-f682-42cf-bd52-e7f8953e80e3", - "vserver-name": "vFW", - "vserver-name2": "vFW", - "prov-status": "Running", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/466979b815b5415ba14ada713e6e1846/servers/0c52905c-f682-42cf-bd52-e7f8953e80e3", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509047548567" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "vnfc": { - "vnfc-name": "VNFC_vGMUX_demo_app3", - "nfc-naming-code": "vGMUXCODE3", - "nfc-function": "vGMUX", - "prov-status": "Running", - "orchestration-status": "Running", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509041912808" - }, - "extra-properties": { - - } - }, - { - "tenant": { - "tenant-id": "466979b815b5415ba14ada713e6e1846", - "tenant-name": "Integration", - "resource-version": "1508920100541" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "cloud-region": { - "cloud-owner": "pod25", - "cloud-region-id": "RegionOne", - "identity-url": "http://10.12.25.2:5000/v3", - "sriov-automation": false, - "resource-version": "1509048416263" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "esr-system-info": { - "esr-system-info-id": "432ac032-e996-41f2-84ed-9c7a1766eb29", - "system-name": "example-system-name-val-29070", - "type": "example-type-val-85254", - "vendor": "example-vendor-val-94515", - "version": "example-version-val-71880", - "service-url": "http://10.12.25.2:5000/v3", - "user-name": "demo", - "password": "onapdemo", - "system-type": "VIM", - "ssl-cacert": "example-ssl-cacert-val-75021", - "ssl-insecure": true, - "ip-address": "example-ip-address-val-44431", - "port": "example-port-val-93234", - "cloud-domain": "Default", - "default-tenant": "Integration", - "resource-version": "1508920101033" - }, - "extra-properties": { - - } - } - ] - } - } - ] - } - } - ] - } - }, - { - "vserver": { - "vserver-id": "33e16e02-098a-4f4e-a37f-b4e0307596c0", - "vserver-name": "vFW", - "vserver-name2": "vFW", - "prov-status": "Running", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/466979b815b5415ba14ada713e6e1846/servers/33e16e02-098a-4f4e-a37f-b4e0307596c0", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509047285114" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "vnfc": { - "vnfc-name": "vnfc-related-to-vserver-example", - "nfc-naming-code": "example-nfc-naming-code-val-78172", - "nfc-function": "example-nfc-function-val-56352", - "prov-status": "example-prov-status-val-10699", - "orchestration-status": "example-orchestration-status-val-68896", - "ipaddress-v4-oam-vip": "example-ipaddress-v4-oam-vip-val-71483", - "in-maint": true, - "is-closed-loop-disabled": true, - "group-notation": "example-group-notation-val-31912", - "resource-version": "1508800709772" - }, - "extra-properties": { - - } - }, - { - "vnfc": { - "vnfc-name": "VNFC_vGMUX_demo_app", - "nfc-naming-code": "vGMUXCODE", - "nfc-function": "vGMUX", - "prov-status": "Running", - "orchestration-status": "Running", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1509041573965" - }, - "extra-properties": { - - } - }, - { - "tenant": { - "tenant-id": "466979b815b5415ba14ada713e6e1846", - "tenant-name": "Integration", - "resource-version": "1508920100541" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "cloud-region": { - "cloud-owner": "pod25", - "cloud-region-id": "RegionOne", - "identity-url": "http://10.12.25.2:5000/v3", - "sriov-automation": false, - "resource-version": "1509048416263" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "esr-system-info": { - "esr-system-info-id": "432ac032-e996-41f2-84ed-9c7a1766eb29", - "system-name": "example-system-name-val-29070", - "type": "example-type-val-85254", - "vendor": "example-vendor-val-94515", - "version": "example-version-val-71880", - "service-url": "http://10.12.25.2:5000/v3", - "user-name": "demo", - "password": "onapdemo", - "system-type": "VIM", - "ssl-cacert": "example-ssl-cacert-val-75021", - "ssl-insecure": true, - "ip-address": "example-ip-address-val-44431", - "port": "example-port-val-93234", - "cloud-domain": "Default", - "default-tenant": "Integration", - "resource-version": "1508920101033" - }, - "extra-properties": { - - } - } - ] - } - } - ] - } - } - ] - } - } - ] - } - } + { + "model-name": "vFW", + "generic-vnf": { + "vnf-id": "vFirewall_demo_app", + "vnf-name": "vFirewall_demo_app", + "vnf-type": "vFW", + "service-id": "vFirewall_demo_app", + "orchestration-status": "running", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509456799110", + "model-invariant-id": "vFirewall", + "model-version-id": "vFW" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "vserver": { + "vserver-id": "5b06cf36-40a0-4bcb-bde9-849aa4702d67", + "vserver-name": "vFW", + "vserver-name2": "vFW", + "prov-status": "Running", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/466979b815b5415ba14ada713e6e1846/servers/5b06cf36-40a0-4bcb-bde9-849aa4702d67", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509047869791" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "vnfc": { + "vnfc-name": "VNFC_vGMUX_demo_app2", + "nfc-naming-code": "vGMUXCODE2", + "nfc-function": "vGMUX", + "prov-status": "Running", + "orchestration-status": "Error", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509407048855" + }, + "extra-properties": { + + } + }, + { + "tenant": { + "tenant-id": "466979b815b5415ba14ada713e6e1846", + "tenant-name": "Integration", + "resource-version": "1508920100541" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "cloud-region": { + "cloud-owner": "pod25", + "cloud-region-id": "RegionOne", + "identity-url": "http://10.12.25.2:5000/v3", + "sriov-automation": false, + "resource-version": "1509048416263" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "esr-system-info": { + "esr-system-info-id": "432ac032-e996-41f2-84ed-9c7a1766eb29", + "system-name": "example-system-name-val-29070", + "type": "example-type-val-85254", + "vendor": "example-vendor-val-94515", + "version": "example-version-val-71880", + "service-url": "http://10.12.25.2:5000/v3", + "user-name": "demo", + "password": "onapdemo", + "system-type": "VIM", + "ssl-cacert": "example-ssl-cacert-val-75021", + "ssl-insecure": true, + "ip-address": "example-ip-address-val-44431", + "port": "example-port-val-93234", + "cloud-domain": "Default", + "default-tenant": "Integration", + "resource-version": "1508920101033" + }, + "extra-properties": { + + } + } + ] + } + } + ] + } + } + ] + } + }, + { + "vserver": { + "vserver-id": "0c52905c-f682-42cf-bd52-e7f8953e80e3", + "vserver-name": "vFW", + "vserver-name2": "vFW", + "prov-status": "Running", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/466979b815b5415ba14ada713e6e1846/servers/0c52905c-f682-42cf-bd52-e7f8953e80e3", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509047548567" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "vnfc": { + "vnfc-name": "VNFC_vGMUX_demo_app3", + "nfc-naming-code": "vGMUXCODE3", + "nfc-function": "vGMUX", + "prov-status": "Running", + "orchestration-status": "Running", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509041912808" + }, + "extra-properties": { + + } + }, + { + "tenant": { + "tenant-id": "466979b815b5415ba14ada713e6e1846", + "tenant-name": "Integration", + "resource-version": "1508920100541" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "cloud-region": { + "cloud-owner": "pod25", + "cloud-region-id": "RegionOne", + "identity-url": "http://10.12.25.2:5000/v3", + "sriov-automation": false, + "resource-version": "1509048416263" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "esr-system-info": { + "esr-system-info-id": "432ac032-e996-41f2-84ed-9c7a1766eb29", + "system-name": "example-system-name-val-29070", + "type": "example-type-val-85254", + "vendor": "example-vendor-val-94515", + "version": "example-version-val-71880", + "service-url": "http://10.12.25.2:5000/v3", + "user-name": "demo", + "password": "onapdemo", + "system-type": "VIM", + "ssl-cacert": "example-ssl-cacert-val-75021", + "ssl-insecure": true, + "ip-address": "example-ip-address-val-44431", + "port": "example-port-val-93234", + "cloud-domain": "Default", + "default-tenant": "Integration", + "resource-version": "1508920101033" + }, + "extra-properties": { + + } + } + ] + } + } + ] + } + } + ] + } + }, + { + "vserver": { + "vserver-id": "33e16e02-098a-4f4e-a37f-b4e0307596c0", + "vserver-name": "vFW", + "vserver-name2": "vFW", + "prov-status": "Running", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/466979b815b5415ba14ada713e6e1846/servers/33e16e02-098a-4f4e-a37f-b4e0307596c0", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509047285114" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "vnfc": { + "vnfc-name": "vnfc-related-to-vserver-example", + "nfc-naming-code": "example-nfc-naming-code-val-78172", + "nfc-function": "example-nfc-function-val-56352", + "prov-status": "example-prov-status-val-10699", + "orchestration-status": "example-orchestration-status-val-68896", + "ipaddress-v4-oam-vip": "example-ipaddress-v4-oam-vip-val-71483", + "in-maint": true, + "is-closed-loop-disabled": true, + "group-notation": "example-group-notation-val-31912", + "resource-version": "1508800709772" + }, + "extra-properties": { + + } + }, + { + "vnfc": { + "vnfc-name": "VNFC_vGMUX_demo_app", + "nfc-naming-code": "vGMUXCODE", + "nfc-function": "vGMUX", + "prov-status": "Running", + "orchestration-status": "Running", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1509041573965" + }, + "extra-properties": { + + } + }, + { + "tenant": { + "tenant-id": "466979b815b5415ba14ada713e6e1846", + "tenant-name": "Integration", + "resource-version": "1508920100541" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "cloud-region": { + "cloud-owner": "pod25", + "cloud-region-id": "RegionOne", + "identity-url": "http://10.12.25.2:5000/v3", + "sriov-automation": false, + "resource-version": "1509048416263" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "esr-system-info": { + "esr-system-info-id": "432ac032-e996-41f2-84ed-9c7a1766eb29", + "system-name": "example-system-name-val-29070", + "type": "example-type-val-85254", + "vendor": "example-vendor-val-94515", + "version": "example-version-val-71880", + "service-url": "http://10.12.25.2:5000/v3", + "user-name": "demo", + "password": "onapdemo", + "system-type": "VIM", + "ssl-cacert": "example-ssl-cacert-val-75021", + "ssl-insecure": true, + "ip-address": "example-ip-address-val-44431", + "port": "example-port-val-93234", + "cloud-domain": "Default", + "default-tenant": "Integration", + "resource-version": "1508920101033" + }, + "extra-properties": { + + } + } + ] + } + } + ] + } + } + ] + } + } + ] + } + } ] diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json index a1a1e19bc..95517266d 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json @@ -1,209 +1,209 @@ { - "inventory-response-item": [ - { - "vserver": { - "vserver-id": "6ed3642c-f7a1-4a7c-9290-3d51fe1531eb", - "vserver-name": "zdfw1lb01lb02", - "vserver-name2": "zdfw1lb01lb02", - "prov-status": "ACTIVE", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/6ed3642c-f7a1-4a7c-9290-3d51fe1531eb", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1510606403522" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "model-name": "vLoadBalancer", - "generic-vnf": { - "vnf-id": "db373a8d-f7be-4d02-8ac8-6ca4c305d144", - "vnf-name": "Vfmodule_vLB1113", - "vnf-type": "vLoadBalancer-1106/vLoadBalancer 0", - "service-id": "66f157fc-4148-4880-95f5-e120677e98d1", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1510604011851", - "model-invariant-id": "cee050ed-92a5-494f-ab04-234307a846dc", - "model-version-id": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2", - "model-customization-id": "1983c783-444f-4e79-af3a-85e5d49628f3", - "nf-type": "", - "nf-function": "", - "nf-role": "", - "nf-naming-code": "" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-version-id", - "property-value": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vLoadBalancer" - }, - { - "property-name": "model.model-type", - "property-value": "resource" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "cee050ed-92a5-494f-ab04-234307a846dc" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "model-name": "vLoadBalancer-1106", - "service-instance": { - "service-instance-id": "3b12f31f-8f2d-4f5c-b875-61ff1194b941", - "service-instance-name": "vLoadBalancer-1113", - "model-invariant-id": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a", - "model-version-id": "732d4692-4b97-46f9-a996-0b3339e88c50", - "resource-version": "1510603936425" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-version-id", - "property-value": "732d4692-4b97-46f9-a996-0b3339e88c50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vLoadBalancer-1106" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vloadbalancer..base_vlb..module-0", - "vf-module": { - "vf-module-id": "e6b3e3eb-34e1-4c00-b8c1-2a4fbe479b12", - "vf-module-name": "Vfmodule_vLB1113-1", - "heat-stack-id": "Vfmodule_vLB1113-1/3dd6d900-772f-4fcc-a0cb-e250ab2bb4db", - "orchestration-status": "active", - "is-base-vf-module": true, - "resource-version": "1510604612557", - "model-invariant-id": "6d760188-9a24-451a-b05b-e08b86cb94f2", - "model-version-id": "93facad9-55f2-4fe0-9574-814c2bc2d071", - "model-customization-id": "93fd5bd4-8051-4074-8530-c0c504604df5", - "module-index": 0 - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-version-id", - "property-value": "93facad9-55f2-4fe0-9574-814c2bc2d071" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vloadbalancer..base_vlb..module-0" - }, - { - "property-name": "model.model-type", - "property-value": "resource" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "6d760188-9a24-451a-b05b-e08b86cb94f2" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1" - } - ] - } - }, - { - "model-name": "Vloadbalancer..dnsscaling..module-1", - "vf-module": { - "vf-module-id": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144", - "vf-module-name": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144", - "is-base-vf-module": false, - "resource-version": "1510610079687", - "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c", - "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-version-id", - "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vloadbalancer..dnsscaling..module-1" - }, - { - "property-name": "model.model-type", - "property-value": "resource" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1" - } - ] - } - } - ] - } - }, - { - "tenant": { - "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd", - "tenant-name": "Integration-SB-00", - "resource-version": "1509587770200" - }, - "extra-properties": { - - }, - "inventory-response-items": { - "inventory-response-item": [ - { - "cloud-region": { - "cloud-owner": "CloudOwner", - "cloud-region-id": "RegionOne", - "cloud-type": "SharedNode", - "owner-defined-type": "OwnerType", - "cloud-region-version": "v1", - "cloud-zone": "CloudZone", - "sriov-automation": false, - "resource-version": "1509587770092" - }, - "extra-properties": { - - } - } - ] - } - } - ] - } - } - ] + "inventory-response-item": [ + { + "vserver": { + "vserver-id": "6ed3642c-f7a1-4a7c-9290-3d51fe1531eb", + "vserver-name": "zdfw1lb01lb02", + "vserver-name2": "zdfw1lb01lb02", + "prov-status": "ACTIVE", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/6ed3642c-f7a1-4a7c-9290-3d51fe1531eb", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1510606403522" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "vLoadBalancer", + "generic-vnf": { + "vnf-id": "db373a8d-f7be-4d02-8ac8-6ca4c305d144", + "vnf-name": "Vfmodule_vLB1113", + "vnf-type": "vLoadBalancer-1106/vLoadBalancer 0", + "service-id": "66f157fc-4148-4880-95f5-e120677e98d1", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1510604011851", + "model-invariant-id": "cee050ed-92a5-494f-ab04-234307a846dc", + "model-version-id": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2", + "model-customization-id": "1983c783-444f-4e79-af3a-85e5d49628f3", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-version-id", + "property-value": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vLoadBalancer" + }, + { + "property-name": "model.model-type", + "property-value": "resource" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "cee050ed-92a5-494f-ab04-234307a846dc" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "vLoadBalancer-1106", + "service-instance": { + "service-instance-id": "3b12f31f-8f2d-4f5c-b875-61ff1194b941", + "service-instance-name": "vLoadBalancer-1113", + "model-invariant-id": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a", + "model-version-id": "732d4692-4b97-46f9-a996-0b3339e88c50", + "resource-version": "1510603936425" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-version-id", + "property-value": "732d4692-4b97-46f9-a996-0b3339e88c50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vLoadBalancer-1106" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "Vloadbalancer..base_vlb..module-0", + "vf-module": { + "vf-module-id": "e6b3e3eb-34e1-4c00-b8c1-2a4fbe479b12", + "vf-module-name": "Vfmodule_vLB1113-1", + "heat-stack-id": "Vfmodule_vLB1113-1/3dd6d900-772f-4fcc-a0cb-e250ab2bb4db", + "orchestration-status": "active", + "is-base-vf-module": true, + "resource-version": "1510604612557", + "model-invariant-id": "6d760188-9a24-451a-b05b-e08b86cb94f2", + "model-version-id": "93facad9-55f2-4fe0-9574-814c2bc2d071", + "model-customization-id": "93fd5bd4-8051-4074-8530-c0c504604df5", + "module-index": 0 + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-version-id", + "property-value": "93facad9-55f2-4fe0-9574-814c2bc2d071" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Vloadbalancer..base_vlb..module-0" + }, + { + "property-name": "model.model-type", + "property-value": "resource" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "6d760188-9a24-451a-b05b-e08b86cb94f2" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1" + } + ] + } + }, + { + "model-name": "Vloadbalancer..dnsscaling..module-1", + "vf-module": { + "vf-module-id": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144", + "vf-module-name": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144", + "is-base-vf-module": false, + "resource-version": "1510610079687", + "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c", + "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-version-id", + "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Vloadbalancer..dnsscaling..module-1" + }, + { + "property-name": "model.model-type", + "property-value": "resource" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1" + } + ] + } + } + ] + } + }, + { + "tenant": { + "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd", + "tenant-name": "Integration-SB-00", + "resource-version": "1509587770200" + }, + "extra-properties": { + + }, + "inventory-response-items": { + "inventory-response-item": [ + { + "cloud-region": { + "cloud-owner": "CloudOwner", + "cloud-region-id": "RegionOne", + "cloud-type": "SharedNode", + "owner-defined-type": "OwnerType", + "cloud-region-version": "v1", + "cloud-zone": "CloudZone", + "sriov-automation": false, + "resource-version": "1509587770092" + }, + "extra-properties": { + + } + } + ] + } + } + ] + } + } + ] } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json index 4233f3b57..9a501e44d 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json @@ -1,22 +1,22 @@ { - "input": { - "action": "HealthCheck", - "action-identifiers": { - "vnf-id": "49414df5-3482-4fd8-9952-c463dff2770b" - }, - "common-header": { - "request-id": "afr-request3", - "originator-id": "AFR", - "api-ver": "2.15", - "sub-request-id": "AFR-subrequest", - "timestamp": "2017-11-06T15:15:18.97Z", - "flags": { - "ttl": "10000", - "force": "TRUE", - "mode": "EXCLUSIVE" - } - }, - "payload": "{\"host-ip-address\":\"131.160.203.125\",\"input.url\":\"131.160.203.125/afr\",\"request-action-type\":\"GET\",\"request-action\":\"AFR\"}" - } + "input": { + "action": "HealthCheck", + "action-identifiers": { + "vnf-id": "49414df5-3482-4fd8-9952-c463dff2770b" + }, + "common-header": { + "request-id": "afr-request3", + "originator-id": "AFR", + "api-ver": "2.15", + "sub-request-id": "AFR-subrequest", + "timestamp": "2017-11-06T15:15:18.97Z", + "flags": { + "ttl": "10000", + "force": "TRUE", + "mode": "EXCLUSIVE" + } + }, + "payload": "{\"host-ip-address\":\"131.160.203.125\",\"input.url\":\"131.160.203.125/afr\",\"request-action-type\":\"GET\",\"request-action\":\"AFR\"}" + } } diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json index 2a1911445..e9972131e 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json @@ -1,18 +1,18 @@ { - "address0" : { - "streetaddress" : "1600 Pennsylvania Avenue", - "city" : "Washington DC" - }, - "address1" : { - "streetaddress" : "Somewhere", - "city" : "Over the rainbow" - }, - "address2" : { - "streetaddress" : "221 B Baker St.", - "city" : "London" - }, - "address3" : { - "streetaddress" : "Wayne Manor", - "city" : "Gotham City" - } + "address0" : { + "streetaddress" : "1600 Pennsylvania Avenue", + "city" : "Washington DC" + }, + "address1" : { + "streetaddress" : "Somewhere", + "city" : "Over the rainbow" + }, + "address2" : { + "streetaddress" : "221 B Baker St.", + "city" : "London" + }, + "address3" : { + "streetaddress" : "Wayne Manor", + "city" : "Gotham City" + } }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json index fa23c8328..6116db4f3 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json @@ -1,18 +1,18 @@ { - "address.0" : { - "street-address" : "1600 Pennsylvania Avenue", - "the.city" : "Washington DC" - }, - "address.1" : { - "street-address" : "Somewhere", - "the.city" : "Over the rainbow" - }, - "address.2" : { - "street-address" : "221 B Baker St.", - "the.city" : "London" - }, - "address.3" : { - "street-address" : "Wayne Manor", - "the.city" : "Gotham City" - } + "address.0" : { + "street-address" : "1600 Pennsylvania Avenue", + "the.city" : "Washington DC" + }, + "address.1" : { + "street-address" : "Somewhere", + "the.city" : "Over the rainbow" + }, + "address.2" : { + "street-address" : "221 B Baker St.", + "the.city" : "London" + }, + "address.3" : { + "street-address" : "Wayne Manor", + "the.city" : "Gotham City" + } }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json index 7e4da3391..1d0c6e2a1 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json @@ -1,5 +1,5 @@ { - "nameSpace" : "com.ericsson.apex.domains.vpn.events", + "nameSpace" : "org.onap.policy.apex.domains.vpn.events", "name" : "VPNTriggerEvent", "version" : "0.0.1", "source" : "VPNSLA", diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json index 4fd33a6eb..67f03344b 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json @@ -1,6 +1,6 @@ { - "name": "Alyssa", - "favourite_number": 256, - "favourite_colour": null, - "favourite_group": "U2" + "name": "Alyssa", + "favourite_number": 256, + "favourite_colour": null, + "favourite_group": "U2" }
\ No newline at end of file diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json index f62d25b31..35d20579f 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json @@ -1,5 +1,5 @@ { - "name": "Claire", - "favourite_number": 123, - "favourite_colour": null + "name": "Claire", + "favourite_number": 123, + "favourite_colour": null }
\ No newline at end of file diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java index f2c59453c..e80efa2ee 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketConsumer.java @@ -24,10 +24,10 @@ import java.util.EnumMap; import java.util.Map; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageClient; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageServer; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessager; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessager; import org.onap.policy.apex.core.infrastructure.threading.ApplicationThreadFactory; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.apex.service.engine.event.ApexEventConsumer; @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class ApexWebSocketConsumer implements ApexEventConsumer, WSStringMessageListener, Runnable { +public class ApexWebSocketConsumer implements ApexEventConsumer, WsStringMessageListener, Runnable { private static final int WEB_SOCKET_WAIT_SLEEP_TIME = 100; // Get a reference to the logger @@ -54,7 +54,7 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WSStringMessage private WEBSOCKETCarrierTechnologyParameters webSocketConsumerProperties; // The web socket messager, may be WS a server or a client - private WSStringMessager wsStringMessager; + private WsStringMessager wsStringMessager; // The event receiver that will receive events from this consumer private ApexEventReceiver eventReceiver; @@ -89,10 +89,10 @@ public class ApexWebSocketConsumer implements ApexEventConsumer, WSStringMessage // Check if this is a server or a client Web Socket if (webSocketConsumerProperties.isWsClient()) { // Create a WS client - wsStringMessager = new WSStringMessageClient(webSocketConsumerProperties.getHost(), + wsStringMessager = new WsStringMessageClient(webSocketConsumerProperties.getHost(), webSocketConsumerProperties.getPort()); } else { - wsStringMessager = new WSStringMessageServer(webSocketConsumerProperties.getPort()); + wsStringMessager = new WsStringMessageServer(webSocketConsumerProperties.getPort()); } // Start reception of event strings on the web socket diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java index 1fd146824..6be8a3d1a 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/main/java/org/onap/policy/apex/plugins/event/carrier/websocket/ApexWebSocketProducer.java @@ -24,10 +24,10 @@ import java.util.EnumMap; import java.util.Map; import org.onap.policy.apex.core.infrastructure.messaging.MessagingException; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageClient; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageListener; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessageServer; -import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WSStringMessager; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageClient; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageListener; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessageServer; +import org.onap.policy.apex.core.infrastructure.messaging.stringmessaging.WsStringMessager; import org.onap.policy.apex.service.engine.event.ApexEventException; import org.onap.policy.apex.service.engine.event.ApexEventProducer; import org.onap.policy.apex.service.engine.event.PeeredReference; @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * * @author Liam Fallon (liam.fallon@ericsson.com) */ -public class ApexWebSocketProducer implements ApexEventProducer, WSStringMessageListener { +public class ApexWebSocketProducer implements ApexEventProducer, WsStringMessageListener { // Get a reference to the logger private static final Logger LOGGER = LoggerFactory.getLogger(ApexWebSocketProducer.class); @@ -50,7 +50,7 @@ public class ApexWebSocketProducer implements ApexEventProducer, WSStringMessage private WEBSOCKETCarrierTechnologyParameters webSocketProducerProperties; // The web socket messager, may be WS a server or a client - private WSStringMessager wsStringMessager; + private WsStringMessager wsStringMessager; // The name for this producer private String name = null; @@ -75,10 +75,10 @@ public class ApexWebSocketProducer implements ApexEventProducer, WSStringMessage // Check if this is a server or a client Web Socket if (webSocketProducerProperties.isWsClient()) { // Create a WS client - wsStringMessager = new WSStringMessageClient(webSocketProducerProperties.getHost(), + wsStringMessager = new WsStringMessageClient(webSocketProducerProperties.getHost(), webSocketProducerProperties.getPort()); } else { - wsStringMessager = new WSStringMessageServer(webSocketProducerProperties.getPort()); + wsStringMessager = new WsStringMessageServer(webSocketProducerProperties.getPort()); } // Start reception of event strings on the web socket |