diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 80882997a6268cd25828f7df8e0135883a8c33e3..ac87a2ac86cf528dedfdec6443dbd6928f8145e0 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -413,6 +413,8 @@ submodule etsi-nfv-common {
       enum "zone";
       enum "nfvi-pop";
       enum "network-link-and-node";
+      enum "L2-network";
+      enum "conatiner_namespace";
     }
   }
 
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index aa0b9099a2271490b778e36f9bed19fda7c0798d..208939e2e4ce9e5b4dafb71775ca7fe266cca3e3 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -927,6 +927,18 @@ submodule etsi-nfv-ns {
                  element";
             }
           }
+
+          leaf-list affinity-or-anti-affinity-group-id {
+            type leafref {
+              path "../../../affinity-or-anti-affinity-group/id";
+            }
+            description
+              "Reference(s) the affinity or anti-affinity
+               group(s) the NsVirtualLinkConnectivity belong to.";
+            reference
+              "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
+               information element.";
+          }
         }
 
         leaf service-availability-level {
@@ -1032,6 +1044,18 @@ submodule etsi-nfv-ns {
                  element";
             }
           }
+
+          leaf-list affinity-or-anti-affinity-group-id {
+            type leafref {
+              path "../../../affinity-or-anti-affinity-group/id";
+            }
+            description
+              "Reference(s) the affinity or anti-affinity
+               group(s) the NsVirtualLinkConnectivity belong to.";
+            reference
+              "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
+               information element.";
+          }
         }
       }
 
@@ -1374,6 +1398,8 @@ submodule etsi-nfv-ns {
                 • NFVI_NODE
                 • NFVI_POP
                 • NETWORK_LINK_AND_NODE
+                • L2_NETWORK
+                • CONTAINER_NAMESPACE
                 • etc.";
           reference
             "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
@@ -1756,6 +1782,18 @@ submodule etsi-nfv-ns {
                  element";
             }
           }
+
+          leaf-list affinity-or-anti-affinity-group-id {
+            type leafref {
+              path "../../../affinity-or-anti-affinity-group/id";
+            }
+            description
+              "Reference(s) the affinity or anti-affinity
+               group(s) the NsVirtualLinkConnectivity belong to.";
+            reference
+              "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
+               information element.";
+          }
         }
       }