From fbad6113cd296d61361c1490f32fc372814cfeaa Mon Sep 17 00:00:00 2001
From: Keong Lim <keong.lim@huawei.com>
Date: Mon, 13 Aug 2018 13:28:00 +1000
Subject: AAI-1460 Update logical-link schema for CCVPN

Issue-ID: AAI-1460
Update operational-status to be indexed property
Add CCVPN EdgeRules file

Change-Id: Ia8e20171ad060b7ca8f2e91d7a66a545146ff36d
Signed-off-by: Keong Lim <keong.lim@huawei.com>
---
 aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd     | 2 +-
 .../main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json   | 5 +++++
 aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json

(limited to 'aai-schema')

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 623f8a07..b4d4b829 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
@@ -4389,7 +4389,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="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.onap.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,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
new file mode 100644
index 00000000..1c88b043
--- /dev/null
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
@@ -0,0 +1,5 @@
+{
+  "rules": [
+
+  ]
+}
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 d80e99b0..12f49df9 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
@@ -3234,7 +3234,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,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose,operational-status" />
 				<xml-property name="uniqueProps" value="link-id" />
 				<xml-property name="container" value="logical-links" />
 				<xml-property name="namespace" value="network" />
-- 
cgit 1.2.3-korg