Fixing descriptions on duplicated xml-props blocks

Issue-ID: AAI-2687
Change-Id: I84eeeba0c72693f0b1e43e22b760e1c2c26112b5
Signed-off-by: Jimmy Forsyth <jf2512@att.com>

1 files changed, 50 insertions, 57 deletions

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,&#xC2;&#xA0;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,&#xC2;&#xA0;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&#x2026;]"/>
                     </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">