Merge "Set default true to 'port-security-enable'"

[osm/IM.git] / models / yang / vnfd-base.yang

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 1fd2295..3ab3eab 100644 (file)
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -101,7 +101,7 @@ module vnfd-base
              E1000           : Emulate E1000 interface.
              RTL8139         : Emulate RTL8139 interface.
              PCNET           : Emulate PCNET interface.
              E1000           : Emulate E1000 interface.
              RTL8139         : Emulate RTL8139 interface.
              PCNET           : Emulate PCNET interface.

-             OM-MGMT         : Used to specify openmano mgmt external-connection type";
+             OM-MGMT         : Deprecated! Use VIRTIO instead and set the VNF management interface at vnfd:mgmt-interface:cp";

 
         type enumeration {
           enum OM-MGMT;
 
         type enumeration {
           enum OM-MGMT;


@@ -217,7 +217,7 @@ module vnfd-base
 
           case cp {
             description
 
           case cp {
             description

-                "Use the ip address associated with this connection point.";
+                "Use the ip address associated with this connection point. This cp is then considered as management.";

             leaf cp {
               type leafref {
                 path "../../connection-point/name";
             leaf cp {
               type leafref {
                 path "../../connection-point/name";


@@ -304,6 +304,10 @@ module vnfd-base
               path "../../../vdu/internal-connection-point/id";
             }
           }
               path "../../../vdu/internal-connection-point/id";
             }
           }

+          leaf ip-address {
+            description "IP address of the internal connection point";
+            type inet:ip-address;
+          }

         }
 
         uses manotypes:provider-network;
         }
 
         uses manotypes:provider-network;


@@ -392,6 +396,25 @@ module vnfd-base
 
         uses manotypes:image-properties;
 
 
         uses manotypes:image-properties;
 

+        list alternative-images {
+          key "vim-type";
+          description
+            "List of alternative images per VIM type.
+            Different images can be used for specific types of VIMs instead
+            of the default image. This allows deployments in sites where the
+            image identifier in the VIM is given by the VIM provider and
+            cannot be modified.
+            If an alternative image is specified for a VIM type, it will prevail
+            over the default image";
+
+          leaf vim-type {
+            description "VIM type: openvim, openstack, vmware, aws, etc.";
+            type string;
+          }
+
+          uses manotypes:image-properties;
+        }
+

         container vdu-configuration {
           uses manotypes:vca-configuration;
         }
         container vdu-configuration {
           uses manotypes:vca-configuration;
         }


@@ -465,6 +488,17 @@ module vnfd-base
             default "EXTERNAL";
           }
 
             default "EXTERNAL";
           }
 

+          leaf mac-address {
+            description
+                "MAC address of the interface.
+                Some VNFs require a specific MAC address to be configured
+                in the interface. While this is not recommended at all in
+                NFV environments, this parameter exists to allow those
+                scenarios.
+                This parameter will be likely deprecated in the future.";
+            type string;
+          }
+

           choice connection-point-type {
             case internal {
               leaf internal-connection-point-ref {
           choice connection-point-type {
             case internal {
               leaf internal-connection-point-ref {