summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2018-08-22 19:52:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-22 19:52:37 +0000
commit52cf5ef2ea34a12728000de454f9de038d4242b7 (patch)
tree6b2ea0e12952d90ef519b3b2312cd70428f11141
parent3b0d3167a2ad458bbe59e0f703b40ef4f4976424 (diff)
parentb58992b52d238287aa43542ff69c958c4430a716 (diff)
Merge "AAI-1453 update p-interface schema for CCVPN"
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd23
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json2
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml17
3 files changed, 39 insertions, 3 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index 2019a6ae..8ce75a01 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -2353,7 +2353,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="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -2448,6 +2448,27 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="network-ref" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="transparent" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the transparent value of this p-interface.")</annox:annotate>
+ </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="oper Status of this p-interface.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element ref="tns:relationship-list" minOccurs="0"/>
<xs:element ref="tns:sriov-pfs" minOccurs="0"/>
<xs:element ref="tns:l-interfaces" minOccurs="0"/>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index b407c875..2e65669b 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -2979,6 +2979,6 @@
"default": "true",
"description":""
}
-
+
]
}
diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index 111946fb..2236ad28 100644
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -2104,13 +2104,28 @@
<xml-property name="description" value="inventory status" />
</xml-properties>
</xml-element>
+ <xml-element java-attribute="networkRef" name="network-ref" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point." />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="transparent" name="transparent" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Store the transparent value of this p-interface." />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="oper Status of this p-interface." />
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v14.SriovPfs" />
<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v14.LInterfaces" />
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)" />
- <xml-property name="indexedProps" value="interface-name,prov-status" />
+ <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status" />
<xml-property name="nameProps" value="prov-status" />
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
<xml-property name="container" value="p-interfaces" />