Commit a82d9945 authored by ramanathan's avatar ramanathan
Browse files

Merge branch 'issue#33' into 'dev-v3.5.1' 

issue#33 fix AffinityOrAntiAffinityGroup element information in vnfd and nsd

See merge request nfv/SOL006!90
parents 8f157276 b0e989a0

example-data/complex-vnfd.xml

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ 
      </lcm-operations-configuration>

      <affinity-or-anti-affinity-group>

        <id>control-plane</id>

        <type>anti-affinity</type>

        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>

        <scope>nfvi-node</scope>

      </affinity-or-anti-affinity-group>

    </df>
@@ -328,7 +328,7 @@ 
      </lcm-operations-configuration>

      <affinity-or-anti-affinity-group>

        <id>control-plane</id>

        <type>anti-affinity</type>

        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>

        <scope>nfvi-node</scope>

      </affinity-or-anti-affinity-group>

    </df>

src/yang/etsi-nfv-ns.yang

+11 −4
Original line number Diff line number Diff line
@@ -1333,12 +1333,15 @@ submodule etsi-nfv-ns { 
             information element";

        }



        leaf type {

        leaf affinityorAntiaffinity {

          mandatory true;

          type affinity-type;

          description

            "Specifies the type of relationship that the members of

             the group have: 'affinity' or 'anti-affinity.'";

             the group have.

             Values:

                • AFFINITY

                • ANTI-AFFINITY";

          reference

            "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity

             information element";
@@ -1349,8 +1352,12 @@ 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,

             network-link-and-node etc.";

             relationship.

             Values:

                • NFVI_NODE

                • 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

+12 −4
Original line number Diff line number Diff line
@@ -2643,12 +2643,15 @@ submodule etsi-nfv-vnf { 
             AffinityOrAntiAffinityGroup information element";

        }



        leaf type {

        leaf affinityorAntiaffinity {

          mandatory true;

          type affinity-type;

          description

            "Specifies the type of relationship that the members of

             the group have: 'affinity' or 'anti-affinity'.";

             the group have.

             Values:

                • AFFINITY

                • ANTI-AFFINITY";

          reference

            "GS NFV IFA011: Section 7.1.8.12

             AffinityOrAntiAffinityGroup information element";
@@ -2659,8 +2662,13 @@ submodule etsi-nfv-vnf { 
          type affinity-scope;

          description

            "Specifies the scope of the affinity or anti-affinity

             relationship. Possible values are 'NFVI-PoP', 'Zone',

             'ZoneGroup', 'NFVI-node' and 'network-link-and-node'.";

             relationship.

             Values:

                • NFVI-PoP

                • Zone

                • ZoneGroup

                • NFVI-node

                • network-link-and-node";

          reference

            "GS NFV IFA011: Section 7.1.8.12

             AffinityOrAntiAffinityGroup information element";