Merge branch 'issue#19' into 'dev-v3.3.1'

SOL006ed331 FEAT10 IFA014 Augment anti-affinity scope

See merge request !76

src/yang/etsi-nfv-common.yang

@@ -386,6 +386,7 @@ submodule etsi-nfv-common {
       enum "zone-group";
       enum "zone";
       enum "nfvi-pop";
+      enum "network-link-and-node";
     }
   }
 

src/yang/etsi-nfv-ns.yang

@@ -67,7 +67,7 @@ submodule etsi-nfv-ns {
         type affinity-scope;
         description
           "Specifies the scope of the rule, possible values are
-           'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
+           'NFVI-PoP', 'NFVI-node' network-link-and-node etc.";
         reference
           "GS NFV IFA014: Section 6.3.8.2,
            LocalAffinityOrAntiAffinityRule information element.";
@@ -1168,7 +1168,8 @@ submodule etsi-nfv-ns {
           type affinity-scope;
           description
             "Specifies the scope of the affinity or anti-affinity
-             relationship e.g. a NFVI node, an NFVI PoP, etc.";
+             relationship e.g. a NFVI node, an NFVI PoP,
+             network-link-and-node etc.";
           reference
             "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
              information element";

src/yang/etsi-nfv-vnf.yang

@@ -196,8 +196,9 @@ submodule etsi-nfv-vnf {
       leaf scope {
         type affinity-scope;
         description
-          "Specifies the scope of the rule, possible values are
-           'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
+          "Specifies the scope of the rule. Possible values are
+           'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node', and
+           'network-link-and-node'.";
         reference
           "GS NFV IFA011: Section 7.1.8.11,
            LocalAffinityOrAntiAffinityRule information element.";
@@ -2520,8 +2521,8 @@ submodule etsi-nfv-vnf {
         leaf id {
           type string;
           description
-            "Identifies an affinity or anti-affinity group to which
-             the affinity or anti-affinity rule applies.";
+            "Identifier of this AffinityOrAntiAffinityGroup
+             information element.";
           reference
             "GS NFV IFA011: Section 7.1.8.12
              AffinityOrAntiAffinityGroup information element";
@@ -2531,8 +2532,8 @@ submodule etsi-nfv-vnf {
           mandatory true;
           type affinity-type;
           description
-            "Specifies whether the rule is an affinity rule or an
-             anti-affinity rule.";
+            "Specifies the type of relationship that the members of
+             the group have: 'affinity' or 'anti-affinity'.";
           reference
             "GS NFV IFA011: Section 7.1.8.12
              AffinityOrAntiAffinityGroup information element";
@@ -2542,8 +2543,9 @@ submodule etsi-nfv-vnf {
           mandatory true;
           type affinity-scope;
           description
-            "Specifies the scope of the rule, possible values are
-             'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
+            "Specifies the scope of the affinity or anti-affinity
+             relationship. Possible values are 'NFVI-PoP', 'Zone',
+             'ZoneGroup', 'NFVI-node' and 'network-link-and-node'.";
           reference
             "GS NFV IFA011: Section 7.1.8.12
              AffinityOrAntiAffinityGroup information element";