summaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main/resources/oxm
diff options
context:
space:
mode:
authorLin, Jerry (jl319x) <jl319x@att.com>2017-09-19 17:36:03 -0400
committerVenkata Harish K Kajur <vk250x@att.com>2017-09-19 17:57:47 -0400
commit69458d2533e9e158d606aa3af9708f91a065c32e (patch)
tree0d3dcb362e3133a527bc55d83b94bff77f4ee844 /aai-schema/src/main/resources/oxm
parentea3d0f7abb976c0e8557d0d3d12da2fb91ad0d08 (diff)
Submit dbedgerules change for preload elimination
Issue-ID: AAI-338 Change-Id: If446c9b71eaae0e22a7472f4f05b5ca21714fcde Signed-off-by: Lin, Jerry (jl319x) <jl319x@att.com>
Diffstat (limited to 'aai-schema/src/main/resources/oxm')
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v11.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index e0b11589..ecf163e0 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -589,6 +589,8 @@
<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+ <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" />
+ <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
</java-attributes>
<xml-properties>
<xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
@@ -1339,7 +1341,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" />
+ <xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
</xml-properties>
</java-type>
@@ -2864,8 +2866,6 @@
<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" />
<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" />
<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" />
- <xml-element java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" />
- <xml-element java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
</java-attributes>
</java-type>
<java-type name="Configurations">
@@ -6248,6 +6248,7 @@
<xml-properties>
<xml-property name="description" value="IPv4 Address Range" />
<xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+ <xml-property name="dependentOn" value="cloud-region" />
</xml-properties>
</java-type>
@@ -6299,6 +6300,7 @@
<xml-properties>
<xml-property name="description" value="IPv6 Address Range" />
<xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+ <xml-property name="dependentOn" value="cloud-region" />
</xml-properties>
</java-type>
</java-types>