From 4efd2a5085cf549e881c081ca491cb61747bbe22 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tom=C3=A1s=20Villaseca?= <tvillaseca@whitestack.com>
Date: Fri, 15 May 2020 01:56:44 -0400
Subject: [PATCH] Move KDU model (chart/bundle) to DF
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Ifabaee4b637838818e8cfeadb298cc80853301be
Signed-off-by: Tomás Villaseca <tvillaseca@whitestack.com>
---
 augments/configuration.yang | 10 ++++++++
 augments/kdu.yang           | 51 ++++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/augments/configuration.yang b/augments/configuration.yang
index 1ee8273..94a226d 100644
--- a/augments/configuration.yang
+++ b/augments/configuration.yang
@@ -54,6 +54,7 @@ module configuration {
     grouping extended-kdu-configuration {
         list kdu-profile {
             key "name";
+
             leaf name {
                 description
                   "Reference to the KDU";
@@ -61,6 +62,7 @@ module configuration {
                     path "/vnfd:vnfd/kdu:kdu/kdu:name";
                 }
             }
+
             leaf kdu-configuration-id {
                 description
                   "Reference to the KDU configuration to use in this DF";
@@ -68,6 +70,14 @@ module configuration {
                     path "/vnfd:vnfd/kdu:kdu-configuration/kdu:id";
                 }
             }
+
+            leaf kdu-model-id {
+                description
+                  "Reference to the KDU model to use in this DF";
+                type leafref {
+                    path "/vnfd:vnfd/kdu:kdu-model/kdu:id";
+                }
+            }
         }
     }
 
diff --git a/augments/kdu.yang b/augments/kdu.yang
index edc93f4..0cad701 100644
--- a/augments/kdu.yang
+++ b/augments/kdu.yang
@@ -64,6 +64,36 @@ module kdu {
         }
     }
 
+    grouping extended-kdu-model {
+        list kdu-model {
+            key "id";
+
+            leaf id {
+                description
+                  "Internal identifier for the KDU model";
+                type string;
+            }
+
+            leaf kdu-model-type {
+                description
+                  "Indicates the KDU model, either as a helm-chart or as a juju-bundle.";
+
+                type enumeration {
+                    enum helm-chart;
+                    enum juju-bundle;
+                }
+            }
+
+            leaf kdu-model-locator {
+                description
+                  "Indicates the KDU model location, either as a path to a folder in the 
+                   package or as a URL where to fetch the model.";
+
+                type string;
+            }
+        }
+    }
+
     grouping extended-kdu {
         list kdu {
             description
@@ -81,26 +111,6 @@ module kdu {
                   "Description of the KDU.";
                 type string;
             }
-
-            container kdu-model {
-                leaf kdu-model-type {
-                    description
-                      "Indicates the KDU model, either as a helm-chart or as a juju-bundle.";
-
-                    type enumeration {
-                        enum helm-chart;
-                        enum juju-bundle;
-                    }
-                }
-
-                leaf kdu-model-locator {
-                    description
-                      "Indicates the KDU model location, either as a path to a folder in the 
-                       package or as a URL where to fetch the model.";
-
-                    type string;
-                }
-            }
         }
 
         container k8s-cluster {
@@ -146,6 +156,7 @@ module kdu {
     augment "/vnfd:vnfd" {
         uses extended-kdu;
         uses extended-kdu-configuration;
+        uses extended-kdu-model;
     }
 
     augment "/vnfd:vnfd/vnfd:ext-cpd/vnfd:cp-connection" {
-- 
2.25.1