Commit 7b6e00bd authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

#18

parent cf804034

example-data/complex-vnfd.xml

+4 −12
Original line number Diff line number Diff line
@@ -156,17 +156,13 @@ 
        <id>control-plane-active</id>

        <min-number-of-instances>1</min-number-of-instances>

        <max-number-of-instances>1</max-number-of-instances>

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

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

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

      </vdu-profile>

      <vdu-profile>

        <id>control-plane-standby</id>

        <min-number-of-instances>1</min-number-of-instances>

        <max-number-of-instances>1</max-number-of-instances>

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

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

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

      </vdu-profile>

      <vdu-profile>

        <id>data-plane</id>
@@ -227,17 +223,13 @@ 
        <id>control-plane-active</id>

        <min-number-of-instances>1</min-number-of-instances>

        <max-number-of-instances>1</max-number-of-instances>

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

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

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

      </vdu-profile>

      <vdu-profile>

        <id>control-plane-standby</id>

        <min-number-of-instances>1</min-number-of-instances>

        <max-number-of-instances>1</max-number-of-instances>

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

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

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

      </vdu-profile>

      <vdu-profile>

        <id>data-plane</id>

src/yang/etsi-nfv-ns.yang

+12 −27
Original line number Diff line number Diff line
@@ -792,21 +792,16 @@ submodule etsi-nfv-ns { 


        uses local-affinity-or-anti-affinity-rule;



        list affinity-or-anti-affinity-group {

          key "id";



        leaf-list affinity-or-anti-affinity-group-id {

          type leafref {

            path "../../affinity-or-anti-affinity-group/id";

          }

          description

            "Identifier(s) of the affinity or anti-affinity

             group(s) the VnfProfile belongs to.";

          reference

            "GS NFV IFA014: Section 6.3.3.2 VnfProfile information

             element";



          leaf id {

            type leafref {

              path "../../../affinity-or-anti-affinity-group/id";

            }

          }

        }



        list virtual-link-connectivity {
@@ -1004,9 +999,10 @@ submodule etsi-nfv-ns { 


        uses local-affinity-or-anti-affinity-rule;



        list affinity-or-anti-affinity-group {

          key "id";



        leaf-list affinity-or-anti-affinity-group-id {

          type leafref {

            path "../../affinity-or-anti-affinity-group/id";

          }

          description

            "Identifies an affinity or anti-affinity group the

             VLs instantiated according to the VlProfile belong
@@ -1014,12 +1010,6 @@ submodule etsi-nfv-ns { 
          reference

            "GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile

             information element";



          leaf id {

            type leafref {

              path "../../../affinity-or-anti-affinity-group/id";

            }

          }

        }



        container max-bitrate-requirements {
@@ -1452,21 +1442,16 @@ submodule etsi-nfv-ns { 
             element";

        }



        list affinity-or-anti-affinity-group-id {

          key "id";



        leaf-list affinity-or-anti-affinity-group-id {

          type leafref {

            path "../../affinity-or-anti-affinity-group/id";

          }

          description

            "Identifies an affinity or anti-affinity group the NSs

             created according to this NsProfile belongs to.";

          reference

            "GS NFV IFA014: Section 6.3.11.2 NsProfile information

             element";



          leaf id {

            type leafref {

              path "../../../affinity-or-anti-affinity-group/id";

            }

          }

        }



        list virtual-link-connectivity {

src/yang/etsi-nfv-vnf.yang

+7 −21
Original line number Diff line number Diff line
@@ -1566,27 +1566,16 @@ submodule etsi-nfv-vnf { 
        }

        uses local-affinity-or-anti-affinity-rule;



        list affinity-or-anti-affinity-group {

          key "id";



        leaf-list affinity-or-anti-affinity-group-id {

          type leafref {

            path "../../affinity-or-anti-affinity-group/id";

          }

          description

            "Identifier(s) of the affinity or anti-affinity

             group(s) the VDU belongs to.";

          reference

            "GS NFV IFA011: Section 7.1.8.3, VduProfile information

             element.";

          leaf id {

            type leafref {

              path "../../../" +

                "affinity-or-anti-affinity-group/id";

            }

            description

              "Identifies an affinity or anti-affinity group to

               which the affinity or anti-affinity rule applies.";

            reference

              "GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity

               information element.";

          }

        }

      }
@@ -1623,12 +1612,9 @@ submodule etsi-nfv-vnf { 
        }

        uses local-affinity-or-anti-affinity-rule;



        list affinity-or-anti-affinity-group {

          key "id";

          leaf id {

        leaf-list affinity-or-anti-affinity-group-id {

          type leafref {

              path "../../../affinity-or-anti-affinity-group/id";

            }

            path "../../affinity-or-anti-affinity-group/id";

          }

          description

            "Identifier(s) of the affinity or anti-affinity