aboutsummaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
diff options
context:
space:
mode:
Diffstat (limited to 'aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml')
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml67
1 files changed, 61 insertions, 6 deletions
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>