[AAI-174 Amsterdam] removed invalid edge rules

[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 396e364..43114d4 100644 (file)
--- 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,26 @@
                                                <xml-property name="description" value="This field will store a name assigned to the service-instance." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing the service role." />
+                                       </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 +2279,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" />
@@ -2459,6 +2484,12 @@
                                                <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
                                        </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). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Type of logical link, e.g., evc" />
@@ -2561,7 +2592,7 @@
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
-                               <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
+                               <xml-property name="indexedProps" value="link-name,model-invariant-id,in-maint,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
                                <xml-property name="uniqueProps" value="link-id" />
                                <xml-property name="container" value="logical-links" />
                                <xml-property name="namespace" value="network" />