Update openjdk version to 19 and yang2swagger version to 2.1.0

[osm/IM.git] / models / yang / mano-types.yang

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 1b9e141..d1cbb86 100644 (file)
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -176,7 +176,7 @@ module mano-types
       description
           "Name of the configuration primitive.";
       type string;
       description
           "Name of the configuration primitive.";
       type string;

-      mandatory "true";
+      mandatory true;

     }
 
     leaf user-defined-script {
     }
 
     leaf user-defined-script {


@@ -221,22 +221,36 @@ module mano-types
   }
 
 
   }
 
 

-  grouping vca-relationships {
-    container vca-relationships {
-      list relation {
-        description "List of relations between VCA componets.";
+  grouping vca-relations {
+    list relation {
+      description "List of relations between elements in this descriptor.";
+      key "name";
+
+      leaf name {
+        description
+          "Name of the relation.";
+
+        type string;
+      }

 
 

-        key "requires provides";
+      list entities {
+        description
+          "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 requires {
+        leaf id {

           description
           description

-            "Name of the required relation.";
+            "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;
         }
 
           type string;
         }
 

-        leaf provides {
+        leaf endpoint {

           description
           description

-            "Name of the provided relation.";
+            "Endpoint name defining the relation.";

           type string;
         }
       }
           type string;
         }
       }


@@ -254,6 +268,18 @@ module mano-types
           "Name of the metric, as defined in the Juju charm.";
         type string;
       }
           "Name of the metric, as defined in the Juju charm.";
         type string;
       }

+      leaf execution-environment-ref {
+        description
+          "Leaf reference to the particular execution environment getting that metric";
+        type leafref {
+          path "../../execution-environment-list/id";
+        }
+      }
+      leaf execution-environment-metric {
+        description
+          "Metric in the execution environment referenced by execution-environment-ref";
+        type string;
+      }

     }
   } // END - grouping vca-metrics
 
     }
   } // END - grouping vca-metrics
 


@@ -291,12 +317,130 @@ module mano-types
             type boolean;
             default true;
           }
             type boolean;
             default true;
           }

-          uses manotypes:vca-relationships;
+          leaf cloud {
+            description
+              "Type of cloud where the charm will be deployed. It only
+               applies to proxy charms (not native)";
+            type enumeration {
+              enum lxd;
+              enum k8s;
+            }
+            default lxd;
+          }
+        }
+      }
+
+      case execution-environment-list {
+        description
+          "List of Execution Environments to configure or monitor VNF or VDU.";
+        list execution-environment-list {
+          key "id";
+          leaf id {
+            description "Execution environment identifier.";
+            type string;
+          }
+          choice execution-environment-model {
+            description "Execution environment model (juju, helm-chart)";
+            case juju {
+              description
+                "Interact with the VNF or xDU through Juju.";
+              container juju {
+                leaf charm {
+                  description "Juju charm to use with the VNF or VDU.";
+                  type string;
+                }
+                leaf proxy {
+                  description "Is this a proxy charm?";
+                  type boolean;
+                  default true;
+                }
+                leaf cloud {
+                  description
+                    "Type of cloud where the charm will be deployed. It only
+                     applies to proxy charms (not native)";
+                  type enumeration {
+                    enum lxd;
+                    enum k8s;
+                  }
+                  default lxd;
+                }
+              }
+            }
+            case helm-chart {
+              description
+                "Interact with the VNF or xDU through Helm.";
+              leaf helm-chart {
+                description
+                  "Helm chart that models the execution environment, in any of the following ways:
+                   - <helm-repo>/<helm-chart>
+                   - <helm-chart folder name under helm-charts folder in the package>
+                   - <helm-chart tgz file (w/ or w/o extension) under helm-charts folder in the package>
+                   - <URL_where_to_fetch_chart>
+                  ";
+                type string;
+              }
+              leaf helm-version {
+                description
+                  "Helm version to use for this helm-chart, v3 by default";
+                type enumeration {
+                  enum v3;
+                }
+                default v3;
+              }
+            }
+          }
+          leaf metric-service {
+            description
+              "Service name in the execution environment. For helm charts, it will be
+               the name of the kubernetes service used by the exporter to expose metrics
+               to the OSM collector.
+              ";
+            type string;
+          }
+          leaf connection-point-ref {
+            description
+              "String representing a leaf reference to the particular external connection point
+               This field should match /vnfd:vnfd-catalog/vnfd:vnfd/vnfd:id/vnfd:connection-point/vnfd:name
+              ";
+            type string;
+            // type leafref {
+            //   path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:id/vnfd:connection-point/vnfd:name";
+            // }
+          }

         }
       }
         }
       }

+

     }
   }
 
     }
   }
 

+  grouping vca-config-access {
+
+    container config-access {
+
+      description
+        "Indicates the way to access to the xNF or xDU for VCA configuration.
+         For the moment there is a single way (ssh-access).";
+
+      container ssh-access {
+
+        description
+          "If the xNF requires ssh and this parameter is set, SSH keys
+          will be injected so that VCA can configure the xNF or xDU via ssh.";
+
+        leaf required  {
+          description "whether ssh access is needed or not";
+          type boolean;
+          default false;
+        }
+
+        leaf default-user {
+          description "Default user for ssh";
+          type string;
+        }
+      }
+    }
+  } // END - grouping vca-config-access
+

   grouping vca-configuration {
     description
         "Common information in the descriptors for NS, VNF or VDU configuration.
   grouping vca-configuration {
     description
         "Common information in the descriptors for NS, VNF or VDU configuration.


@@ -318,6 +462,21 @@ module mano-types
         type string;
       }
 
         type string;
       }
 

+      leaf execution-environment-ref {
+        description
+          "Leaf reference to the particular execution environment";
+        type leafref {
+          path "../../execution-environment-list/id";
+        }
+      }
+
+      leaf execution-environment-primitive {
+        description
+          "Name of the primitive in the execution enviroment. If not explicit,
+           the leaf 'name' will be used as the name of the primitive.";
+        type string;
+      }
+

       list parameter {
         description
           "List of parameters to the config primitive.";
       list parameter {
         description
           "List of parameters to the config primitive.";


@@ -347,10 +506,18 @@ module mano-types
         case primitive-definition {
           leaf name {
             description
         case primitive-definition {
           leaf name {
             description

-              "Name of the configuration primitive.";
+              "Name of the configuration primitive in the execution environment.";

             type string;
           }
 
             type string;
           }
 

+          leaf execution-environment-ref {
+            description
+              "Leaf reference to the particular execution environment";
+            type leafref {
+              path "../../execution-environment-list/id";
+            }
+          }
+

           uses primitive-parameter-value;
 
           leaf user-defined-script {
           uses primitive-parameter-value;
 
           leaf user-defined-script {


@@ -373,10 +540,18 @@ module mano-types
       }
       leaf name {
         description
       }
       leaf name {
         description

-          "Name of the configuration primitive.";
+          "Name of the configuration primitive in the execution environment.";

         type string;
       }
 
         type string;
       }
 

+      leaf execution-environment-ref {
+        description
+          "Leaf reference to the particular execution environment";
+        type leafref {
+          path "../../execution-environment-list/id";
+        }
+      }
+

       uses primitive-parameter-value;
 
       leaf user-defined-script {
       uses primitive-parameter-value;
 
       leaf user-defined-script {


@@ -392,15 +567,17 @@ module mano-types
   typedef virtual-link-type {
     description
         "Type of virtual link
   typedef virtual-link-type {
     description
         "Type of virtual link

-         ELAN: A multipoint service connecting a set of VNFs
-         ELINE: For a simple point to point connection
-         //        between a VNF and the existing network.
+         ELAN: A multipoint service connecting a set of elements
+         ELINE: A point-to-point service connecting two elements
+         L3: A service providing either Layer-3 visibility (IP) between
+             VDUs/VNFs or explicit interconnection between two ELAN VLDs.";

          // ETREE: A multipoint service connecting one or
          //        more roots and a set of leaves, but
          //        preventing inter-leaf communication.";
     type enumeration {
       enum ELAN;
       enum ELINE;
          // ETREE: A multipoint service connecting one or
          //        more roots and a set of leaves, but
          //        preventing inter-leaf communication.";
     type enumeration {
       enum ELAN;
       enum ELINE;

+      enum L3;

       // enum ETREE;
     }
   }
       // enum ETREE;
     }
   }


@@ -1759,6 +1936,7 @@ module mano-types
       enum GT; // greater than
       enum LT; // less than
       enum EQ; // equal
       enum GT; // greater than
       enum LT; // less than
       enum EQ; // equal

+      enum NE; // not equal

     }
   }
 
     }
   }