Day-2 primitives for CNF with proxy charms

Change-Id: I8ebbdef6f7d92bb33ea030f3bdb10dd707f6c358
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/models/augments/day1-2.yang b/models/augments/day1-2.yang
index a29a3bc..dda056c 100644 (file)
--- a/models/augments/day1-2.yang
+++ b/models/augments/day1-2.yang
@@ -33,7 +33,7 @@ module day1-2 {
             key "id";
             leaf id {
                 description
-                  "Internal identifier for the VNF/VDU/KNF/KDU configuration";
+                  "Internal identifier for the VNF/VDU/KDU configuration";
                 type string;
             }
             uses common:vnfc-configuration;

diff --git a/models/augments/kdu.yang b/models/augments/kdu.yang
index bd8b8fb..1b5c084 100644 (file)
--- a/models/augments/kdu.yang
+++ b/models/augments/kdu.yang
@@ -94,6 +94,28 @@ module kdu {
                     }
                 }
             }
+
+            list service {
+              description
+                "List of Kubernetes services exposed by the KDU.
+                 If empty, all services are assumed to be exposed in the CP associated to the first network
+                 in k8s-cluster.nets.";
+              key name;
+
+              leaf name {
+                description "Name of the Kubernetes service exposed by he KDU model";
+                type string;
+              }
+
+              leaf external-connection-point-ref {
+                description
+                  "String representing a leaf reference to the particular external connection point.
+                   This field should match /etsi-nfv-vnfd:vnfd/etsi-nfv-vnfd:ext-cpd/etsi-nfv-vnfd:id
+                  ";
+                type string;
+              }
+            }
+
         }
 
         container k8s-cluster {
@@ -134,39 +156,6 @@ module kdu {
                 }
             }
         }
-
-        list service {
-          description
-            "List of Kubernetes services exposed by the KDU.
-             If empty, all services are assumed to be exposed in the CP associated to the first network
-             in k8s-cluster.nets.";
-          key name;
-
-          leaf name {
-            description "Name of the Kubernetes service exposed by he KDU model";
-            type string;
-          }
-
-          leaf mgmt-service {
-            description
-                "Flag to indicate that this Kubernetes service is a mgmt service
-                to be used for KDU configuration. Defaults to false (if no present).
-                All services with mgmt-service set to true will be passed to the execution
-                environment in charge of the KDU configuration.";
-            type boolean;
-            default false;
-          }
-
-          leaf external-connection-point-ref {
-            description
-              "String representing a leaf reference to the particular external connection point.
-               This field should match /etsi-nfv-vnfd:vnfd/etsi-nfv-vnfd:ext-cpd/etsi-nfv-vnfd:id
-              ";
-            type string;
-          }
-
-        }
-
     }
 
     augment "/vnfd:vnfd" {