summaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r--aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd23
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v11.xml18
2 files changed, 39 insertions, 2 deletions
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
index dc3d3c25..b8703bfa 100644
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
@@ -2665,6 +2665,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="service-type" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of service.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="service-role" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing the service role.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="environment-context" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -3499,7 +3513,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
+ <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,in-maint,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3510,6 +3524,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="in-maint" type="xs:boolean">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="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.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="link-type" type="xs:string">
<xs:annotation>
<xs:appinfo>
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 d90cfe7d..43114d4c 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -2170,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="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." />
@@ -2474,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" />
@@ -2576,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" />