Merge branch 'v2.7.1'

Merging v2.7.1 branch into master.

example-data/complex-vnfd.xml

@@ -78,11 +78,11 @@
         <num-virtual-cpu>16</num-virtual-cpu>
       </virtual-cpu>
     </virtual-compute-desc>
-    <virtual-storage-descriptor>
+    <virtual-storage-desc>
       <id>root</id>
       <type-of-storage>root-storage</type-of-storage>
       <size-of-storage>10</size-of-storage>
-    </virtual-storage-descriptor>
+    </virtual-storage-desc>
     <sw-image-desc>
       <id>CP</id>
       <name>CP</name>
@@ -116,17 +116,13 @@
     <int-virtual-link-desc>
       <id>internal-vl</id>
       <connectivity-type>
-        <layer-protocol>
-          <protocol>ipv4</protocol>
-        </layer-protocol>
+        <layer-protocol>ipv4</layer-protocol>
       </connectivity-type>
     </int-virtual-link-desc>
     <int-virtual-link-desc>
       <id>mgmt</id>
       <connectivity-type>
-        <layer-protocol>
-          <protocol>ipv4</protocol>
-        </layer-protocol>
+        <layer-protocol>ipv4</layer-protocol>
       </connectivity-type>
     </int-virtual-link-desc>
     <ext-cpd>

example-data/nfv-nsd.xml

@@ -49,9 +49,10 @@
       </checksum>
       <container-format>bare</container-format>
       <disk-format>qcow2</disk-format>
+      <min-disk>20</min-disk>
       <min-ram>2.0</min-ram>
       <size>1</size>
-      <image>http://www.cisco.com/asa.qcow2</image>
+      <image>http://www.mycompany.com/asa.qcow2</image>
     </sw-image-desc>
     <ext-cpd>
       <id>inside</id>
@@ -132,4 +133,4 @@
       </ns-instantiation-level>
     </df>
   </nsd>
-</nsd>
+</config>

example-data/nfv-vnfd.xml

@@ -48,9 +48,10 @@
     </checksum>
     <container-format>bare</container-format>
     <disk-format>qcow2</disk-format>
+    <min-disk>20</min-disk>
     <min-ram>2.0</min-ram>
     <size>1</size>
-    <image>http://www.cisco.com/asa.qcow2</image>
+    <image>http://www.mycompany.com/asa.qcow2</image>
   </sw-image-desc>
   <ext-cpd>
     <id>inside</id>

example-data/nfv.xml

@@ -54,12 +54,23 @@
       <size>1</size>
       <image>http://mycompany.images.com/asa.qcow2</image>
     </sw-image-desc>
+    <int-virtual-link-desc>
+      <id>inside-vl</id>
+      <flavour>
+	<id>1g</id>
+	<qos>
+	  <latency>1</latency>
+	  <packet-delay-variation>1</packet-delay-variation>
+	  <packet-loss-ratio>0.02</packet-loss-ratio>
+	</qos>
+      </flavour>
+      <connectivity-type>
+	<layer-protocol>ethernet</layer-protocol>
+      </connectivity-type>
+    </int-virtual-link-desc>
     <ext-cpd>
       <id>inside</id>
-      <int-cpd>
-	<vdu-id>firewall</vdu-id>
-	<cpd>inside</cpd>
-      </int-cpd>
+      <int-virtual-link-desc>inside-vl</int-virtual-link-desc>
       <layer-protocol>ethernet</layer-protocol>
     </ext-cpd>
     <ext-cpd>
@@ -85,6 +96,26 @@
         <min-number-of-instances>1</min-number-of-instances>
         <max-number-of-instances>2</max-number-of-instances>
       </vdu-profile>
+      <virtual-link-profile>
+	<id>inside-vl</id>
+	<flavour>1g</flavour>
+	<max-bit-rate-requirements>
+	  <root>10</root>
+	</max-bit-rate-requirements>
+	<min-bit-rate-requirements>
+	  <root>1</root>
+	</min-bit-rate-requirements>
+	<virtual-link-protocol-data>
+	  <associated-layer-protocol>ipv4</associated-layer-protocol>
+	  <l3-protocol-data>
+	    <name>inside-network</name>
+	    <ip-version>ipv4</ip-version>
+	    <cidr>192.138.0.0/8</cidr>
+	    <gateway-ip>192.138.0.1</gateway-ip>
+	    <dhcp-enabled>true</dhcp-enabled>
+	  </l3-protocol-data>
+	</virtual-link-protocol-data>
+      </virtual-link-profile>
       <instantiation-level>
         <id>double</id>
         <vdu-level>

src/yang/etsi-nfv-common.yang

@@ -9,6 +9,14 @@ submodule etsi-nfv-common {
   description
     "Common data types for ETSI data models.";
 
+  revision 2019-10-01 {
+    description
+      "Version 2.7.1.
+
+       Common data structures to support VNFD and NSD according to:
+       ETSI GS NFV-IFA 014 Ed271v264
+       ETSI GS NFV-IFA 011 Ed271v264";
+  }
   revision 2019-04-25 {
     description
       "Initial revision
@@ -243,6 +251,99 @@ submodule etsi-nfv-common {
       "Ephemeral type of storage.";
   }
 
+  identity forwarding-behaviour {
+    description
+      "Base identity for forwarding behaviour.";
+  }
+
+  identity all {
+    base forwarding-behaviour;
+    description
+      "Traffic flows shall be forwarded simultaneously to all CP
+       or SAP instances created from the referenced CP profile(s).";
+  }
+
+  identity lb {
+    base forwarding-behaviour;
+    description
+      "Traffic flows shall be forwarded to one CP or SAP instance
+       created from the referenced CP profile(s) selected based on
+       a load-balancing algorithm.";
+  }
+
+  identity vip-function {
+    description
+      "Indicates the function the virtual IP address is used for.";
+  }
+
+  identity high-availability {
+    base vip-function;
+    description
+      "High availability function.";
+  }
+
+  identity load-balancing {
+    base vip-function;
+    description
+      "Load balancing function.";
+  }
+
+  identity vnic-type {
+    description
+      "Describes the type of the virtual network interface realizing
+       the CPs instantiated from this CPD. This is used to determine
+       which mechanism driver(s) to be used to bind the port. Value:
+       • NORMAL
+       • VIRTIO
+       • DIRECT
+       • BAREMETAL
+       • VIRTIO-FORWARDER
+       • DIRECT-PHYSICAL
+       • SMART-NIC";
+  }
+
+  identity normal {
+    base vnic-type;
+    description
+      "Normal NIC.";
+  }
+
+  identity virtio {
+    base vnic-type;
+    description
+      "VirtIO NIC.";
+  }
+
+  identity direct {
+    base vnic-type;
+    description
+      "Direct NIC type.";
+  }
+
+  identity bare-metal {
+    base vnic-type;
+    description
+      "Bare metal NIC type.";
+  }
+
+  identity virtio-forwarder {
+    base vnic-type;
+    description
+      "VirtIO Forwarder NIC type.";
+  }
+
+  identity direct-physical {
+    base vnic-type;
+    description
+      "Direct physical NIC type.";
+  }
+
+  identity smart-nic {
+    base vnic-type;
+    description
+      "SmartNIC or Smart NIC type.";
+  }
+
   /*
    * Typedefs
    */
@@ -294,8 +395,8 @@ submodule etsi-nfv-common {
 
   grouping local-affinity-or-anti-affinity-rule {
     list local-affinity-or-anti-affinity-rule {
-      key "affinity-type affinity-scope";
-      leaf affinity-type {
+      key "type scope";
+      leaf type {
         type affinity-type;
         description
           "Specifies whether the rule is an affinity rule or an
@@ -305,7 +406,7 @@ submodule etsi-nfv-common {
            LocalAffinityOrAntiAffinityRule information element.";
       }
 
-      leaf affinity-scope {
+      leaf scope {
         type affinity-scope;
         description
           "Specifies the scope of the rule, possible values are

src/yang/etsi-nfv-descriptors.yang

@@ -14,6 +14,13 @@ module etsi-nfv-descriptors {
   description
     "Network Function Virtualization Descriptors";
 
+  revision 2019-10-01 {
+    description
+      "Version 2.7.1.
+
+       NSD and PNFD according to ETSI GS NFV-IFA 014 Ed271v264
+       VNFD according to ETSI GS NFV-IFA 011 Ed271v264.";
+  }
   revision 2019-04-25 {
     description
       "Initial revision.
@@ -24,6 +31,7 @@ module etsi-nfv-descriptors {
   container nfv {
     list vnfd {
       key "id";
+
       description
         "A VNF Descriptor (VNFD) is a deployment template which
          describes a VNF in terms of deployment and operational

src/yang/etsi-nfv-nsd.yang

@@ -4,7 +4,7 @@ module etsi-nfv-nsd {
   prefix nsd;
 
   import etsi-nfv-descriptors {
-    prefix vnf;
+    prefix nfv;
   }
 
   organization
@@ -13,6 +13,14 @@ module etsi-nfv-nsd {
   description
     "Network Services Descriptors";
 
+  revision 2019-10-01 {
+    description
+      "Version 2.7.1.
+
+       Common data structures to support VNFD and NSD according to:
+       ETSI GS NFV-IFA 014 Ed271v264
+       ETSI GS NFV-IFA 011 Ed271v264";
+  }
   revision 2019-04-25 {
     description
       "Initial revision.
@@ -20,23 +28,10 @@ module etsi-nfv-nsd {
   }
 
   container nsd {
-    list vnfd {
-      key "id";
-      description
-        "A VNF Descriptor (VNFD) is a deployment template which
-         describes a VNF in terms of deployment and operational
-         behaviour requirements. It also contains connectivity,
-         interface and virtualised resource requirements";
-      reference
-        "GS NFV-IFA011: Section 7.1.2, VNFD information element";
-
-      uses vnf:vnfd;
-    }
-
     list nsd {
       key "id";
       max-elements 1;
-      uses vnf:nsd;
+      uses nfv:nsd;
       description
 	"The NSD information element is a deployment template whose
          instances are used by the NFVO for the lifecycle management
@@ -45,18 +40,5 @@ module etsi-nfv-nsd {
         "GS NFV-IFA014: Section 6.2.2, Network Service Descriptor
          information element";
     }
-
-    list pnfd {
-      key "id";
-
-      description
-	"The Pnfd information element is a deployment template
-         enabling on-boarding PNFs and referencing them from an
-         NSD. It focuses on connectivity aspects only.";
-      reference
-        "GS NFV-IFA014: Section 6.6.2, Pnfd information element.";
-
-      uses vnf:pnfd;
-    }
   }
 }

src/yang/etsi-nfv-pnf.yang

@@ -12,6 +12,14 @@ submodule etsi-nfv-pnf {
   description
     "Models for PNFD according to GS NFV-IFA 014.";
 
+  revision 2019-10-01 {
+    description
+      "Version 2.7.1.
+
+       Common data structures to support VNFD and NSD according to:
+       ETSI GS NFV-IFA 014 Ed271v264
+       ETSI GS NFV-IFA 011 Ed271v264";
+  }
   revision 2019-04-25 {
     description
       "Initial revision.
@@ -92,18 +100,6 @@ submodule etsi-nfv-pnf {
         "GS NFV-IFA014: Section 6.6.2, Pnfd information element";
     }
 
-    list security {
-      key "signature";
-      uses security-parameters;
-      description
-        "Provides a signature to prevent tampering.
-         Editor's Note: While IFA014 does specify that the PNFD
-         includes a security parameter. SOL001 does not have one.
-         We need to harmonize SOL001 & SOL006 on this point.";
-      reference
-        "GS NFV-IFA014: Section 6.6.2, Pnfd information element";
-    }
-
     leaf geographical-location-info {
       type string;
       description

src/yang/etsi-nfv-pnfd.yang

@@ -13,6 +13,12 @@ module etsi-nfv-pnfd {
   description
     "Physcial Network Function Descriptor.";
 
+  revision 2019-10-01 {
+    description
+      "Version 2.7.1.
+
+       NSD according to ETSI GS NFV-IFA 014 Ed271v264.";
+  }
   revision 2019-04-25 {
     description
       "Initial revision.

src/yang/etsi-nfv-vnfd.yang

@@ -12,7 +12,13 @@ module etsi-nfv-vnfd {
 
   description
     "Virtual Network Function Descriptor.";
-
+  
+  revision 2019-10-01 {
+    description
+      "Revision 2.7.1.
+      
+       VNFD according to ETSI GS NFV-IFA 011 Ed271v264.";
+  }
   revision 2019-03-18 {
     description
       "Initial revision.