X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-schema%2Fsrc%2Fmain%2Fresources%2Foxm%2Faai_oxm_v11.xml;h=d90cfe7df13cae4764b44ae86eaa0e0d57fcbc4b;hb=49113ba70b3f905a53a356c505bb224d9307d2f7;hp=396e364eca0e30733768f9b7aa14d3f322eb21bc;hpb=0aa0bd03e1758ee74b76d236eec8bcb10017318b;p=aai%2Faai-common.git

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 396e364e..d90cfe7d 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -585,6 +585,11 @@
 						<xml-property name="description" value="Readable name of tenant" />
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="tenantContext" name="tenant-context" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store the tenant context." />
+					</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." />
@@ -596,7 +601,7 @@
 			<xml-properties>
 				<xml-property name="description" value="Openstack tenant" />
 				<xml-property name="nameProps" value="tenant-name" />
-				<xml-property name="indexedProps" value="tenant-name,tenant-id" />
+				<xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
 				<xml-property name="searchable" value="tenant-id,tenant-name" />
 				<xml-property name="dependentOn" value="cloud-region" />
 				<xml-property name="container" value="tenants" />
@@ -2165,6 +2170,16 @@
 						<xml-property name="description" value="This field will store a name assigned to the service-instance." />
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
+					</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." />
@@ -2254,7 +2269,7 @@
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Instance of a service" />
-				<xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
+				<xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context" />
 				<xml-property name="nameProps" value="service-instance-name" />
 				<xml-property name="searchable" value="service-instance-id,service-instance-name" />
 				<xml-property name="uniqueProps" value="service-instance-id" />