Update openjdk version to 19 and yang2swagger version to 2.1.0

[osm/IM.git] / models / augments / kdu.yang

diff --git a/models/augments/kdu.yang b/models/augments/kdu.yang
index 3f7d2e7..9dc512f 100644 (file)
--- a/models/augments/kdu.yang
+++ b/models/augments/kdu.yang
@@ -24,10 +24,6 @@ module kdu {
         prefix vnfd;
     }
 
-    import common-augments {
-        prefix common;
-    }
-
     grouping extended-ext-cpd {
         leaf k8s-cluster-net {
             description
@@ -40,24 +36,6 @@ module kdu {
         }
     }
 
-    grouping extended-kdu-configuration {
-        container kdu-configuration {
-            uses common:vnfc-configuration;
-            uses common:vdu-config-access;
-
-            leaf-list blacklist-config-primitive {
-                description
-                  "List of blacklisted config primitives from the list of
-                   default kdu config primitives";
-
-                type enumeration {
-                    enum upgrade;
-                    enum rollback;
-                }
-            }
-        }
-    }
-
     grouping extended-kdu {
         list kdu {
             description
@@ -96,7 +74,6 @@ module kdu {
                         description
                           "Helm version to use for this helm-chart, v3 by default";
                         type enumeration {
-                            enum v2;
                             enum v3;
                         }
                         default v3;
@@ -117,7 +94,26 @@ module kdu {
                 }
             }
 
-            uses extended-kdu-configuration;
+            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;
+              }
+            }
 
         }
 
@@ -159,39 +155,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" {