From e11b9e03707c9d327e3d86c134592b484be60197 Mon Sep 17 00:00:00 2001
From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Mon, 25 Sep 2017 16:40:40 +0530
Subject: Update shema for VFC

Update AAI schema for VFC changes.

Change-Id: I3adc80861ffe4690f493b770d3f902652b55bfd4
Issue-ID: VFC-181
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
---
 .../resources/dbedgerules/DbEdgeRules_v11.json     | 11 +++++
 aai-schema/src/main/resources/oxm/aai_oxm_v11.xml  | 51 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 7bcb1ac6..96af835d 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -440,6 +440,17 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
 		},
+		{
+			"from": "generic-vnf",
+			"to": "esr-vnfm",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}"
+		},
 		{
 			"from": "group-assignment",
 			"to": "tenant",
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 640ceed1..fbb4eefe 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -2590,6 +2590,22 @@
 						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="create time of Network Service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="updatedAt" name="updated-at" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="last update of Network Service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="short description for service-instance." />
+					</xml-properties>
+				</xml-element>
+				<!-- for storing the nsd_id create edge between services -->
 				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
@@ -4113,6 +4129,11 @@
 						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="vnf instance id." />
+					</xml-properties>
+				</xml-element>
 				<xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Name of VNF." />
@@ -4165,6 +4186,21 @@
 						<xml-property name="suggestibleOnSearch" value="true"/>
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value=""/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfDiscriptorName" name="vnf-discriptor-name" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="vnf discriptor name"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="jobId" name="job-id" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="job id corresponding to vnf"/>
+					</xml-properties>
+				</xml-element>
 				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
@@ -4230,6 +4266,21 @@
 						<xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" />
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="nshd" name="nshd" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="number of associated SHD in vnf." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="number of vms in vnf." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="number of network in vnf." />
+					</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"/>
-- 
cgit 1.2.3-korg