Code Review / aai / aai-common.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[AAI-148 Amsterdam] schema change.
[aai/aai-common.git] / aai-schema / src / main / resources / oxm / aai_oxm_v11.xml
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 ff06a77..a9d567b 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -293,6 +293,12 @@
                                                <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
+                                       </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." />
@@ -1702,11 +1708,6 @@
                                                <xml-property name="description" value="inventory status" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="inventory status" />
-                                       </xml-properties>
-                               </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v11.SriovPfs" />
                                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
@@ -2777,6 +2778,16 @@
                                                <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="region of customer vpn" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="id for this customer vpn" />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
@@ -3289,14 +3300,14 @@
                                                <xml-property name="description" value="Unique ID of vnfc." />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+                               <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="function code" />
+                                               <xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+                               <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="type" />
+                                               <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
@@ -3331,6 +3342,20 @@
                                                <xml-property name="description" value="Group notation of VNFC" />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                       </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." />
@@ -3339,7 +3364,7 @@
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
                                <xml-property name="searchable" value="vnfc-name" />
                                <xml-property name="container" value="vnfcs" />
                                <xml-property name="namespace" value="network" />
@@ -3652,6 +3677,11 @@
                                                <xml-property name="description" value="the last address reserved for use by dhcp" />
                                        </xml-properties>
                                </xml-element>
+                                       <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
+                                       </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." />
@@ -3945,7 +3975,7 @@
                                        <xml-properties>
                                                <xml-property name="description" value="Network Management profile of this VNF" />
                                        </xml-properties>
-                               </xml-element>                  
+                               </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
                                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
@@ -4507,7 +4537,7 @@
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
@@ -4537,7 +4567,7 @@
                                </xml-element>
                                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
@@ -5259,6 +5289,23 @@
                <java-type name="InstanceGroup">
                        <xml-root-element name="instance-group" />
                        <java-attributes>
+                               <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role of the instance group." />
+                                       </xml-properties>
+                               </xml-element>
+
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ASDC model id for this resource or service model." />
+                                       </xml-properties>
+                               </xml-element>
+
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ASDC model version uid for this resource model." />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
                                                <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
@@ -5599,7 +5646,7 @@
                                </xml-element>
                                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Design of zone [Medium/Large…]" />
+                                               <xml-property name="description" value="Design of zone [Medium/Large?]" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
@@ -5664,7 +5711,7 @@
                                <xml-property name="canBeLinked" value="true" />
                        </xml-properties>
                </java-type>
-                                               
+
                <java-type name="SriovPfs">
                        <xml-properties>
                                <xml-property name="description" value="Collection of SR-IOV Physical Functions." />
This holds the model, annotations and common modules used across the Resources and Traversal micro services