Commit 90f0993a authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'v2.7.1' into 'bug#251' 

# Conflicts:
#   src/yang/etsi-nfv-nsd.yang
parents 63a46a21 4b1f5e69

src/yang/etsi-nfv-ns.yang

+19 −21
Original line number Original line Diff line number Diff line
@@ -490,14 +490,11 @@ submodule etsi-nfv-ns { 
                  path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";

                  path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";

                }

                }

              }

              }

            }

            container pnf {

            container pnf {

              leaf pnfd-id {

              leaf pnfd-id {

                must ". = deref(../../pnfd-profile-id)/../pnfd-id" {

                must ". = deref(../../pnfd-profile-id)/../pnfd-id" {

                }

                }

                type leafref {

                  path "../../../../../../pnfd/id";

                }

              }

                type leafref {

                type leafref {

                  path "/nfv:nfv/nfv:pnfd/nfv:id";

                  path "/nfv:nfv/nfv:pnfd/nfv:id";

                }

                }
@@ -507,6 +504,7 @@ submodule etsi-nfv-ns { 
                  path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";

                  path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";

                }

                }

              }

              }

            }

            container ns {

            container ns {

              leaf nsd-id {

              leaf nsd-id {

                must ". = deref(../../nested-ns-profile-id)/" +

                must ". = deref(../../nested-ns-profile-id)/" +
@@ -533,7 +531,7 @@ submodule etsi-nfv-ns { 
               CpdInConstituentElement information element";

               CpdInConstituentElement information element";

          }

          }

          description

          description

            "Identifies a CPD or SAPD in the context of a profile

            "Specifies a CPD or SAPD in the context of a profile

             of an NS constituent element.";

             of an NS constituent element.";

          reference

          reference

            "GS NFV IFA014: Section 6.4.6.2 NfpPositionElement

            "GS NFV IFA014: Section 6.4.6.2 NfpPositionElement

src/yang/etsi-nfv-nsd.yang

+2 −2
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ module etsi-nfv-nsd { 
  prefix nsd;

  prefix nsd;





  import etsi-nfv-descriptors {

  import etsi-nfv-descriptors {

    prefix vnf;

    prefix nfv;

  }

  }





  organization

  organization
@@ -31,7 +31,7 @@ module etsi-nfv-nsd { 
    list nsd {

    list nsd {

      key "id";

      key "id";

      max-elements 1;

      max-elements 1;

      uses vnf:nsd;

      uses nfv:nsd;

      description

      description

	"The NSD information element is a deployment template whose

	"The NSD information element is a deployment template whose

         instances are used by the NFVO for the lifecycle management

         instances are used by the NFVO for the lifecycle management