From ba8a352eaab57a09d958b718b5c5a3b5410c2fe5 Mon Sep 17 00:00:00 2001
From: Keong Lim <keong.lim@huawei.com>
Date: Wed, 15 Aug 2018 15:32:17 +1000
Subject: AAI-1481 Add network-resource for CCVPN usecase

Issue-ID: AAI-1481
Add network-resource element to network namespace.
Add CCVPN EdgeRules for network-resource to vpn-binding and pnf.
Update multiplicity.
Change pnf from sub-component to COUSIN edge as workaround.

Change-Id: I4b288406a272ccdb6243d1e13555a02aa6354a83
Signed-off-by: Keong Lim <keong.lim@huawei.com>
---
 .../main/resources/onap/oxm/v14/aai_oxm_v14.xml    | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'aai-schema/src/main/resources/onap/oxm/v14')

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 3dde2409..70881b5b 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
@@ -3087,6 +3087,7 @@
                 <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v14.VlanTags"/>
 				<xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v14.Connectivities" />
 				<xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v14.LanPortConfigs" />
+				<xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v14.NetworkResources" />
             </java-attributes>
         </java-type>
         <java-type name="Configurations">
@@ -7668,5 +7669,57 @@
 			</java-attributes>
 		</java-type>
 
+		<java-type name="NetworkResource">
+			<xml-root-element name="network-resource" />
+			<java-attributes>
+				<xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Uniquely identifies this network-resource by id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="providerId" name="provider-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the provider of this network-resource." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="clientId" name="client-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the client of this network-resource." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="teTopoId" name="te-topo-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the te-topo of this network-resource." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the link to get more information for this object." />
+					</xml-properties>
+				</xml-element>
+				<!-- Want to use pnf as sub-component, but workaround is to use COUSIN edge in relationship-list.
+				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v14.Pnfs" /> -->
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Instance of a network-resource" />
+				<xml-property name="indexedProps" value="network-id,provider-id,client-id,te-topo-id" />
+				<xml-property name="nameProps" value="network-id" />
+				<xml-property name="searchable" value="network-id" />
+				<xml-property name="uniqueProps" value="network-id" />
+				<xml-property name="container" value="network-resources" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="NetworkResources">
+			<xml-root-element name="network-resources" />
+			<xml-properties>
+				<xml-property name="description" value="Collection of network-resources" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkResource" name="network-resource" type="inventory.aai.onap.org.v14.NetworkResource" />
+			</java-attributes>
+		</java-type>
+
 	</java-types>
 </xml-bindings>
-- 
cgit