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 /aai-schema/src/main/resources/onap/oxm | |
| 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>
Diffstat (limited to 'aai-schema/src/main/resources/onap/oxm')
10 files changed, 411 insertions, 518 deletions
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"/> |