From 7e11a36ceed232b9dd8aff62464a582b204f7588 Mon Sep 17 00:00:00 2001 From: jimmy Date: Tue, 28 Jan 2020 14:46:42 -0500 Subject: Fixing descriptions on duplicated xml-props blocks Issue-ID: AAI-2687 Change-Id: I84eeeba0c72693f0b1e43e22b760e1c2c26112b5 Signed-off-by: Jimmy Forsyth --- .../resources/onap/aai_schema/aai_schema_v10.xsd | 14 +- .../resources/onap/aai_schema/aai_schema_v11.xsd | 16 +- .../resources/onap/aai_schema/aai_schema_v12.xsd | 18 +- .../resources/onap/aai_schema/aai_schema_v13.xsd | 18 +- .../resources/onap/aai_schema/aai_schema_v14.xsd | 20 +- .../resources/onap/aai_schema/aai_schema_v15.xsd | 20 +- .../resources/onap/aai_schema/aai_schema_v16.xsd | 20 +- .../resources/onap/aai_schema/aai_schema_v17.xsd | 36 +- .../resources/onap/aai_schema/aai_schema_v18.xsd | 36 +- .../resources/onap/aai_schema/aai_schema_v19.xsd | 1016 ++++++++++---------- .../main/resources/onap/oxm/v10/aai_oxm_v10.xml | 71 +- .../main/resources/onap/oxm/v11/aai_oxm_v11.xml | 70 +- .../main/resources/onap/oxm/v12/aai_oxm_v12.xml | 89 +- .../main/resources/onap/oxm/v13/aai_oxm_v13.xml | 107 +-- .../main/resources/onap/oxm/v14/aai_oxm_v14.xml | 115 +-- .../main/resources/onap/oxm/v15/aai_oxm_v15.xml | 117 ++- .../main/resources/onap/oxm/v16/aai_oxm_v16.xml | 117 ++- .../main/resources/onap/oxm/v17/aai_oxm_v17.xml | 81 +- .../main/resources/onap/oxm/v18/aai_oxm_v18.xml | 81 +- .../main/resources/onap/oxm/v19/aai_oxm_v19.xml | 81 +- 20 files changed, 1016 insertions(+), 1127 deletions(-) (limited to 'aai-schema/src/main') diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd index 5dbe35b..d304f90 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd @@ -561,7 +561,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1283,7 +1283,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2214,7 +2214,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -2761,7 +2761,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -5336,7 +5336,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -5677,7 +5677,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -5757,7 +5757,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd index d1f386e..69df34d 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd @@ -561,7 +561,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1325,7 +1325,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -1895,7 +1895,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2647,7 +2647,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3402,7 +3402,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -6337,7 +6337,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -6678,7 +6678,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -6786,7 +6786,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd index 811af15..1174be8 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1332,7 +1332,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2138,7 +2138,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2768,7 +2768,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -2886,7 +2886,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3597,7 +3597,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -6539,7 +6539,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -6887,7 +6887,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -6995,7 +6995,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd index 29d446c..95ee174 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1332,7 +1332,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2138,7 +2138,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2768,7 +2768,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -2886,7 +2886,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3583,7 +3583,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -6518,7 +6518,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -6880,7 +6880,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -6988,7 +6988,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd index 8bb3027..c133411 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1420,7 +1420,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2233,7 +2233,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2911,7 +2911,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3029,7 +3029,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3074,7 +3074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") @@ -3779,7 +3779,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -6934,7 +6934,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -7369,7 +7369,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -7477,7 +7477,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd index bb08648..66593d5 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2925,7 +2925,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3043,7 +3043,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3088,7 +3088,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") @@ -3793,7 +3793,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -7008,7 +7008,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -7520,7 +7520,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -7628,7 +7628,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd index 991c5cf..76b94da 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2939,7 +2939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3057,7 +3057,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3102,7 +3102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") @@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -7069,7 +7069,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -7581,7 +7581,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -7689,7 +7689,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd index d981db9..5910474 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2939,7 +2939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3057,7 +3057,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3102,7 +3102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") @@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -4495,14 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Orchestration type of this model.") - - - - + + + + @org.onap.aai.annotations.Metadata(description="Orchestration type of this model.") + + + + @@ -7076,7 +7076,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -7588,7 +7588,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -7696,7 +7696,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd index 8577a93..dec707e 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2939,7 +2939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3057,7 +3057,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3102,7 +3102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") @@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -4495,14 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Orchestration type of this model.") - - - - + + + + @org.onap.aai.annotations.Metadata(description="Orchestration type of this model.") + + + + @@ -7076,7 +7076,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -7588,7 +7588,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -7696,7 +7696,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd index a9f56c4..f4b6bf2 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd @@ -568,7 +568,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.") @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.") @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.") @@ -2508,17 +2508,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed") + @org.onap.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.") - + - @org.onap.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.") + @org.onap.aai.annotations.Metadata(description="Domain type of the SDNC controllerr.") @@ -2543,7 +2543,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @org.onap.aai.annotations.Metadata(description="Indicates the physical properties of the interface.") @@ -2960,7 +2960,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of compute hosts.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.") @@ -3078,7 +3078,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") @@ -3123,7 +3123,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.") @@ -3316,7 +3316,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @org.onap.aai.annotations.Metadata(description="Domain type of the SDNC controllerr.") @@ -3654,7 +3654,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @org.onap.aai.annotations.Metadata(description="Rate of the service instance.") @@ -3910,7 +3910,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.") @@ -4551,14 +4551,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="Orchestration type of this model.") - - - - + + + + @org.onap.aai.annotations.Metadata(description="Orchestration type of this model.") + + + + @@ -4790,7 +4790,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc,intra-optical-domain, inter-optical-domain, inter-operator-domain") + @org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc") @@ -4808,14 +4808,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + @org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - + @org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link") @@ -7153,7 +7153,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of VNFs") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs") @@ -7604,10 +7604,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="true, indicate abstract node.") + @org.onap.aai.annotations.Metadata(description="true, indicate abstract node") @@ -7672,7 +7672,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.") @@ -7780,7 +7780,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") + @org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces") @@ -9890,67 +9890,125 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") + @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") - - - - - - - @org.onap.aai.annotations.Metadata(description="Termination point ID.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid") + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") + + + + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Tel no. of contact") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="e-mail of contact") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") @@ -9965,201 +10023,304 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") + @org.onap.aai.annotations.Metadata(description="Collection of contacts") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,linkProtectionType,accessType,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") + @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + + + + - @org.onap.aai.annotations.Metadata(description="Bandwidth available on link.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") - + - @org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") - + - @org.onap.aai.annotations.Metadata(description="The value of available bandwidth.") + @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") - + - @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") - + - @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") - + - @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + @org.onap.aai.annotations.Metadata(description="Version") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + @org.onap.aai.annotations.Metadata(description="Description") - + - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") - - - - - - - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + - + - @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") + @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") - + + - + + + + + + - @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") + @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - - - - - - - @org.onap.aai.annotations.Metadata(description="First number in the label range") - - - - - - - @org.onap.aai.annotations.Metadata(description="Last number in the label range") - - - - - - - @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") - - - - + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") + + + + + + + + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") + + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") + + + + - @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - + + + + + + + + @org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}") + + + + - @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the UNI") - + - @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") + @org.onap.aai.annotations.Metadata(description="Termination point ID.") - + - @org.onap.aai.annotations.Metadata(description="Priority.") + @org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.") @@ -10209,86 +10370,72 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") + @org.onap.aai.annotations.Metadata(description="Collection of User network interface.") - + - + - @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") + @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,linkProtectionType,accessType,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") - - - - - - - @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") - - - - + - @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the TE link attribute") - + - @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + @org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native") - + - @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") + @org.onap.aai.annotations.Metadata(description="Indicate desired protection type of the link e.g, unprotected, shared or 1+1") - + - @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") + @org.onap.aai.annotations.Metadata(description="Indicate link access type e.g, point-to-point or multi-access.") - + - @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") + @org.onap.aai.annotations.Metadata(description="Bandwidth available on link.") - + - @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") + @org.onap.aai.annotations.Metadata(description="The type of ODU e.g, ODU1, ODU2, ODU3, ODU4.") - + - @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") + @org.onap.aai.annotations.Metadata(description="The value of available bandwidth.") @@ -10338,141 +10485,121 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid") - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV",uniqueProps="aai-uuid",indexedProps="aai-uuid") + @org.onap.aai.annotations.Metadata(description="Collection of TE link attributes.") - - - - - - - - - - - - - - - - + - + - @org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}",requiredProps="contact-name") + @org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the label restriction") - + - @org.onap.aai.annotations.Metadata(description="Tel no. of contact") + @org.onap.aai.annotations.Metadata(description="First number in the label range") - + - @org.onap.aai.annotations.Metadata(description="e-mail of contact") + @org.onap.aai.annotations.Metadata(description="Last number in the label range") - + - @org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM") + @org.onap.aai.annotations.Metadata(description="Bitmap of available labels starting from label-start to label-end.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Step of labels in label range.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate wheather range-bitmap items are inclusive or exclusive.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate the label range e.g.trib-slot, trib-port") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate trib slot granularity.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Priority.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -10487,111 +10614,121 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(description="Collection of contacts") - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.") + @org.onap.aai.annotations.Metadata(description="Collection of Label Restriction.") - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - @org.onap.aai.annotations.Metadata(description="Allows for legacy POST of old-style and new-style models",requiredProps="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version") + @org.onap.aai.annotations.Metadata(description="Instance of an tunnel termination point",indexedProps="ttp-id,tunnel-tp-id,name,operational-status,model-invariant-id,model-version-id",searchable="ttp-id",uniqueProps="ttp-id",container="tunnel-termination-points",namespace="network",requiredProps="ttp-id",uriTemplate="/network/tunnel-termination-points/tunnel-termination-point/{ttp-id}") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC") + @org.onap.aai.annotations.Metadata(isKey=true,description="Id that identifies the tunnel termination point") - + - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") + @org.onap.aai.annotations.Metadata(description="TTP ID discovered from controller") - + - @org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") + @org.onap.aai.annotations.Metadata(description="Name of tunnel termination point") - + - @org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") + @org.onap.aai.annotations.Metadata(description="Admin status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") - + - @org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") + @org.onap.aai.annotations.Metadata(description="Operational status of TTP e.g, up,down,testing,preparing-maintenance,maintenance.") - + - @org.onap.aai.annotations.Metadata(description="Version") + @org.onap.aai.annotations.Metadata(description="Indicate switching capability of TTP e.g,PSC-1, EVPL,L2SC,TDM,OTN.") - + - @org.onap.aai.annotations.Metadata(description="Description") + @org.onap.aai.annotations.Metadata(description="Encoding support by the TTP e.g, packet,ethernet,PDH,SDH,digital-wrapper,lambda,fiber,ODUK,line.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indicate supported protection type of this TTP e.g, unprotected,reroute,reroute-extra,1-for-n,unidir-1-to-1.") + + + + + + + @org.onap.aai.annotations.Metadata(description="correlation between related objects in ETH and OTN topology.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the link to get more information for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") @@ -10602,160 +10739,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - - @org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties") - - - - - - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") - - - - - - - - + - @org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id") + @org.onap.aai.annotations.Metadata(description="Collection of Tunnel Termination Point.") - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - + diff --git a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml index 9397c15..88bfd31 100644 --- a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml +++ b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml @@ -1,26 +1,24 @@ +--> + @@ -444,16 +442,15 @@ - - - + - + + @@ -563,16 +560,15 @@ - - - + - + + @@ -1497,16 +1493,15 @@ - - - + - + + @@ -2029,16 +2024,15 @@ - - - + - + + @@ -3547,16 +3541,15 @@ - - - + - + + @@ -4075,16 +4068,15 @@ - - - + - + + @@ -4218,16 +4210,15 @@ - - - + - + + @@ -4381,7 +4372,7 @@ - + @@ -4411,7 +4402,7 @@ - + @@ -5512,7 +5503,7 @@ - + diff --git a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml index 2b9f65e..5df8b38 100644 --- a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml @@ -1,26 +1,24 @@ +--> + @@ -373,14 +371,13 @@ - - - + + @@ -735,16 +732,15 @@ - - - + - + + @@ -854,16 +850,15 @@ - - - + - + + @@ -1820,16 +1815,15 @@ - - - + - + + @@ -2413,16 +2407,15 @@ - - - + - + + @@ -4235,16 +4228,15 @@ - - - + - + + @@ -4820,16 +4812,15 @@ - - - + - + + @@ -4963,16 +4954,15 @@ - - - + - + + diff --git a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml index 3d984fc..f260850 100644 --- a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml @@ -1,22 +1,4 @@ - + @@ -369,15 +351,14 @@ - - - + - + + @@ -821,16 +802,15 @@ - - - + - + + @@ -940,16 +920,15 @@ - - - + - + + @@ -1911,16 +1890,15 @@ - - - + - + + @@ -2509,16 +2487,15 @@ - - - + - + + @@ -4344,16 +4321,15 @@ - - - + - + + @@ -4929,16 +4905,15 @@ - - - + - + + @@ -5077,16 +5052,15 @@ - - - + - + + @@ -5260,7 +5234,7 @@ - + @@ -5290,7 +5264,7 @@ - + @@ -6431,7 +6405,7 @@ - + @@ -6688,16 +6662,15 @@ - - - + - + + diff --git a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml index be34895..9f74c54 100644 --- a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml +++ b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml @@ -1,22 +1,24 @@ + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= +--> + @@ -369,15 +371,14 @@ - - - + - + + @@ -821,16 +822,15 @@ - - - + - + + @@ -940,16 +940,15 @@ - - - + - + + @@ -1911,16 +1910,15 @@ - - - + - + + @@ -2502,16 +2500,15 @@ - - - + - + + @@ -4318,16 +4315,15 @@ - - - + - + + @@ -4910,16 +4906,15 @@ - - - + - + + @@ -5075,16 +5070,15 @@ - - - + - + + @@ -5258,7 +5252,7 @@ - + @@ -5288,7 +5282,7 @@ - + @@ -6424,7 +6418,7 @@ - + @@ -6681,16 +6675,15 @@ - - - + - + + diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml index c7d8d97..a73f802 100644 --- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml +++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml @@ -1,23 +1,24 @@ + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= +--> + @@ -370,15 +371,14 @@ - - - + - + + @@ -822,16 +822,15 @@ - - - + - + + @@ -941,16 +940,15 @@ - - - + - + + @@ -1986,16 +1984,15 @@ - - - + - + + @@ -2623,16 +2620,15 @@ - - - + - + + @@ -4512,16 +4508,15 @@ - - - + - + + @@ -5104,16 +5099,15 @@ - - - + - + + @@ -5329,16 +5323,15 @@ - - - + - + + @@ -5512,7 +5505,7 @@ - + @@ -5542,7 +5535,7 @@ - + @@ -6696,7 +6689,7 @@ - + @@ -6953,16 +6946,15 @@ - - - + - + + @@ -7474,16 +7466,15 @@ - - - + - + + diff --git a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml index e7aba88..64ea84d 100644 --- a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml +++ b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml @@ -1,23 +1,24 @@ + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= +--> + @@ -371,15 +372,14 @@ - - - + - + + @@ -828,16 +828,15 @@ - - - + - + + @@ -947,16 +946,15 @@ - - - + - + + @@ -1997,16 +1995,15 @@ - - - + - + + @@ -2695,16 +2692,15 @@ - - - + - + + @@ -4585,16 +4581,15 @@ - - - + - + + @@ -5177,16 +5172,15 @@ - - - + - + + @@ -5408,16 +5402,15 @@ - - - + - + + @@ -5591,7 +5584,7 @@ - + @@ -5621,7 +5614,7 @@ - + @@ -6775,7 +6768,7 @@ - + @@ -7032,16 +7025,15 @@ - - - + - + + @@ -7553,16 +7545,15 @@ - - - + - + + @@ -8660,7 +8651,7 @@ - + diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml index 78f71f5..c77347d 100644 --- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml +++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml @@ -1,23 +1,24 @@ + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= +--> + @@ -415,15 +416,14 @@ - - - + - + + @@ -884,16 +884,15 @@ - - - + - + + @@ -1003,16 +1002,15 @@ - - - + - + + @@ -2053,16 +2051,15 @@ - - - + - + + @@ -2751,16 +2748,15 @@ - - - + - + + @@ -4641,16 +4637,15 @@ - - - + - + + @@ -5233,16 +5228,15 @@ - - - + - + + @@ -5464,16 +5458,15 @@ - - - + - + + @@ -5647,7 +5640,7 @@ - + @@ -5677,7 +5670,7 @@ - + @@ -6831,7 +6824,7 @@ - + @@ -7094,16 +7087,15 @@ - - - + - + + @@ -7620,16 +7612,15 @@ - - - + - + + @@ -8727,7 +8718,7 @@ - + diff --git a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml index c5ac8b5..fe9cd15 100644 --- a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml +++ b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml @@ -17,7 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - --> +--> + @@ -415,15 +416,14 @@ - - - + - + + @@ -884,16 +884,15 @@ - - - + - + + @@ -1003,16 +1002,15 @@ - - - + - + + @@ -2053,16 +2051,15 @@ - - - + - + + @@ -2751,16 +2748,15 @@ - - - + - + + @@ -4641,16 +4637,15 @@ - - - + - + + @@ -5233,16 +5228,15 @@ - - - + - + + @@ -5464,16 +5458,15 @@ - - - + - + + @@ -5647,7 +5640,7 @@ - + @@ -5677,7 +5670,7 @@ - + @@ -6837,7 +6830,7 @@ - + @@ -7100,16 +7093,15 @@ - - - + - + + @@ -7626,16 +7618,15 @@ - - - + - + + @@ -8733,7 +8724,7 @@ - + diff --git a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml index 855248c..64eb284 100644 --- a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml +++ b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml @@ -17,7 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - --> +--> + @@ -415,15 +416,14 @@ - - - + - + + @@ -884,16 +884,15 @@ - - - + - + + @@ -1003,16 +1002,15 @@ - - - + - + + @@ -2053,16 +2051,15 @@ - - - + - + + @@ -2751,16 +2748,15 @@ - - - + - + + @@ -4641,16 +4637,15 @@ - - - + - + + @@ -5233,16 +5228,15 @@ - - - + - + + @@ -5464,16 +5458,15 @@ - - - + - + + @@ -5647,7 +5640,7 @@ - + @@ -5677,7 +5670,7 @@ - + @@ -6837,7 +6830,7 @@ - + @@ -7100,16 +7093,15 @@ - - - + - + + @@ -7626,16 +7618,15 @@ - - - + - + + @@ -8733,7 +8724,7 @@ - + diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml index 17653bc..d205af8 100644 --- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml +++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml @@ -17,7 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - --> +--> + @@ -420,15 +421,14 @@ - - - + - + + @@ -889,16 +889,15 @@ - - - + - + + @@ -1008,16 +1007,15 @@ - - - + - + + @@ -2058,16 +2056,15 @@ - - - + - + + @@ -2771,16 +2768,15 @@ - - - + - + + @@ -4691,16 +4687,15 @@ - - - + - + + @@ -5288,16 +5283,15 @@ - - - + - + + @@ -5524,16 +5518,15 @@ - - - + - + + @@ -5707,7 +5700,7 @@ - + @@ -5737,7 +5730,7 @@ - + @@ -6897,7 +6890,7 @@ - + @@ -7160,16 +7153,15 @@ - - - + - + + @@ -7686,16 +7678,15 @@ - - - + - + + @@ -9191,7 +9182,7 @@ - + -- cgit 1.2.3-korg