Commit 0da778a6 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'master' into 'namespace' 

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang
parents c570c31b 8244d2cf

src/yang/etsi-nfv-vnf.yang

+2 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,8 @@ submodule etsi-nfv-vnf { 
          "GS NFV-IFA011: Section 7.1.6.6,

          "GS NFV-IFA011: Section 7.1.6.6,

           VirtualNetworkInterfaceRequirements information element";

           VirtualNetworkInterfaceRequirements information element";

      }

      }

      leaf niclo-requirements {



      leaf nicio-requirements {

        type leafref {

        type leafref {

          path "/nfv/vnfd/virtual-compute-descriptor/id";

          path "/nfv/vnfd/virtual-compute-descriptor/id";

        }

        }