diff options
author | 2020-01-28 14:46:42 -0500 | |
---|---|---|
committer | 2020-01-28 15:37:00 -0500 | |
commit | 7e11a36ceed232b9dd8aff62464a582b204f7588 (patch) | |
tree | 3b6027564c0db640dce16aea383ed9e994949d9c /aai-schema/src/main/resources/onap/oxm/v19 | |
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/v19')
-rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml | 81 |
1 files changed, 36 insertions, 45 deletions
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"/> |