summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Reehil <william.reehil@att.com>2020-06-19 16:43:28 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-19 16:43:28 +0000
commitf3e57db79d3d54c083829ba79faf6d66654df285 (patch)
treefff5c6c01b30da8ea0f399edd67623f389c3c50d
parent14374349e8d452c059daf0540ad411993ebde35d (diff)
parentd119b3b1b7a793fbb4a4feeaf54aa99e48f8dd8d (diff)
Merge "Add operational-status to physical-link"
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd9
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml8
2 files changed, 15 insertions, 2 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
index 9e17c47..9831b7f 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
@@ -8365,7 +8365,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network",searchable="link-name,circuit-id,operational-status",uriTemplate="/network/physical-links/physical-link/{link-name}",requiredProps="link-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -8453,6 +8453,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="operational-status" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element ref="tns:relationship-list" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
index 9ddd1f0..a2570db 100644
--- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
@@ -5821,6 +5821,12 @@
<xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path."/>
+ <xml-property name="suggestibleOnSearch" value="true"/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/>
</java-attributes>
<xml-properties>
@@ -5829,7 +5835,7 @@
<xml-property name="alternateKeys1" value="circuit-id"/>
<xml-property name="container" value="physical-links"/>
<xml-property name="namespace" value="network"/>
- <xml-property name="searchable" value="link-name,circuit-id"/>
+ <xml-property name="searchable" value="link-name,circuit-id,operational-status"/>
<xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
<xml-property name="requiredProps" value="link-name"/>
</xml-properties>