diff options
author | Lamont, William (wl2432) <wl2432@att.com> | 2017-12-07 16:54:44 -0500 |
---|---|---|
committer | Venkata Harish K Kajur <vk250x@att.com> | 2017-12-08 14:45:44 -0500 |
commit | 93b15d3d4364095dbc552751d70e116e615b99f4 (patch) | |
tree | bc4fed52ed3544b64ce8e568822a2dfef95271b8 /aai-schema/src/main/resources/oxm | |
parent | 5436f746402054294bb54fa028d1a857ad98213f (diff) |
checking in tenant isolation oxm changes
Issue-ID: AAI-554
Change-Id: I83bb7ba532e3ef44850669b430673fc904d60af0
Signed-off-by: Lamont, William (wl2432) <wl2432@att.com>
Diffstat (limited to 'aai-schema/src/main/resources/oxm')
-rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v12.xml | 27 |
1 files changed, 17 insertions, 10 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 07cec834..13363c50 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml @@ -501,6 +501,7 @@ <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v12.NetworkProfiles" /> <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v12.Pservers" /> <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v12.VirtualDataCenters" /> + <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v12.OperationalEnvironments" /> </java-attributes> </java-type> @@ -1787,6 +1788,11 @@ <xml-property name="description" value="Value from executing hostname on the compute node." /> </xml-properties> </xml-element> + <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL to endpoint where AAI can get more details." /> + </xml-properties> + </xml-element> <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="PTNII name" /> @@ -1950,11 +1956,6 @@ <xml-property name="description" value="Name that identifies the physical interface" /> </xml-properties> </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details." /> - </xml-properties> - </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> @@ -2893,14 +2894,14 @@ <java-type name="Configuration"> <xml-root-element name="configuration" /> <java-attributes> - <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="UUID assigned to configuration." /> + <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." /> </xml-properties> </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> + <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." /> + <xml-property name="description" value="UUID assigned to configuration." /> </xml-properties> </xml-element> <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String"> @@ -5218,7 +5219,7 @@ <xml-properties> <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" /> <xml-property name="nameProps" value="model-name" /> - <xml-property name="indexedProps" value="model-version-id,model-name,model-version" /> + <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" /> <xml-property name="uniqueProps" value="model-version-id" /> <xml-property name="container" value="model-vers" /> </xml-properties> @@ -5238,6 +5239,11 @@ <xml-property name="description" value="Version" /> </xml-properties> </xml-element> + <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Distribution Status" /> + </xml-properties> + </xml-element> <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Description" /> @@ -6424,6 +6430,7 @@ <xml-properties> <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." /> <xml-property name="indexedProps" value="operational-environment-id" /> + <xml-property name="nameProps" value="operational-environment-name" /> <xml-property name="uniqueProps" value="operational-environment-id" /> <xml-property name="container" value="operational-environments" /> <xml-property name="namespace" value="cloud-infrastructure" /> |