Commit cb62bb4c authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#224' into 'master' 

Fix for bug#224

See merge request nfv/SOL006!36
parents bdaf0543 5c0a9e76

example-data/nfv.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
      <virtual-storage-desc>asa-vsd</virtual-storage-desc>

      <virtual-storage-desc>asa-vsd</virtual-storage-desc>

      <sw-image-desc>asa-image</sw-image-desc>

      <sw-image-desc>asa-image</sw-image-desc>

    </vdu>

    </vdu>

    <virtual-compute-descriptor>

    <virtual-compute-desc>

      <id>asa-vcd</id>

      <id>asa-vcd</id>

      <virtual-memory>

      <virtual-memory>

        <size>4.0</size>

        <size>4.0</size>
@@ -33,7 +33,7 @@ 
      <virtual-cpu>

      <virtual-cpu>

        <num-virtual-cpu>2</num-virtual-cpu>

        <num-virtual-cpu>2</num-virtual-cpu>

      </virtual-cpu>

      </virtual-cpu>

    </virtual-compute-descriptor>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-descriptor>

      <id>asa-vsd</id>

      <id>asa-vsd</id>

      <type-of-storage>root</type-of-storage>

      <type-of-storage>root</type-of-storage>
@@ -120,7 +120,7 @@ 
      <virtual-storage-desc>csr-vsd</virtual-storage-desc>

      <virtual-storage-desc>csr-vsd</virtual-storage-desc>

      <sw-image-desc>csr-image</sw-image-desc>

      <sw-image-desc>csr-image</sw-image-desc>

    </vdu>

    </vdu>

    <virtual-compute-descriptor>

    <virtual-compute-desc>

      <id>csr-vcd</id>

      <id>csr-vcd</id>

      <virtual-memory>

      <virtual-memory>

        <size>4.0</size>

        <size>4.0</size>
@@ -128,7 +128,7 @@ 
      <virtual-cpu>

      <virtual-cpu>

        <num-virtual-cpu>2</num-virtual-cpu>

        <num-virtual-cpu>2</num-virtual-cpu>

      </virtual-cpu>

      </virtual-cpu>

    </virtual-compute-descriptor>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-descriptor>

      <id>csr-vsd</id>

      <id>csr-vsd</id>

      <type-of-storage>root</type-of-storage>

      <type-of-storage>root</type-of-storage>

src/yang/etsi-nfv-vnf.yang

+4 −5
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ submodule etsi-nfv-vnf { 




      leaf nicio-requirements {

      leaf nicio-requirements {

        type leafref {

        type leafref {

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

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

        }

        }

        description

        description

          "This references (couples) the CPD with any logical node I/O

          "This references (couples) the CPD with any logical node I/O
@@ -291,10 +291,9 @@ submodule etsi-nfv-vnf { 
        }

        }

        leaf virtual-compute-desc {

        leaf virtual-compute-desc {

          type leafref {

          type leafref {

            path "../../nfv:virtual-compute-descriptor/" +

            path "../../nfv:virtual-compute-desc/nfv:id";

                 "nfv:id";

          }

          }

          must "../../nfv:virtual-compute-descriptor[id=current()]/" +

          must "../../nfv:virtual-compute-desc[id=current()]/" +

               "nfv:virtual-memory/size >=" +

               "nfv:virtual-memory/size >=" +

               "../../nfv:sw-image-desc[id=current()/" +

               "../../nfv:sw-image-desc[id=current()/" +

               "../sw-image-desc]/min-ram" {

               "../sw-image-desc]/min-ram" {
@@ -409,7 +408,7 @@ submodule etsi-nfv-vnf { 
        }

        }

      }

      }





      list virtual-compute-descriptor {

      list virtual-compute-desc {

        key "id";

        key "id";

        description

        description

          "Defines descriptors of virtual compute resources to be

          "Defines descriptors of virtual compute resources to be