summaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main/resources/oxm
diff options
context:
space:
mode:
Diffstat (limited to 'aai-schema/src/main/resources/oxm')
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v11.xml29
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v9.xml129
2 files changed, 89 insertions, 69 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 d9ae0c87..00843ee7 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -3294,14 +3294,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">
@@ -3336,6 +3336,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." />
@@ -3344,7 +3358,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" />
@@ -3657,6 +3671,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." />
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
index 0dfc5afb..8366cf10 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
@@ -3192,70 +3192,71 @@
</java-attributes>
</java-type>
- <java-type name="Vnfc">
- <xml-root-element name="vnfc" />
- <java-attributes>
- <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
- <xml-properties>
- <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-properties>
- <xml-property name="description" value="function code" />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="type" />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="prov status of this vnfc" />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="Oam V4 vip address of this vnfc" />
- </xml-properties>
- </xml-element>
- <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
- <xml-properties>
- <xml-property name="defaultValue" value="false"/>
- <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
- </xml-properties>
- </xml-element>
- <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
- <xml-properties>
- <xml-property name="defaultValue" value="false"/>
- <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="Group notation of VNFC" />
- </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.openecomp.org.v9.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="searchable" value="vnfc-name" />
- <xml-property name="container" value="vnfcs" />
- <xml-property name="namespace" value="network" />
- </xml-properties>
- </java-type>
+ <java-type name="Vnfc">
+ <xml-root-element name="vnfc" />
+ <java-attributes>
+ <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+ <xml-properties>
+ <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-properties>
+ <xml-property name="description" value="function code" />
+ <xml-property name="dbAlias" value="nfc-naming-code" />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="type" /><xml-property name="dbAlias" value="nfc-function" />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="prov status of this vnfc" />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Oam V4 vip address of this vnfc" />
+ </xml-properties>
+ </xml-element>
+ <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+ <xml-properties>
+ <xml-property name="defaultValue" value="false"/>
+ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+ </xml-properties>
+ </xml-element>
+ <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+ <xml-properties>
+ <xml-property name="defaultValue" value="false"/>
+ <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Group notation of VNFC" />
+ </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.openecomp.org.v9.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="searchable" value="vnfc-name" />
+ <xml-property name="container" value="vnfcs" />
+ <xml-property name="namespace" value="network" />
+ </xml-properties>
+ </java-type>
<java-type name="L3Networks">
<xml-root-element name="l3-networks" />