Update openjdk version to 19 and yang2swagger version to 2.1.0

[osm/IM.git] / models / augments / common-augments.yang

diff --git a/models/augments/common-augments.yang b/models/augments/common-augments.yang
index c365424..18481a9 100644 (file)
--- a/models/augments/common-augments.yang
+++ b/models/augments/common-augments.yang
@@ -200,6 +200,31 @@ module common-augments {
                   "Execution environment that uses the service provided by the provider";
                 uses relations-ee;
             }
+            list entities {
+                description
+                  "DEPRECATION NOTICE: use provider and requirer instead.
+                   List of two elements to be related.
+                   Elements to be related are identified by a pair (id, endpoint).
+                   The relation will relate (id1, endpoint1) to (id2, endpoint2).";
+                key "id";
+
+                leaf id {
+                    description
+                      "A string, reference to the element id in the descriptor.
+                       It could be a vnfd-id or a vdu-id in a VNFD,
+                       or a nsd-id or member-vnf-index in a NSD.";
+                    type string;
+                }
+
+                leaf endpoint {
+                    description
+                      "Endpoint name defining the relation.";
+                    type string;
+                }
+            }
+            must 'not(entities) or (not(provider) and not(requirer))' {
+                error-message 'Cannot set both "entities" and "provider/requirer" fields.';
+            }
         }
     }
 
@@ -323,7 +348,6 @@ module common-augments {
                                 description
                                   "Helm version to use for this helm-chart, v3 by default";
                                 type enumeration {
-                                  enum "v2";
                                   enum "v3";
                                 }
                                 default "v3";
@@ -538,6 +562,7 @@ module common-augments {
             enum GT; // greater than
             enum LT; // less than
             enum EQ; // equal
+            enum NE; // not equal
         }
     }
 
@@ -700,6 +725,34 @@ module common-augments {
         }
     }
 
+    grouping vdu-storage-requirements {
+        list vdu-storage-requirements {
+            description
+              "Array of key-value pairs that articulate the storage
+               deployment requirements.
+
+               If the storage type is persistent-storage, the following setting
+               holds the persistent volume upon VM deletion:
+                 key: keep-volume
+                 value: true
+
+               If storage volume can be attached to several VMs, the following setting
+               will allow it:
+                 key: multiattach
+                 value: true";
+
+            key "key";
+
+            leaf key {
+                type string;
+            }
+
+            leaf value {
+                type string;
+            }
+        }
+    }
+
     typedef scaling-trigger {
         type enumeration {
             enum pre-scale-in {