Commit 3ecb85b2 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Address NFVIFA(19)000548

parent fb9620e7

example-data/complex-vnfd.xml

+4 −8
Original line number Diff line number Diff line
@@ -78,11 +78,11 @@ 
        <num-virtual-cpu>16</num-virtual-cpu>

      </virtual-cpu>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-desc>

      <id>root</id>

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

      <size-of-storage>10</size-of-storage>

    </virtual-storage-descriptor>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>CP</id>

      <name>CP</name>
@@ -116,17 +116,13 @@ 
    <int-virtual-link-desc>

      <id>internal-vl</id>

      <connectivity-type>

        <layer-protocol>

          <protocol>ipv4</protocol>

        </layer-protocol>

        <layer-protocol>ipv4</layer-protocol>

      </connectivity-type>

    </int-virtual-link-desc>

    <int-virtual-link-desc>

      <id>mgmt</id>

      <connectivity-type>

        <layer-protocol>

          <protocol>ipv4</protocol>

        </layer-protocol>

        <layer-protocol>ipv4</layer-protocol>

      </connectivity-type>

    </int-virtual-link-desc>

    <ext-cpd>

example-data/nfv-nsd.xml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
      </checksum>

      <container-format>bare</container-format>

      <disk-format>qcow2</disk-format>

      <min-disk>1</min-disk>

      <min-ram>2.0</min-ram>

      <size>1</size>

      <image>http://www.cisco.com/asa.qcow2</image>

example-data/nfv-vnfd.xml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
    </checksum>

    <container-format>bare</container-format>

    <disk-format>qcow2</disk-format>

    <min-disk>1</min-disk>

    <min-ram>2.0</min-ram>

    <size>1</size>

    <image>http://www.cisco.com/asa.qcow2</image>

example-data/nfv.xml

+8 −8
Original line number Diff line number Diff line
@@ -284,10 +284,10 @@ 
      </connectivity-type>

      <df>

        <id>normal</id>

        <qos>

        <ns-qos>

          <latency>0</latency>

          <packet-delay-variation>0</packet-delay-variation>

        </qos>

        </ns-qos>

      </df>

    </virtual-link-desc>

    <virtual-link-desc>
@@ -297,10 +297,10 @@ 
      </connectivity-type>

      <df>

        <id>normal</id>

        <qos>

        <ns-qos>

          <latency>0</latency>

          <packet-delay-variation>0</packet-delay-variation>

        </qos>

        </ns-qos>

      </df>

    </virtual-link-desc>

    <virtual-link-desc>
@@ -310,10 +310,10 @@ 
      </connectivity-type>

      <df>

        <id>normal</id>

        <qos>

        <ns-qos>

          <latency>0</latency>

          <packet-delay-variation>0</packet-delay-variation>

        </qos>

        </ns-qos>

      </df>

    </virtual-link-desc>

    <df>
@@ -533,10 +533,10 @@ 
      </connectivity-type>

      <df>

        <id>r2fw</id>

        <qos>

        <ns-qos>

          <latency>1000</latency>

          <packet-delay-variation>2</packet-delay-variation>

        </qos>

        </ns-qos>

      </df>

    </virtual-link-desc>

    <df>

src/yang/etsi-nfv-ns.yang

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ submodule etsi-nfv-ns { 
             information element";

        }



        container qos {

        container ns-qos {

          presence "VL QoS parameters";

          description

            "The QoS information element specifies quality of