diff options
| author |   Kajur, Harish (vk250x) <vk250x@att.com> | 2020-09-02 11:18:22 -0400 |
|---|---|---|
| committer | Harish Venkata Kajur <vk250x@att.com> | 2020-09-03 02:34:16 -0400 |
| commit | d2bba7dda46fedebb876d1f041ca51a363d29932 (patch) | |
| tree | 6b2c7b34e99671dbb5b3e8d807e2536b4d442155 /aai-schema/src/main/resources/onap/oxm | |
| parent | 216e1c72e6850cd3a86030f0458328dcf951b9ef (diff) | |
Update v21 for following schema changes:
Add hardware catalog and add props for profile
Add port list selector list vlan characteristics
Fix the vlan tags and vlan ranges
Add the v21 db edge rules for physical inventory
Issue-ID: AAI-3128
Change-Id: I295517c9e3c0830a17d4f09ffcd49501fcfd2966
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'aai-schema/src/main/resources/onap/oxm')
8 files changed, 970 insertions, 88 deletions
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 3fc2b16..6de41c6 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 @@ -675,6 +675,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v14.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v14.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v14.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v14.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -3158,7 +3159,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v14.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v14.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v14.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v14.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v14.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v14.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v14.NetworkResources"/> @@ -7412,6 +7412,57 @@ </xml-properties> </java-type> + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v14.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v14.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + </xml-properties> + </java-type> + <java-type name="VlanTags"> <xml-root-element name="vlan-tags"/> <java-attributes> @@ -7456,10 +7507,12 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="dependentOn" value="vlan-range"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> + <xml-property name="dslStartNodeProps" value="vlan-tag-id,vlan-tag-role,vlan-tag-type,vlan-id-inner,vlan-id-outer,config-phase,vlan-tag-function"/> </xml-properties> </java-type> 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 7f5d8fb..306b36c 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 @@ -681,6 +681,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v15.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v15.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v15.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v15.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -3230,7 +3231,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v15.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v15.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v15.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v15.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v15.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v15.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v15.NetworkResources"/> @@ -7491,13 +7491,67 @@ </xml-properties> </java-type> + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v15.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v15.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + <xml-property name="dslStartNodeProps" value="vlan-range-id,vlan-type,vlan-id-lower,vlan-id-upper"/> + </xml-properties> + </java-type> + <java-type name="VlanTags"> + <xml-properties> + <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> + </xml-properties> <xml-root-element name="vlan-tags"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v15.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -7516,7 +7570,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -7526,12 +7580,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -7552,8 +7606,9 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> + <xml-property name="dslStartNodeProps" value="vlan-tag-id,vlan-tag-role,vlan-tag-type,vlan-id-inner,vlan-id-outer,config-phase,vlan-tag-function"/> </xml-properties> </java-type> 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 122f8f9..8ea9912 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 @@ -737,6 +737,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v16.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v16.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v16.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v16.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -3286,7 +3287,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v16.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v16.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v16.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v16.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v16.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v16.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v16.NetworkResources"/> @@ -7558,13 +7558,66 @@ </xml-properties> </java-type> + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v16.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v16.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + </xml-properties> + </java-type> + <java-type name="VlanTags"> + <xml-properties> + <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> + </xml-properties> <xml-root-element name="vlan-tags"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v16.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -7583,7 +7636,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -7593,12 +7646,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -7619,7 +7672,7 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> 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 49e25e7..58c3fdb 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 @@ -744,6 +744,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v17.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v17.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v17.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v17.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -3333,7 +3334,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v17.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v17.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v17.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v17.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v17.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v17.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v17.NetworkResources"/> @@ -7635,13 +7635,67 @@ </xml-properties> </java-type> + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v17.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v17.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + <xml-property name="dslStartNodeProps" value="vlan-range-id,vlan-type,vlan-id-lower,vlan-id-upper"/> + </xml-properties> + </java-type> + <java-type name="VlanTags"> + <xml-properties> + <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> + </xml-properties> <xml-root-element name="vlan-tags"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v17.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -7660,7 +7714,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -7670,12 +7724,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -7696,8 +7750,9 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> + <xml-property name="dslStartNodeProps" value="vlan-tag-id,vlan-tag-role,vlan-tag-type,vlan-id-inner,vlan-id-outer,config-phase,vlan-tag-function"/> </xml-properties> </java-type> 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 14b5463..719aeee 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 @@ -744,6 +744,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v18.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v18.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v18.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v18.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -3338,7 +3339,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v18.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v18.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v18.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v18.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v18.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v18.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v18.NetworkResources"/> @@ -7678,13 +7678,67 @@ </xml-properties> </java-type> + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v18.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v18.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + <xml-property name="dslStartNodeProps" value="vlan-range-id,vlan-type,vlan-id-lower,vlan-id-upper"/> + </xml-properties> + </java-type> + <java-type name="VlanTags"> + <xml-properties> + <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> + </xml-properties> <xml-root-element name="vlan-tags"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v18.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -7703,7 +7757,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -7713,12 +7767,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -7739,8 +7793,9 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> + <xml-property name="dslStartNodeProps" value="vlan-tag-id,vlan-tag-role,vlan-tag-type,vlan-id-inner,vlan-id-outer,config-phase,vlan-tag-function"/> </xml-properties> </java-type> 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 34b7289..fc83e81 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 @@ -749,6 +749,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v19.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v19.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v19.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v19.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -3540,7 +3541,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v19.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v19.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v19.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v19.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v19.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v19.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v19.NetworkResources"/> @@ -7919,13 +7919,67 @@ </xml-properties> </java-type> + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v19.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v19.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + <xml-property name="dslStartNodeProps" value="vlan-range-id,vlan-type,vlan-id-lower,vlan-id-upper"/> + </xml-properties> + </java-type> + <java-type name="VlanTags"> + <xml-properties> + <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> + </xml-properties> <xml-root-element name="vlan-tags"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v19.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -7944,7 +7998,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -7954,12 +8008,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -7980,8 +8034,9 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> + <xml-property name="dslStartNodeProps" value="vlan-tag-id,vlan-tag-role,vlan-tag-type,vlan-id-inner,vlan-id-outer,config-phase,vlan-tag-function"/> </xml-properties> </java-type> diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml index c14a833..fb6f889 100644 --- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml +++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml @@ -3587,7 +3587,6 @@ <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v20.Configurations"/> <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v20.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v20.Collections"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v20.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v20.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v20.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v20.NetworkResources"/> @@ -8058,7 +8057,6 @@ <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v20.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -8077,7 +8075,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -8087,12 +8085,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -8113,7 +8111,7 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> diff --git a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml index 57c73c9..8735a40 100644 --- a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml +++ b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml @@ -1634,8 +1634,9 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic."/> - <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-function,interface-role,prov-status"/> + <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name,interface-type,interface-function,interface-role,prov-status"/> <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface,pnf,pserver"/> + <xml-property name="nameProps" value="interface-type"/> <xml-property name="container" value="l-interfaces"/> <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/> <xml-property name="searchable" value="interface-name"/> @@ -1790,7 +1791,7 @@ <xml-properties> <xml-property name="description" value="IPv4 Address Range"/> <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/> - <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp"/> + <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/> <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/> <xml-property name="requiredProps" value="l3-interface-ipv4-address"/> </xml-properties> @@ -1951,7 +1952,7 @@ <xml-properties> <xml-property name="description" value="IPv6 Address Range"/> <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/> - <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp"/> + <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp,lag-interface,p-interface"/> <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/> <xml-property name="requiredProps" value="l3-interface-ipv6-address"/> </xml-properties> @@ -2318,7 +2319,7 @@ <xml-properties> <xml-property name="description" value="Key/value pairs"/> <xml-property name="indexedProps" value="metaname"/> - <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver"/> + <xml-property name="dependentOn" value="image,service-instance,connector,configuration,model-ver,profile"/> <xml-property name="container" value="metadata"/> <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/> <xml-property name="requiredProps" value="metaname,metaval"/> @@ -2860,10 +2861,12 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v21.LInterfaces"/> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v21.L3InterfaceIpv4AddressList"/> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v21.L3InterfaceIpv6AddressList"/> </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface"/> - <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,prov-status"/> + <xml-property name="indexedProps" value="interface-name,interface-id,interface-role,interface-function,prov-status"/> <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/> <xml-property name="container" value="lag-interfaces"/> <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/> @@ -3193,6 +3196,11 @@ <xml-property name="description" value="IP address family (v6/v4/both)"/> </xml-properties> </xml-element> + <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> @@ -3221,7 +3229,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Definition of vrf"/> - <xml-property name="indexedProps" value="vrf-id"/> + <xml-property name="indexedProps" value="vrf-id,vrf-role,vrf-function"/> <xml-property name="nameProps" value="vrf-name"/> <xml-property name="dependentOn" value="pnf"/> <xml-property name="container" value="vrfs"/> @@ -4160,7 +4168,6 @@ <xml-element java-attribute="nextHops" name="next-hops" type="inventory.aai.onap.org.v21.NextHops"/> <xml-element java-attribute="bfds" name="bfds" type="inventory.aai.onap.org.v21.Bfds"/> <xml-element java-attribute="fqdns" name="fqdns" type="inventory.aai.onap.org.v21.Fqdns"/> - <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v21.VlanTags"/> <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v21.Connectivities"/> <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v21.LanPortConfigs"/> <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v21.NetworkResources"/> @@ -4447,7 +4454,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points"/> - <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-type,purpose,operational-status"/> + <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-function,link-type,purpose,operational-status"/> <xml-property name="uniqueProps" value="link-id"/> <xml-property name="container" value="logical-links"/> <xml-property name="namespace" value="network"/> @@ -5437,7 +5444,7 @@ <xml-property name="description" value="Generic network definition"/> <xml-property name="nameProps" value="network-name"/> <xml-property name="indexedProps" - value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> + value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,network-function,orchestration-status"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5659,15 +5666,18 @@ </xml-properties> </xml-element> <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v21.HostRoutes"/> + <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v21.IpAddressList"/> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + <xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v21.BgpNeighbors"/> </java-attributes> <xml-properties> - <xml-property name="indexedProps" value="subnet-id,subnet-name,orchestration-status"/> + <xml-property name="indexedProps" value="subnet-id,subnet-name,subnet-type,subnet-function,orchestration-status"/> <xml-property name="nameProps" value="subnet-name"/> <xml-property name="uniqueProps" value="subnet-id"/> - <xml-property name="dependentOn" value="l3-network"/> + <xml-property name="dependentOn" value="l3-network,zone"/> <xml-property name="container" value="subnets"/> <xml-property name="uriTemplate" value="/subnets/subnet/{subnet-id}"/> + <xml-property name="requiredProps" value="subnet-id"/> </xml-properties> </java-type> @@ -6517,7 +6527,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/> - <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status,nf-role,prov-status,nf-naming-code"/> + <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,nf-type,admin-status,nf-role,prov-status,nf-naming-code,equipment-clli"/> <xml-property name="searchable" value="pnf-name"/> <xml-property name="uniqueProps" value="pnf-name"/> <xml-property name="container" value="pnfs"/> @@ -6989,7 +6999,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical connections, typically between p-interfaces"/> - <xml-property name="indexedProps" value="circuit-id,link-name"/> + <xml-property name="indexedProps" value="circuit-id,link-name,link-function,link-role,link-type"/> <xml-property name="alternateKeys1" value="circuit-id"/> <xml-property name="container" value="physical-links"/> <xml-property name="namespace" value="network"/> @@ -8508,7 +8518,7 @@ <xml-properties> <xml-property name="description" value="Metadata for license group."/> <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date"/> - <xml-property name="dependentOn" value="generic-vnf,vce"/> + <xml-property name="dependentOn" value="chassis,generic-vnf,vce"/> <xml-property name="container" value="licenses"/> <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/> <xml-property name="requiredProps" value="group-uuid,resource-uuid"/> @@ -8599,6 +8609,7 @@ </xml-properties> </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + <xml-element java-attribute="subnets" name="subnet" type="inventory.aai.onap.org.v21.Subnets"/> </java-attributes> <xml-properties> <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB"/> @@ -9312,6 +9323,11 @@ <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop"/> </xml-properties> </xml-element> + <xml-element java-attribute="metric" name="metric" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Value that is assigned to an IP route for a particular network interface that identifies the cost that is associated with using that route."/> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> @@ -9370,6 +9386,11 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to"/> </xml-properties> </xml-element> + <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> </java-attributes> <xml-properties> @@ -9424,6 +9445,11 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to"/> </xml-properties> </xml-element> + <xml-element java-attribute="opsNote" name="ops-note" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Notes to aid OPs in troubleshooting, such as attribute aliases or additional descriptions/instructions about an object."/> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> </java-attributes> <xml-properties> @@ -9911,7 +9937,6 @@ </xml-properties> </java-type> - <java-type name="VlanTags"> <xml-properties> <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> @@ -9921,7 +9946,6 @@ <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v21.VlanTag"/> </java-attributes> </java-type> - <java-type name="VlanTag"> <xml-root-element name="vlan-tag"/> <java-attributes> @@ -9940,7 +9964,7 @@ <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> @@ -9950,12 +9974,12 @@ <xml-property name="description" value="is private flag."/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN tag Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VLAN Tag Function"/> </xml-properties> @@ -9976,7 +10000,7 @@ <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> <xml-property name="dependentOn" value="vlan-range"/> - <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="uriTemplate" value="/vlan-tags/vlan-tag/{vlan-tag-id}"/> <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -11515,11 +11539,150 @@ </xml-properties> <xml-root-element name="common"/> <java-attributes> + <xml-element java-attribute="hardwareCatalogItems" name="hardware-catalog-items" type="inventory.aai.onap.org.v21.HardwareCatalogItems"/> <xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v21.Contacts"/> <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v21.Profiles"/> + <xml-element java-attribute="policies" name="policies" type="inventory.aai.onap.org.v21.Policies"/> + <xml-element java-attribute="vlanCharacteristics" name="vlan-characteristics" type="inventory.aai.onap.org.v21.VlanCharacteristics"/> + <xml-element java-attribute="relationshipRules" name="relationship-rules" type="inventory.aai.onap.org.v21.RelationshipRules"/> </java-attributes> </java-type> + <java-type name="HardwareCatalogItems"> + <xml-properties> + <xml-property name="description" value="Collection of hardware-catalog-items"/> + </xml-properties> + <xml-root-element name="hardware-catalog-items"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="hardwareCatalogItem" name="hardware-catalog-item" type="inventory.aai.onap.org.v21.HardwareCatalogItem"/> + </java-attributes> + </java-type> + + <java-type name="HardwareCatalogItem"> + <xml-root-element name="hardware-catalog-item"/> + <java-attributes> + <xml-element java-attribute="itemName" name="item-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique name for the hardware-catalog-item"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of system defined by ATT"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="manufacturer" name="manufacturer" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Manufacturer of the hardware-catalog-item (ex,Cisco)"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="model" name="model" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Model of the hardware-catalog-item (ex,5501 NCS)"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="partNumber" name="part-number" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Part number assigned by the manufacturer"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="description" name="description" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Description of the hardware-catalog-item"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="sku" name="sku" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Stock-keeping-unit (ATT specific identifier for the hardware-catalog-item)"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an hardware-catalog-items"/> + <xml-property name="indexedProps" value="item-name"/> + <xml-property name="uniqueProps" value="item-name"/> + <xml-property name="container" value="hardware-catalog-items"/> + <xml-property name="namespace" value="common"/> + <xml-property name="uriTemplate" value="/common/hardware-catalog-items/hardware-catalog-item/{item-name}"/> + <xml-property name="requiredProps" value="item-name,system-type,manufacturer,model,sku"/> + </xml-properties> + </java-type> + + <java-type name="Profiles"> + <xml-properties> + <xml-property name="description" value="Collection of profiles"/> + </xml-properties> + <xml-root-element name="profiles"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="profile" name="profile" type="inventory.aai.onap.org.v21.Profile"/> + </java-attributes> + </java-type> + + <java-type name="Profile"> + <xml-root-element name="profile"/> + <java-attributes> + <xml-element java-attribute="profileName" name="profile-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Name of the profile"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="profileType" name="profile-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of profile (ex,network-power-profile)"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="profileCharacteristics" name="profile-characteristics" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Set of characteristics of the profile."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="profileSubtype" name="profile-subtype" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Descriptive subtype."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="profileRole" name="profile-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="used to categorize this object in conjunction with profile-type and profile-function."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="profileFunction" name="profile-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="used to categorize this object in conjunction with profile-type and profile-role. The most specific category"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="profileSelflink" name="profile-selflink" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL to endpoint where AAI can get more details"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v21.Metadata"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an profiles"/> + <xml-property name="indexedProps" value="profile-name,profile-role,profile-function"/> + <xml-property name="uniqueProps" value="profile-name"/> + <xml-property name="nameProps" value="profile-type"/> + <xml-property name="container" value="profiles"/> + <xml-property name="namespace" value="common"/> + <xml-property name="uriTemplate" value="/common/profiles/profile/{profile-name}"/> + <xml-property name="requiredProps" value="profile-name,profile-type,characteristics"/> + </xml-properties> + </java-type> + + <java-type name="Contacts"> <xml-properties> <xml-property name="description" value="Collection of contacts"/> @@ -11569,42 +11732,172 @@ <xml-property name="requiredProps" value="contact-name"/> </xml-properties> </java-type> - <java-type name="Profiles"> + + <java-type name="PortList"> + <xml-root-element name="port-list"/> + <java-attributes> + <xml-element java-attribute="port" name="port" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Port number"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="assignment" name="assignment" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name or assignment for the port"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="type" name="type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type or usage of the port"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="operator" name="operator" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + </java-attributes> <xml-properties> - <xml-property name="description" value="Collection of profiles"/> + <xml-property name="description" value="Port List Range"/> + <xml-property name="dependentOn" value="endpoint,rule,object-group"/> + <xml-property name="uriTemplate" value="/port-list/{port}"/> + <xml-property name="requiredProps" value="port"/> </xml-properties> - <xml-root-element name="profiles"/> + </java-type> + + <java-type name="SelectorList"> + <xml-root-element name="selector-list"/> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="profile" name="profile" type="inventory.aai.onap.org.v21.Profile"/> + <xml-element java-attribute="selector" name="selector" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Selector"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="assignment" name="assignment" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name or assignment for the selector"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="type" name="type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type or usage of the selector"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> </java-attributes> + <xml-properties> + <xml-property name="description" value="Selectors list"/> + <xml-property name="dependentOn" value="rule,object-group,endpoint,policy"/> + <xml-property name="uriTemplate" value="/selector-list/{selector}"/> + <xml-property name="requiredProps" value="selector"/> + </xml-properties> </java-type> - <java-type name="Profile"> - <xml-root-element name="profile"/> + <java-type name="Policies"> + <xml-root-element name="policies"/> <java-attributes> - <xml-element java-attribute="profileName" name="profile-name" required="true" type="java.lang.String" xml-key="true"> + <xml-element container-type="java.util.ArrayList" java-attribute="policy" name="policy" type="inventory.aai.onap.org.v21.Policy"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="Policy"> + <xml-root-element name="policy"/> + <java-attributes> + <xml-element java-attribute="policyId" name="policy-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Name of the profile"/> + <xml-property name="description" value="Unique Policy UUID."/> </xml-properties> </xml-element> - <xml-element java-attribute="profileType" name="profile-type" type="java.lang.String"> + <xml-element java-attribute="policyName" name="policy-name" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Type of profile (ex,network-power-profile)"/> + <xml-property name="description" value="Policy Name"/> </xml-properties> </xml-element> - <xml-element java-attribute="profileCharacteristics" name="profile-characteristics" type="java.lang.String"> + <xml-element java-attribute="policyType" name="policy-type" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Set of characteristics of the profile."/> + <xml-property name="description" value="Policy Type"/> </xml-properties> </xml-element> - <xml-element java-attribute="profileSubtype" name="profile-subtype" type="java.lang.String"> + <xml-element java-attribute="policyRole" name="policy-role" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Descriptive subtype."/> + <xml-property name="description" value="Policy role"/> </xml-properties> </xml-element> - <xml-element java-attribute="profileSelflink" name="profile-selflink" required="true" type="java.lang.String"> + <xml-element java-attribute="policyFunction" name="policy-function" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details"/> + <xml-property name="description" value="policy function"/> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="doNotTrack" name="do-not-track" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="Do not track"/> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="preDnat" name="pre-dnat" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="Pre destination NAT"/> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="applyOnForward" name="apply-on-forward" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="apply on forward"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="selector" name="selector" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Host and Interface Type Selector"/> + <xml-property name="dbAlias" value="selector-local"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="order" name="order" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Order"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="version" name="version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Version"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="status" name="status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Status"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="remoteAsn" name="remote-asn" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Remote ASN"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="namespace" name="namespace" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Namespace filter to apply the policy"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="policyDescription" name="policy-description" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Description of the policy"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="policyVariables" name="policy-variables" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Set of rule variables"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -11612,19 +11905,284 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> </xml-element> + <xml-element java-attribute="rules" name="rules" type="inventory.aai.onap.org.v21.Rules"/> + <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v21.SelectorList"/> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)"/> - <xml-property name="uniqueProps" value="profile-name"/> - <xml-property name="container" value="profiles"/> + <xml-property name="description" value="Definition of policy"/> + <xml-property name="indexedProps" value="policy-id"/> + <xml-property name="uniqueProps" value="policy-id"/> + <xml-property name="container" value="policies"/> <xml-property name="namespace" value="common"/> - <xml-property name="nameProps" value="profile-name,profile-type"/> - <xml-property name="uriTemplate" value="/common/profiles/profile/{profile-name}"/> - <xml-property name="requiredProps" value="profile-name"/> + <xml-property name="uriTemplate" value="/common/policies/policy/{policy-id}"/> + <xml-property name="requiredProps" value="policy-id,do-not-track,pre-dnat,apply-on-forward"/> + </xml-properties> + </java-type> + + + <java-type name="Rules"> + <xml-properties> + <xml-property name="description" value="Collection of rules"/> + </xml-properties> + <xml-root-element name="rules"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="rule" name="rule" type="inventory.aai.onap.org.v21.Rule"/> + </java-attributes> + </java-type> + + <java-type name="Rule"> + <xml-root-element name="rule"/> + <java-attributes> + <xml-element java-attribute="ruleId" name="rule-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="direction" name="direction" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ingress or egress"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="protocol" name="protocol" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Positive protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="notProtocol" name="not-protocol" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Negative protocol match. tcp, udp, icmpv6, sctp, udplite, integer 1-255."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="action" name="action" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Action to perform when matching this rule."/> + </xml-properties> + </xml-element> + <xml-element container-type="java.util.ArrayList" java-attribute="icmp" name="icmp" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value=""/> + </xml-properties> + </xml-element> + <xml-element container-type="java.util.ArrayList" java-attribute="notIcmp" name="not-icmp" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value=""/> + </xml-properties> + </xml-element> + <xml-element java-attribute="sequence" name="sequence" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Sequence number of the rule."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="threshold" name="threshold" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Threshold"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="status" name="status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="status"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="version" name="version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Version"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="countVariable" name="count-variable" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Named variable used for counting transactions."/> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="log" name="log" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="Boolean to indicate whether or not logging is required."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="description" name="description" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Description."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element container-type="java.util.ArrayList" java-attribute="portList" name="port-list" type="inventory.aai.onap.org.v21.PortList"/> + <xml-element container-type="java.util.ArrayList" java-attribute="selectorList" name="selector-list" type="inventory.aai.onap.org.v21.SelectorList"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an rules"/> + <xml-property name="container" value="rules"/> + <xml-property name="dependentOn" value="policy"/> + <xml-property name="uriTemplate" value="/rules/rule/{rule-id}"/> + <xml-property name="requiredProps" value="rule-id,log"/> </xml-properties> </java-type> + <java-type name="VlanCharacteristics"> + <xml-properties> + <xml-property name="description" value="Collection of vlan characteristics"/> + </xml-properties> + <xml-root-element name="vlan-characteristics"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanCharacteristic" name="vlan-characteristic" type="inventory.aai.onap.org.v21.VlanCharacteristic"/> + </java-attributes> + </java-type> + + <java-type name="VlanCharacteristic"> + <xml-root-element name="vlan-characteristic"/> + <java-attributes> + <xml-element java-attribute="vlanCharacteristicId" name="vlan-characteristic-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="rootName" name="root-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="appliesTo" name="applies-to" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Device role the vlan-characteristic applies to (c-agg-leaf-a, c-agg-leaf-b, r-leaf)."/> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="dhcpPool" name="dhcp-pool" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="DHCP Agent access."/> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="internetAccess" name="internet-access" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="Boolean to represent if requires internet access."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an vlan characteristic"/> + <xml-property name="indexedProps" value="vlan-characteristic-id"/> + <xml-property name="container" value="vlan-characteristics"/> + <xml-property name="namespace" value="common"/> + <xml-property name="uriTemplate" value="/common/vlan-characteristics/vlan-characteristic/{vlan-characteristic-id}"/> + <xml-property name="requiredProps" value="vlan-characteristic-id,dhcp-pool,internet-access"/> + </xml-properties> + </java-type> + + <java-type name="RelationshipRules"> + <xml-properties> + <xml-property name="description" value="Collection of relationship rules"/> + </xml-properties> + <xml-root-element name="relationship-rules"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipRule" name="relationship-rule" type="inventory.aai.onap.org.v21.RelationshipRule"/> + </java-attributes> + </java-type> + + <java-type name="RelationshipRule"> + <xml-root-element name="relationship-rule"/> + <java-attributes> + <xml-element java-attribute="ruleId" name="rule-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="context" name="context" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Example global,site"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="ruleTraversals" name="rule-traversals" required="true" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Number of traversals"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="appliesTo" name="applies-to" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Node the related object applies to"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipComponents" name="relationship-components" type="inventory.aai.onap.org.v21.RelationshipComponents"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an relationship rule"/> + <xml-property name="indexedProps" value="rule-id,context,rule-traversals,applies-to"/> + <xml-property name="uniqueProps" value="rule-id"/> + <xml-property name="container" value="relationship-rules"/> + <xml-property name="namespace" value="common"/> + <xml-property name="uriTemplate" value="/common/relationship-rules/relationship-rule/{rule-id}"/> + <xml-property name="requiredProps" value="rule-id,context,rule-traversals,applies-to"/> + </xml-properties> + </java-type> + + <java-type name="RelationshipComponents"> + <xml-properties> + <xml-property name="description" value="Collection of relationship components"/> + </xml-properties> + <xml-root-element name="relationship-components"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipComponent" name="relationship-component" type="inventory.aai.onap.org.v21.RelationshipComponent"/> + </java-attributes> + </java-type> + + <java-type name="RelationshipComponent"> + <xml-root-element name="relationship-component"/> + <java-attributes> + <xml-element java-attribute="ruleNode" name="rule-node" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="NARAD object"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="ruleProperty" name="rule-property" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Object property"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="ruleValue" name="rule-value" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Property value"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="componentOrder" name="component-order" required="true" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Order in traversal"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an relationship component"/> + <xml-property name="indexedProps" value="rule-node,rule-property,rule-value,component-order"/> + <xml-property name="container" value="relationship-components"/> + <xml-property name="dependentOn" value="relationship-rule"/> + <xml-property name="uriTemplate" value="common/relationship-components/relationship-component/{rule-node}"/> + <xml-property name="requiredProps" value="rule-node,rule-property,rule-value,component-order"/> + </xml-properties> + </java-type> + + <java-type name="AggregateRoutes"> <xml-properties> <xml-property name="description" value="Collection of aggregate routes."/> @@ -11640,20 +12198,20 @@ <java-attributes> <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique id of the aggregate-route instance"/> + <xml-property name="description" value="Route UUID."/> </xml-properties> </xml-element> - <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String"> + <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the forwarding-path"/> </xml-properties> </xml-element> - <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String"> + <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CIDR-mask for aggregate route subnet"/> </xml-properties> </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String"> + <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/> </xml-properties> @@ -11669,9 +12227,9 @@ <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="agg-route-id"/> <xml-property name="container" value="aggregate-routes"/> - <xml-property name="dependentOn" value="l3-network"/> + <xml-property name="dependentOn" value="vrf,l3-network"/> <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> - <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="requiredProps" value="agg-route-id"/> </xml-properties> </java-type> <java-type name="CommunicationServiceProfiles"> |