summaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main/resources/onap/oxm/v20
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2020-09-02 11:18:22 -0400
committerHarish Venkata Kajur <vk250x@att.com>2020-09-03 02:34:16 -0400
commitd2bba7dda46fedebb876d1f041ca51a363d29932 (patch)
tree6b2c7b34e99671dbb5b3e8d807e2536b4d442155 /aai-schema/src/main/resources/onap/oxm/v20
parent216e1c72e6850cd3a86030f0458328dcf951b9ef (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/v20')
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml10
1 files changed, 4 insertions, 6 deletions
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>