Modify nemo template model.

Change-Id: Ic448f669f79e97ae1028ec27d364569b6b5145f7
Signed-off-by: Zhigang Ji <jizhigang@huawei.com>

diff --git a/nemo-api/src/main/yang/nemo-intent.yang b/nemo-api/src/main/yang/nemo-intent.yang
index 8c2d605fc048adb6485a60cfa5a5569c131fbde9..d4693def4f44e4db3cd15139fc542ab2f526d4c9 100644 (file)
--- 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 {
         }\r
 \r
         container template-definitions {\r
-            uses nemo-template:template-definition;\r
+            description\r
+                "Contains all templates that the user defined. A\r
+                 template defines a reusable function which could\r
+                 be used many times.";\r
+\r
+            list template-definition {\r
+                key "template-name";\r
+                uses nemo-template:template-definition-grouping;\r
+            }\r
         }\r
 \r
         container template-instances {\r
-            uses nemo-template:template-instance;\r
+            description\r
+                "Contains all template instances that the user configured.\r
+                 A template instance is to put specific values in the\r
+                 parameter list of the definition.";\r
+\r
+            list template-instance {\r
+                key "template-instance-id";\r
+                uses nemo-template:template-instance-grouping;\r
+            }\r
         }\r
     }\r
 \r

diff --git a/nemo-api/src/main/yang/nemo-template.yang b/nemo-api/src/main/yang/nemo-template.yang
index 2b72fa44e27ef2885af076fe0397406deebdb652..2914bfc27c0760188b5044dfa169f98c185e2d81 100644 (file)
--- 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.";\r
     }\r
 \r
-    grouping template-definition {\r
+    grouping template-definition-grouping {\r
         description\r
-            "It represents the node model instance and its metadata.\r
-             A node model defines a reusable function or template\r
-             which could be used many times.";\r
+            "It represents a template definition and its metadata.\r
+             A template defines a reusable function which could\r
+             be used many times.";\r
 \r
         leaf template-name {\r
             description\r
@@ -113,7 +113,7 @@ module nemo-template {
         }\r
     }\r
 \r
-    grouping template-instance {\r
+    grouping template-instance-grouping {\r
         description\r
             "A template instance which put specific values in the parameter list.";\r
 \r