Revert "Merge branch 'revert-6809000a' into 'dev-v3.6.1'"

This reverts merge request !107

src/yang/etsi-nfv-vnf.yang

@@ -94,9 +94,26 @@ submodule etsi-nfv-vnf {
            VirtualNetworkInterfaceRequirements information element";
       }
 
+      list standardized-network-interface-requirements {
+        key "key";
+        max-elements "1";
+
+        leaf key {
+          type string;
+        }
+        leaf value {
+          type string;
+        }
+        description
+          "The requirements on standardized network interface
+		   capabilities, e.g., SR-IOV.";
+        reference
+          "GS NFV-IFA011: Section 7.1.6.6,
+           VirtualNetworkInterfaceRequirements information element";
+      }
+
       list network-interface-requirements {
         key "key";
-        min-elements "1";
         max-elements "1";
 
         leaf key {
@@ -106,9 +123,11 @@ submodule etsi-nfv-vnf {
           type string;
         }
         description
-          "The network interface requirements. An element from an
-           array of key-value pairs that articulate the network
-           interface deployment requirements.";
+          "The additional network interface requirements beyond
+           those specified in the standardizedNetworkInterface
+           Requirements attribute.An element from an array of
+           key-value pairs that articulate the network interface
+           deployment requirements.";
         reference
           "GS NFV-IFA011: Section 7.1.6.6,
            VirtualNetworkInterfaceRequirements information element";