Commit 38d9eb41 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#169' into 'master'

Proposed fix for Bug#169

See merge request nfv/SOL006!20
parents ddcea57e e092d97f
Loading
Loading
Loading
Loading
+3 −21
Original line number Diff line number Diff line
@@ -1241,8 +1241,10 @@ submodule etsi-nfv-vnf {
               element.";
          }
          uses local-affinity-or-anti-affinity-rule;

          list affinity-or-anti-affinity-group {
            key "id";

            description
              "Identifier(s) of the affinity or anti-affinity
               group(s) the VDU belongs to.";
@@ -1262,29 +1264,9 @@ submodule etsi-nfv-vnf {
                "GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity
                 information element.";
            }
            leaf type {
              type enumeration {
                enum affinity;
                enum anti-affinity;
              }
              description
                "Specifies whether the rule is an affinity rule or an
                 anti-affinity rule.";
              reference
                "GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity
                 information element.";
            }
            leaf scope {
              type affinity-scope;
              description
                "Specifies the scope of the rule, possible values are
                 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'";
              reference
                "GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity
                 information element.";
            }
          }
        }

        list virtual-link-profile {
          key "id flavour";
          description