Commit 14dee774 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'issue#6' into 'dev-v3.3.1' 

Issue#6 - NFVIFA_IFA011_8_4_2_4_cpumap

See merge request nfv/SOL006!61
parents 3587cb0e be2f9781

example-data/nfv-nsd.xml

+2 −2
Original line number Original line Diff line number Diff line 
<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">

<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">

  <vnfd>

  <vnfd>

    <id>ASA</id>

    <id>ASA</id>

    <provider>My Company</provider>

    <provider>My Company</provider>
@@ -133,4 +133,4 @@ 
      </ns-instantiation-level>

      </ns-instantiation-level>

    </df>

    </df>

  </nsd>

  </nsd>

</config>
 
</nfv>

src/yang/etsi-nfv-vnf.yang

+16 −0
Original line number Original line Diff line number Diff line
@@ -770,6 +770,22 @@ submodule etsi-nfv-vnf { 
              "GS NFV IFA011: Section 7.1.9.2.4,

              "GS NFV IFA011: Section 7.1.9.2.4,

               VirtualCpuPinningData information element.";

               VirtualCpuPinningData information element.";

          }

          }



	  leaf-list cpu-policy {

	    type enumeration {

	      enum "dedicated";

	      enum "shared";

	    }

	    description

	      "Shows the list of dedicated virtual CPU cores and

               shared virtual CPU cores in a VM. Dedicated refers to

               a virtual CPU core occupies one physical CPU core.

               Shared refers to multi virtual CPU cores shared one

               physical CPU core.";

            reference

              "GS NFV IFA011: Section 7.1.9.2.4,

               VirtualCpuPinningData information element.";

	  }

          description

          description

            "The virtual CPU pinning configuration for the

            "The virtual CPU pinning configuration for the

             virtualised compute resource.";

             virtualised compute resource.";