X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fvnfr.yang;h=2ad642ef6fa7d2bb81df1fd7406af7f247a1842f;hb=refs%2Fchanges%2F34%2F734%2F1;hp=4a427d4a1dc5a9e19775522eb94c2b99ead41d44;hpb=255ff03a528a3090ce7f46f0a63b65da3e6f9bcf;p=osm%2FSO.git

diff --git a/models/plugins/yang/vnfr.yang b/models/plugins/yang/vnfr.yang
index 4a427d4a..2ad642ef 100644
--- a/models/plugins/yang/vnfr.yang
+++ b/models/plugins/yang/vnfr.yang
@@ -191,7 +191,7 @@ module vnfr
       }
 
       leaf create-time {
-        description 
+        description
           "Creation timestamp of this Virtual Network 
           Function.  The timestamp is expressed as 
           seconds since unix epoch - 1970-01-01T00:00:00Z";
@@ -199,6 +199,14 @@ module vnfr
         type uint32;
       }
 
+      leaf uptime {
+        description
+          "Active period of this Virtual Network Function.
+          Uptime is expressed in seconds";
+
+        type uint32;
+      }
+
       leaf vnfd-ref {
         description "Reference to VNFD";
         type leafref {
@@ -252,7 +260,7 @@ module vnfr
         uses vnfd:common-connection-point;
 
         leaf vlr-ref {
-          description 
+          description
               "Reference to the VLR associated with this connection point";
           type  leafref {
             path "/vlr:vlr-catalog/vlr:vlr/vlr:id";
@@ -260,10 +268,16 @@ module vnfr
         }
 
         leaf ip-address {
-          description 
+          description
               "IP address assigned to the external connection point";
           type inet:ip-address;
         }
+        leaf mac-address {
+          description
+              "MAC address assigned to the external connection point";
+          // type inet:mac-address;
+          type string;
+        }
         leaf connection-point-id {
           rwpb:field-inline "true";
           rwpb:field-string-max 64;
@@ -351,10 +365,16 @@ module vnfr
           uses vnfd:common-connection-point;
 
           leaf ip-address {
-            description 
-                "IP address assigned to the external connection point";
+            description
+                "IP address assigned to the internal connection point";
             type inet:ip-address;
           }
+          leaf mac-address {
+            description
+                "MAC address assigned to the internal connection point";
+            // type inet:mac-address;
+            type string;
+          }
         }
 
         list internal-interface {