diff options
| author |   Venkata Harish K Kajur <hkajur93@gmail.com> | 2018-03-07 16:20:29 -0500 |
|---|---|---|
| committer |   Venkata Harish K Kajur <vk250x@att.com> | 2018-03-07 16:22:17 -0500 |
| commit | 55f25defdee4c12beace81f45eda5fb076d5b0e2 (patch) | |
| tree | 1fa40f0e13343c3fd45c32f160522fd19e596c8b /aai-schema/src/main | |
| parent | aefeb9ff5ec5c7ce3c20f420db1116c31f034615 (diff) | |
Add back missed props from oxm from v11
Change-Id: Ia1d5891f5053b0eb1bd4d1e57ff3a85a5f26b5f9
Issue-ID: AAI-838
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
Diffstat (limited to 'aai-schema/src/main')
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v12.xml | 28 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v13.xml | 28 |
2 files changed, 44 insertions, 12 deletions
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml index e146c06a..6b21a1da 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml @@ -564,6 +564,16 @@ <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="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." /> + </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." /> @@ -583,7 +593,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v12.VipIpv6AddressList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname" /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -1991,6 +2001,11 @@ <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> </xml-properties> </xml-element> + <xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="MAC Address of the p-interface." /> + </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." /> @@ -2935,22 +2950,22 @@ <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of the configuration." /> </xml-properties> </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> + <xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational." /> </xml-properties> </xml-element> - <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String"> + <xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="id of the configuration used to customize the resource" /> </xml-properties> @@ -2976,11 +2991,12 @@ <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v12.Evcs" /> </java-attributes> <xml-properties> - <xml-property name="description" value="Generic configuration object." /> + <xml-property name="description" value="Port Mirror Configuration." /> <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" /> <xml-property name="uniqueProps" value="configuration-id" /> <xml-property name="container" value="configurations" /> <xml-property name="namespace" value="network" /> + <xml-property name="nameProps" value="configuration-type" /> </xml-properties> </java-type> diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml index a114ec7b..bd6676d2 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml @@ -564,6 +564,16 @@ <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="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." /> + </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." /> @@ -583,7 +593,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v13.VipIpv6AddressList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname" /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -1991,6 +2001,11 @@ <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> </xml-properties> </xml-element> + <xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="MAC Address of the p-interface." /> + </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." /> @@ -2935,22 +2950,22 @@ <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of the configuration." /> </xml-properties> </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> + <xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational." /> </xml-properties> </xml-element> - <xml-element java-attribute="configurationSelflink" name="configuration-selflink" type="java.lang.String"> + <xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="id of the configuration used to customize the resource" /> </xml-properties> @@ -2976,11 +2991,12 @@ <xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v13.Evcs" /> </java-attributes> <xml-properties> - <xml-property name="description" value="Generic configuration object." /> + <xml-property name="description" value="Port Mirror Configuration." /> <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" /> <xml-property name="uniqueProps" value="configuration-id" /> <xml-property name="container" value="configurations" /> <xml-property name="namespace" value="network" /> + <xml-property name="nameProps" value="configuration-type" /> </xml-properties> </java-type> |