Resolved conflicts found during merge

src/yang/etsi-nfv-common.yang

@@ -280,6 +280,62 @@ submodule etsi-nfv-common {
       "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
    */

src/yang/etsi-nfv-vnf.yang

@@ -274,7 +274,7 @@ submodule etsi-nfv-vnf {
              VirtualNetworkInterfaceRequirements information element";
         }
 
-        leaf-list order {
+        leaf order {
           type uint32;
           description
             "The order of the NIC to be assigned on the compute
@@ -293,6 +293,27 @@ submodule etsi-nfv-vnf {
             "GS NFV IFA011: Section 7.1.6.4, VduCpd information
              element.";
         }
+
+        leaf vnic-type {
+	  type identityref {
+	    base 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";
+          reference
+            "GS NFV IFA011: Section 7.1.6.4, VduCpd information
+             element.";
+        }
         uses cpd;
 
         leaf security-group-rule-id {