From 979549740469275d87930c09aae1618f5eb7f291 Mon Sep 17 00:00:00 2001
From: Zhigang Ji <jizhigang@huawei.com>
Date: Fri, 4 Dec 2015 17:36:05 +0800
Subject: [PATCH] Modify nemo template model.

Change-Id: Ic448f669f79e97ae1028ec27d364569b6b5145f7
Signed-off-by: Zhigang Ji <jizhigang@huawei.com>
---
 nemo-api/src/main/yang/nemo-intent.yang   | 20 ++++++++++++++++++--
 nemo-api/src/main/yang/nemo-template.yang | 10 +++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/nemo-api/src/main/yang/nemo-intent.yang b/nemo-api/src/main/yang/nemo-intent.yang
index 8c2d605..d4693de 100644
--- a/nemo-api/src/main/yang/nemo-intent.yang
+++ b/nemo-api/src/main/yang/nemo-intent.yang
@@ -67,11 +67,27 @@ module nemo-intent {
         }
 
         container template-definitions {
-            uses nemo-template:template-definition;
+            description
+                "Contains all templates that the user defined. A
+                 template defines a reusable function which could
+                 be used many times.";
+
+            list template-definition {
+                key "template-name";
+                uses nemo-template:template-definition-grouping;
+            }
         }
 
         container template-instances {
-            uses nemo-template:template-instance;
+            description
+                "Contains all template instances that the user configured.
+                 A template instance is to put specific values in the
+                 parameter list of the definition.";
+
+            list template-instance {
+                key "template-instance-id";
+                uses nemo-template:template-instance-grouping;
+            }
         }
     }
 
diff --git a/nemo-api/src/main/yang/nemo-template.yang b/nemo-api/src/main/yang/nemo-template.yang
index 2b72fa4..2914bfc 100644
--- a/nemo-api/src/main/yang/nemo-template.yang
+++ b/nemo-api/src/main/yang/nemo-template.yang
@@ -21,11 +21,11 @@ module nemo-template {
             "Initial revision.";
     }
 
-    grouping template-definition {
+    grouping template-definition-grouping {
         description
-            "It represents the node model instance and its metadata.
-             A node model defines a reusable function or template
-             which could be used many times.";
+            "It represents a template definition and its metadata.
+             A template defines a reusable function which could
+             be used many times.";
 
         leaf template-name {
             description
@@ -113,7 +113,7 @@ module nemo-template {
         }
     }
 
-    grouping template-instance {
+    grouping template-instance-grouping {
         description
             "A template instance which put specific values in the parameter list.";
 
-- 
2.36.6