diff options
| author |   jimmy <jf2512@att.com> | 2020-01-28 14:46:42 -0500 |
|---|---|---|
| committer | jimmy <jf2512@att.com> | 2020-01-28 15:37:00 -0500 |
| commit | 7e11a36ceed232b9dd8aff62464a582b204f7588 (patch) | |
| tree | 3b6027564c0db640dce16aea383ed9e994949d9c | |
| parent | 59bbcc84b3ea2ff66adc305a79081960734364d3 (diff) | |
Fixing descriptions on duplicated xml-props blocks
Issue-ID: AAI-2687
Change-Id: I84eeeba0c72693f0b1e43e22b760e1c2c26112b5
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
27 files changed, 956 insertions, 1067 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 66e65c9..0e9935d 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> </parent> <artifactId>aai-annotations</artifactId> <name>aai-annotations</name> diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml index 4ef2f75..53d8722 100644 --- a/aai-queries/pom.xml +++ b/aai-queries/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> </parent> <artifactId>aai-queries</artifactId> <name>aai-queries</name> diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml index a12c6d0..0b34ef6 100644 --- a/aai-schema-gen/pom.xml +++ b/aai-schema-gen/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> </parent> <artifactId>aai-schema-gen</artifactId> <name>aai-schema-gen</name> @@ -35,7 +35,7 @@ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- Start of Default ONAP Schema Properties --> <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link> - <gendoc.version>v16</gendoc.version> + <gendoc.version>v19</gendoc.version> <aai.release>onap</aai.release> <schema.uri.base.path>/aai</schema.uri.base.path> <schema.xsd.maxoccurs>5000</schema.xsd.maxoccurs> @@ -47,8 +47,8 @@ <schema.version.app.root.start>v11</schema.version.app.root.start> <schema.version.namespace.change.start>v12</schema.version.namespace.change.start> <schema.version.edge.label.start>v12</schema.version.edge.label.start> - <schema.version.api.default>v16</schema.version.api.default> - <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list> + <schema.version.api.default>v19</schema.version.api.default> + <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19</schema.version.list> <springframework.version>4.3.18.RELEASE</springframework.version> <!-- End of Default ONAP Schema Properties --> </properties> diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml index 63710de..b47300b 100644 --- a/aai-schema-service/pom.xml +++ b/aai-schema-service/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> </parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>aai-schema-service</artifactId> diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 5b48579..d4db085 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1283,7 +1283,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2214,7 +2214,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2761,7 +2761,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5336,7 +5336,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5677,7 +5677,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5757,7 +5757,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1325,7 +1325,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1895,7 +1895,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2647,7 +2647,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3402,7 +3402,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6337,7 +6337,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6678,7 +6678,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6786,7 +6786,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1332,7 +1332,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2138,7 +2138,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2768,7 +2768,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2886,7 +2886,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3597,7 +3597,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6539,7 +6539,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6887,7 +6887,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6995,7 +6995,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1332,7 +1332,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2138,7 +2138,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2768,7 +2768,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2886,7 +2886,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3583,7 +3583,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6518,7 +6518,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6880,7 +6880,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6988,7 +6988,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1420,7 +1420,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2233,7 +2233,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2911,7 +2911,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3029,7 +3029,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3074,7 +3074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3779,7 +3779,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -6934,7 +6934,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7369,7 +7369,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7477,7 +7477,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2925,7 +2925,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3043,7 +3043,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3088,7 +3088,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3793,7 +3793,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7008,7 +7008,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7520,7 +7520,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7628,7 +7628,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2939,7 +2939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3057,7 +3057,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3102,7 +3102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7069,7 +7069,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7581,7 +7581,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7689,7 +7689,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2939,7 +2939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3057,7 +3057,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3102,7 +3102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4495,14 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="orchestration-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:model-elements" minOccurs="0"/> + <xs:element name="orchestration-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:model-elements" minOccurs="0"/> <xs:element ref="tns:metadata" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> @@ -7076,7 +7076,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7588,7 +7588,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7696,7 +7696,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2939,7 +2939,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3057,7 +3057,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3102,7 +3102,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3854,7 +3854,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4495,14 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="orchestration-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:model-elements" minOccurs="0"/> + <xs:element name="orchestration-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:model-elements" minOccurs="0"/> <xs:element ref="tns:metadata" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> @@ -7076,7 +7076,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7588,7 +7588,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7696,7 +7696,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical locations that can house cloud-regions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1427,7 +1427,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of openstack tenants.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of openstack tenants.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2240,7 +2240,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of persistent block-level external system auth info.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of persistent block-level external system auth info.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -2508,17 +2508,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="available-capacity" type="xs:string" minOccurs="0"> + <xs:element name="port-description" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="port-description" type="xs:string" minOccurs="0"> + <xs:element name="domain-type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Domain type of the SDNC controllerr.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -2543,7 +2543,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="network-interface-type" type="xs:string" minOccurs="0"> + <xs:element name="network-interface-type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the physical properties of the interface.")</annox:annotate> @@ -2960,7 +2960,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of compute hosts.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of compute hosts.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3078,7 +3078,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3123,7 +3123,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description=" The network-technology object is used to capture the supported network technologies of a cloud-region.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3316,7 +3316,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="domain-type" type="xs:string" minOccurs="0"> + <xs:element name="domain-type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Domain type of the SDNC controllerr.")</annox:annotate> @@ -3654,7 +3654,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="service-rate" type="xs:string" minOccurs="0"> + <xs:element name="service-rate" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Rate of the service instance.")</annox:annotate> @@ -3910,7 +3910,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of customer identifiers to provide linkage back to BSS information.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4551,14 +4551,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="orchestration-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:model-elements" minOccurs="0"/> + <xs:element name="orchestration-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:model-elements" minOccurs="0"/> <xs:element ref="tns:metadata" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> @@ -4790,7 +4790,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="link-type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc,intra-optical-domain, inter-optical-domain, inter-operator-domain")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -4808,14 +4808,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="available-capacity" type="xs:string" minOccurs="0"> + <xs:element name="available-capacity" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="admin-state" type="xs:string" minOccurs="0"> + <xs:element name="admin-state" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link")</annox:annotate> @@ -7153,7 +7153,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of VNFs")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7604,10 +7604,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="is-abstract" type="xs:boolean" minOccurs="0"> + <xs:element name="is-abstract" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="true, indicate abstract node.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="true, indicate abstract node")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -7672,7 +7672,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Physical Network Functions.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of Physical Network Functions.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7780,7 +7780,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(maximumDepth="0",description="Collection of physical connections, typically between p-interfaces")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9890,6 +9890,411 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="network"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:logical-links" minOccurs="0"/> + <xs:element ref="tns:site-pair-sets" minOccurs="0"/> + <xs:element ref="tns:vpn-bindings" minOccurs="0"/> + <xs:element ref="tns:vpls-pes" minOccurs="0"/> + <xs:element ref="tns:multicast-configurations" minOccurs="0"/> + <xs:element ref="tns:vces" minOccurs="0"/> + <xs:element ref="tns:vnfcs" minOccurs="0"/> + <xs:element ref="tns:l3-networks" minOccurs="0"/> + <xs:element ref="tns:network-policies" minOccurs="0"/> + <xs:element ref="tns:generic-vnfs" minOccurs="0"/> + <xs:element ref="tns:lag-links" minOccurs="0"/> + <xs:element ref="tns:newvces" minOccurs="0"/> + <xs:element ref="tns:pnfs" minOccurs="0"/> + <xs:element ref="tns:physical-links" minOccurs="0"/> + <xs:element ref="tns:ipsec-configurations" minOccurs="0"/> + <xs:element ref="tns:route-table-references" minOccurs="0"/> + <xs:element ref="tns:instance-groups" minOccurs="0"/> + <xs:element ref="tns:zones" minOccurs="0"/> + <xs:element ref="tns:configurations" minOccurs="0"/> + <xs:element ref="tns:forwarding-paths" minOccurs="0"/> + <xs:element ref="tns:collections" minOccurs="0"/> + <xs:element ref="tns:vlan-tags" minOccurs="0"/> + <xs:element ref="tns:connectivities" minOccurs="0"/> + <xs:element ref="tns:lan-port-configs" minOccurs="0"/> + <xs:element ref="tns:network-resources" minOccurs="0"/> + <xs:element ref="tns:site-resources" minOccurs="0"/> + <xs:element ref="tns:sdwan-vpns" minOccurs="0"/> + <xs:element ref="tns:devices" minOccurs="0"/> + <xs:element ref="tns:wan-port-configs" minOccurs="0"/> + <xs:element ref="tns:ext-aai-networks" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="reserved-prop-names"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/> + <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/> + <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/> + <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/> + <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/> + <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/> + <xs:element name="aai-uri" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="edge-prop-names"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/> + <xs:element name="direction" type="xs:string" minOccurs="0"/> + <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/> + <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/> + <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/> + <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/> + <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/> + <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="aai-internal"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="5000"/> + <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="contact"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="contact-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="contact-telephone" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tel no. of contact")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="contact-email" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e-mail of contact")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vendor-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="contacts"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of contacts")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="common"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:contacts" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="notification-event-header"> + <xs:complexType> + <xs:sequence> + <xs:element name="id" type="xs:string" minOccurs="0"/> + <xs:element name="timestamp" type="xs:string" minOccurs="0"/> + <xs:element name="source-name" type="xs:string" minOccurs="0"/> + <xs:element name="domain" type="xs:string" minOccurs="0"/> + <xs:element name="sequence-number" type="xs:string" minOccurs="0"/> + <xs:element name="severity" type="xs:string" minOccurs="0"/> + <xs:element name="event-type" type="xs:string" minOccurs="0"/> + <xs:element name="version" type="xs:string" minOccurs="0"/> + <xs:element name="action" type="xs:string" minOccurs="0"/> + <xs:element name="entity-type" type="xs:string" minOccurs="0"/> + <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/> + <xs:element name="entity-link" type="xs:string" minOccurs="0"/> + <xs:element name="status" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="notification-event"> + <xs:complexType> + <xs:sequence> + <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/> + <xs:element ref="tns:notification-event-header" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="overloaded-model"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-name-version-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-description" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:model-vers" minOccurs="0"/> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="query-parameters"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:named-query" minOccurs="0"/> + <xs:element ref="tns:overloaded-model" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="instance-filter"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="instance-filters"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="secondary-filt"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + <xs:element name="secondary-filts"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="model-and-named-query-search"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:query-parameters" minOccurs="0"/> + <xs:element ref="tns:instance-filters" minOccurs="0"/> + <xs:element ref="tns:secondary-filts" minOccurs="0"/> + <xs:element name="top-node-type" type="xs:string" minOccurs="0"/> + <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="properties"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="property-name" type="xs:string" minOccurs="0"/> + <xs:element name="property-value" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="extra-property"> + <xs:complexType> + <xs:sequence> + <xs:element name="property-name" type="xs:string" minOccurs="0"/> + <xs:element name="property-value" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="extra-properties"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="inventory-response-item"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="model-name" type="xs:string" minOccurs="0"/> + <xs:element ref="tns:extra-properties" minOccurs="0"/> + <xs:element ref="tns:inventory-response-items" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="inventory-response-items"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="response-list"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:inventory-response-items" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="vnf"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="vnf-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="uni"> <xs:complexType> <xs:annotation> @@ -10350,415 +10755,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="network"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:logical-links" minOccurs="0"/> - <xs:element ref="tns:site-pair-sets" minOccurs="0"/> - <xs:element ref="tns:vpn-bindings" minOccurs="0"/> - <xs:element ref="tns:vpls-pes" minOccurs="0"/> - <xs:element ref="tns:multicast-configurations" minOccurs="0"/> - <xs:element ref="tns:vces" minOccurs="0"/> - <xs:element ref="tns:vnfcs" minOccurs="0"/> - <xs:element ref="tns:l3-networks" minOccurs="0"/> - <xs:element ref="tns:network-policies" minOccurs="0"/> - <xs:element ref="tns:generic-vnfs" minOccurs="0"/> - <xs:element ref="tns:lag-links" minOccurs="0"/> - <xs:element ref="tns:newvces" minOccurs="0"/> - <xs:element ref="tns:pnfs" minOccurs="0"/> - <xs:element ref="tns:physical-links" minOccurs="0"/> - <xs:element ref="tns:ipsec-configurations" minOccurs="0"/> - <xs:element ref="tns:route-table-references" minOccurs="0"/> - <xs:element ref="tns:instance-groups" minOccurs="0"/> - <xs:element ref="tns:zones" minOccurs="0"/> - <xs:element ref="tns:configurations" minOccurs="0"/> - <xs:element ref="tns:forwarding-paths" minOccurs="0"/> - <xs:element ref="tns:collections" minOccurs="0"/> - <xs:element ref="tns:vlan-tags" minOccurs="0"/> - <xs:element ref="tns:connectivities" minOccurs="0"/> - <xs:element ref="tns:lan-port-configs" minOccurs="0"/> - <xs:element ref="tns:network-resources" minOccurs="0"/> - <xs:element ref="tns:site-resources" minOccurs="0"/> - <xs:element ref="tns:sdwan-vpns" minOccurs="0"/> - <xs:element ref="tns:devices" minOccurs="0"/> - <xs:element ref="tns:wan-port-configs" minOccurs="0"/> - <xs:element ref="tns:ext-aai-networks" minOccurs="0"/> - <xs:element ref="tns:unis" minOccurs="0"/> - <xs:element ref="tns:te-link-attributes" minOccurs="0"/> - <xs:element ref="tns:label-restrictions" minOccurs="0"/> - <xs:element ref="tns:tunnel-termination-points" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="reserved-prop-names"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/> - <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/> - <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/> - <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/> - <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/> - <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/> - <xs:element name="aai-uri" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="edge-prop-names"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/> - <xs:element name="direction" type="xs:string" minOccurs="0"/> - <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/> - <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/> - <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/> - <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/> - <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/> - <xs:element name="aai-uuid" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="aai-internal"> - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="5000"/> - <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="contact"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="contact-name" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="contact-telephone" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tel no. of contact")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="contact-email" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e-mail of contact")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vendor-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="contacts"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of contacts")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="common"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:contacts" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="notification-event-header"> - <xs:complexType> - <xs:sequence> - <xs:element name="id" type="xs:string" minOccurs="0"/> - <xs:element name="timestamp" type="xs:string" minOccurs="0"/> - <xs:element name="source-name" type="xs:string" minOccurs="0"/> - <xs:element name="domain" type="xs:string" minOccurs="0"/> - <xs:element name="sequence-number" type="xs:string" minOccurs="0"/> - <xs:element name="severity" type="xs:string" minOccurs="0"/> - <xs:element name="event-type" type="xs:string" minOccurs="0"/> - <xs:element name="version" type="xs:string" minOccurs="0"/> - <xs:element name="action" type="xs:string" minOccurs="0"/> - <xs:element name="entity-type" type="xs:string" minOccurs="0"/> - <xs:element name="top-entity-type" type="xs:string" minOccurs="0"/> - <xs:element name="entity-link" type="xs:string" minOccurs="0"/> - <xs:element name="status" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="notification-event"> - <xs:complexType> - <xs:sequence> - <xs:element name="cambria.partition" type="xs:string" minOccurs="0"/> - <xs:element ref="tns:notification-event-header" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="overloaded-model"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to the main definition of a model in ASDC")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-name-version-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-name" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the model, which can change from version to version.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Version")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-description" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Description")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:model-vers" minOccurs="0"/> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="query-parameters"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:named-query" minOccurs="0"/> - <xs:element ref="tns:overloaded-model" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="instance-filter"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="instance-filters"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:instance-filter" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="secondary-filt"> - <xs:complexType> - <xs:sequence/> - </xs:complexType> - </xs:element> - <xs:element name="secondary-filts"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="SecondaryFilts for performing a named-query or model query")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:secondary-filt" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="model-and-named-query-search"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:query-parameters" minOccurs="0"/> - <xs:element ref="tns:instance-filters" minOccurs="0"/> - <xs:element ref="tns:secondary-filts" minOccurs="0"/> - <xs:element name="top-node-type" type="xs:string" minOccurs="0"/> - <xs:element name="secondary-filter-cut-point" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="properties"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Property holder for query properties or instance properties")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="property-name" type="xs:string" minOccurs="0"/> - <xs:element name="property-value" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="extra-property"> - <xs:complexType> - <xs:sequence> - <xs:element name="property-name" type="xs:string" minOccurs="0"/> - <xs:element name="property-value" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="extra-properties"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="inventory-response-item"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="model-name" type="xs:string" minOccurs="0"/> - <xs:element ref="tns:extra-properties" minOccurs="0"/> - <xs:element ref="tns:inventory-response-items" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="inventory-response-items"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:inventory-response-item" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="response-list"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Response container for the results of a named-query or model query")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:inventory-response-items" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="vnf"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,generic-vnf",isAbstract="true",requiredProps="vnf-id")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="vnf-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="inventory"> <xs:complexType> <xs:sequence> 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 @@ <!-- - ============LICENSE_START======================================================= org.onap.aai ================================================================================ - Copyright © 2017 AT&T Intellectual Property. All rights reserved. + 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 - + + 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========================================================= - - ECOMP is a trademark and service mark of AT&T Intellectual Property. - ---><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true"> +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10"/> </xml-schema> @@ -444,16 +442,15 @@ </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v10.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -563,16 +560,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v10.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -1497,16 +1493,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v10.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2029,16 +2024,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v10.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -3547,16 +3541,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v10.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -4075,16 +4068,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v10.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -4218,16 +4210,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v10.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -4381,7 +4372,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -4411,7 +4402,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -5512,7 +5503,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> 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 @@ <!-- - ============LICENSE_START======================================================= org.onap.aai ================================================================================ - Copyright © 2017 AT&T Intellectual Property. All rights reserved. + 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 - + + 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========================================================= - - ECOMP is a trademark and service mark of AT&T Intellectual Property. - ---><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true"> +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11"/> </xml-schema> @@ -373,14 +371,13 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v11.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> </xml-properties> </java-type> @@ -735,16 +732,15 @@ </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -854,16 +850,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -1820,16 +1815,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2413,16 +2407,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4235,16 +4228,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -4820,16 +4812,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -4963,16 +4954,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> 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 @@ -<!-- - ============LICENSE_START======================================================= - org.onap.aai - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true"> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v12" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v12"/> </xml-schema> @@ -369,15 +351,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v12.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -821,16 +802,15 @@ </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v12.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -940,16 +920,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v12.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -1911,16 +1890,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v12.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2509,16 +2487,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v12.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4344,16 +4321,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v12.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -4929,16 +4905,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v12.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5077,16 +5052,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v12.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5260,7 +5234,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5290,7 +5264,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6431,7 +6405,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -6688,16 +6662,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v12.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> 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. - ================================================================================ - 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true"> + ============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========================================================= +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v13"/> </xml-schema> @@ -369,15 +371,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v13.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -821,16 +822,15 @@ </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v13.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -940,16 +940,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v13.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -1911,16 +1910,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v13.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2502,16 +2500,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v13.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4318,16 +4315,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v13.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -4910,16 +4906,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v13.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5075,16 +5070,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v13.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5258,7 +5252,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5288,7 +5282,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6424,7 +6418,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -6681,16 +6675,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v13.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v14" xml-mapping-metadata-complete="true"> + ============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========================================================= +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v14" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v14"/> </xml-schema> @@ -370,15 +371,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v14.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -822,16 +822,15 @@ </java-attributes> </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v14.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -941,16 +940,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v14.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -1986,16 +1984,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v14.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2623,16 +2620,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v14.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4512,16 +4508,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v14.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -5104,16 +5099,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v14.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5329,16 +5323,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v14.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5512,7 +5505,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5542,7 +5535,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6696,7 +6689,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -6953,16 +6946,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v14.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> @@ -7474,16 +7466,15 @@ </java-type> <java-type name="NetworkTechnologies"> - <xml-properties> - <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> - </xml-properties> + <xml-root-element name="network-technologies"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v14.NetworkTechnology"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> + </xml-properties> </java-type> <java-type name="NetworkTechnology"> 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v15" xml-mapping-metadata-complete="true"> + ============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========================================================= +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v15" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v15"/> </xml-schema> @@ -371,15 +372,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v15.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -828,16 +828,15 @@ </java-attributes> </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v15.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -947,16 +946,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v15.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -1997,16 +1995,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v15.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2695,16 +2692,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v15.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4585,16 +4581,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v15.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -5177,16 +5172,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v15.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5408,16 +5402,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v15.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5591,7 +5584,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5621,7 +5614,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6775,7 +6768,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -7032,16 +7025,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v15.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> @@ -7553,16 +7545,15 @@ </java-type> <java-type name="NetworkTechnologies"> - <xml-properties> - <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> - </xml-properties> + <xml-root-element name="network-technologies"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v15.NetworkTechnology"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> + </xml-properties> </java-type> <java-type name="NetworkTechnology"> @@ -8660,7 +8651,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> + <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> <xml-property name="uniqueProps" value="route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v16" xml-mapping-metadata-complete="true"> + ============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========================================================= +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v16" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v16"/> </xml-schema> @@ -415,15 +416,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v16.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -884,16 +884,15 @@ </java-attributes> </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v16.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -1003,16 +1002,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v16.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -2053,16 +2051,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v16.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2751,16 +2748,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v16.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4641,16 +4637,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v16.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -5233,16 +5228,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v16.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5464,16 +5458,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v16.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5647,7 +5640,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5677,7 +5670,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6831,7 +6824,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -7094,16 +7087,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v16.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> @@ -7620,16 +7612,15 @@ </java-type> <java-type name="NetworkTechnologies"> - <xml-properties> - <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> - </xml-properties> + <xml-root-element name="network-technologies"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v16.NetworkTechnology"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> + </xml-properties> </java-type> <java-type name="NetworkTechnology"> @@ -8727,7 +8718,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> + <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> <xml-property name="uniqueProps" value="route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v17" xml-mapping-metadata-complete="true"> +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v17" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v17"/> </xml-schema> @@ -415,15 +416,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v17.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -884,16 +884,15 @@ </java-attributes> </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v17.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -1003,16 +1002,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v17.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -2053,16 +2051,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v17.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2751,16 +2748,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v17.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4641,16 +4637,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v17.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -5233,16 +5228,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v17.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5464,16 +5458,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v17.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5647,7 +5640,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5677,7 +5670,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6837,7 +6830,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -7100,16 +7093,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v17.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> @@ -7626,16 +7618,15 @@ </java-type> <java-type name="NetworkTechnologies"> - <xml-properties> - <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> - </xml-properties> + <xml-root-element name="network-technologies"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v17.NetworkTechnology"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> + </xml-properties> </java-type> <java-type name="NetworkTechnology"> @@ -8733,7 +8724,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> + <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> <xml-property name="uniqueProps" value="route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v18" xml-mapping-metadata-complete="true"> +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v18" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v18"/> </xml-schema> @@ -415,15 +416,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v18.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -884,16 +884,15 @@ </java-attributes> </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v18.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -1003,16 +1002,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v18.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -2053,16 +2051,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v18.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2751,16 +2748,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v18.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4641,16 +4637,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v18.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -5233,16 +5228,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v18.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5464,16 +5458,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v18.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5647,7 +5640,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5677,7 +5670,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6837,7 +6830,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -7100,16 +7093,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v18.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> @@ -7626,16 +7618,15 @@ </java-type> <java-type name="NetworkTechnologies"> - <xml-properties> - <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> - </xml-properties> + <xml-root-element name="network-technologies"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v18.NetworkTechnology"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> + </xml-properties> </java-type> <java-type name="NetworkTechnology"> @@ -8733,7 +8724,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> + <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> <xml-property name="uniqueProps" value="route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> 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========================================================= - --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v19" xml-mapping-metadata-complete="true"> +--> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v19" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.onap.aai.inventory/v19"/> </xml-schema> @@ -420,15 +421,14 @@ <java-type name="EsrSystemInfoList"> <xml-root-element name="esr-system-info-list"/> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level external system auth info."/> - </xml-properties> + <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v19.EsrSystemInfo"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info."/> + </xml-properties> </java-type> <java-type name="EsrSystemInfo"> @@ -889,16 +889,15 @@ </java-attributes> </java-type> <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> - </xml-properties> + <xml-root-element name="complexes"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v19.Complex"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical locations that can house cloud-regions."/> + </xml-properties> </java-type> <java-type name="Complex"> @@ -1008,16 +1007,15 @@ </java-type> <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants."/> - </xml-properties> + <xml-root-element name="tenants"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v19.Tenant"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of openstack tenants."/> + </xml-properties> </java-type> <java-type name="Tenant"> @@ -2058,16 +2056,15 @@ </java-type> <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts."/> - </xml-properties> + <xml-root-element name="pservers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v19.Pserver"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of compute hosts."/> + </xml-properties> </java-type> <java-type name="Pserver"> @@ -2771,16 +2768,15 @@ </java-type> <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> - </xml-properties> + <xml-root-element name="customers"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v19.Customer"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information."/> + </xml-properties> </java-type> <java-type name="Customer"> @@ -4691,16 +4687,15 @@ </java-type> <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs"/> - </xml-properties> + <xml-root-element name="generic-vnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v19.GenericVnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of VNFs"/> + </xml-properties> </java-type> <java-type name="GenericVnf"> @@ -5288,16 +5283,15 @@ </java-type> <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions."/> - </xml-properties> + <xml-root-element name="pnfs"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v19.Pnf"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of Physical Network Functions."/> + </xml-properties> </java-type> <java-type name="Pnf"> @@ -5524,16 +5518,15 @@ </java-type> <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - </xml-properties> + <xml-root-element name="physical-links"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v19.PhysicalLink"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> + </xml-properties> </java-type> <java-type name="PhysicalLink"> @@ -5707,7 +5700,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -5737,7 +5730,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc"/> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -6897,7 +6890,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]"/> + <xml-property name="description" value="Design of zone [Medium/Large…]"/> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -7160,16 +7153,15 @@ </java-type> <java-type name="OperationalEnvironments"> - <xml-properties> - <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> - </xml-properties> + <xml-root-element name="operational-environments"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v19.OperationalEnvironment"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC."/> + </xml-properties> </java-type> <java-type name="OperationalEnvironment"> @@ -7686,16 +7678,15 @@ </java-type> <java-type name="NetworkTechnologies"> - <xml-properties> - <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> - </xml-properties> + <xml-root-element name="network-technologies"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="networkTechnology" name="network-technology" type="inventory.aai.onap.org.v19.NetworkTechnology"/> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0"/> - </xml-properties> + <xml-property name="description" value=" The network-technology object is used to capture the supported network technologies of a cloud-region."/> + </xml-properties> </java-type> <java-type name="NetworkTechnology"> @@ -9191,7 +9182,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> + <xml-property name="description" value="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. "/> <xml-property name="uniqueProps" value="route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> </parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <name>aai-schema-service</name> <packaging>pom</packaging> <modules> diff --git a/version.properties b/version.properties index 3d18baa..8a4994d 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ # because they are used in Jenkins, whose plug-in doesn't support major_version=1 minor_version=6 -patch_version=2 +patch_version=3 base_version=${major_version}.${minor_version}.${patch_version} # Release must be completed with GIT information # in Jenkins |