Commit 70442076 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Bug#251

parent c1002184

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>20</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>20</min-disk>

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

    <size>1</size>

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

example-data/nfv.xml

+35 −4
Original line number Diff line number Diff line
@@ -54,12 +54,23 @@ 
      <size>1</size>

      <image>http://mycompany.images.com/asa.qcow2</image>

    </sw-image-desc>

    <int-virtual-link-desc>

      <id>inside-vl</id>

      <flavour>

	<id>1g</id>

	<qos>

	  <latency>1</latency>

	  <packet-delay-variation>1</packet-delay-variation>

	  <packet-loss-ratio>0.02</packet-loss-ratio>

	</qos>

      </flavour>

      <connectivity-type>

	<layer-protocol>ethernet</layer-protocol>

      </connectivity-type>

    </int-virtual-link-desc>

    <ext-cpd>

      <id>inside</id>

      <int-cpd>

	<vdu-id>firewall</vdu-id>

	<cpd>inside</cpd>

      </int-cpd>

      <int-virtual-link-desc>inside-vl</int-virtual-link-desc>

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    <ext-cpd>
@@ -85,6 +96,26 @@ 
        <min-number-of-instances>1</min-number-of-instances>

        <max-number-of-instances>2</max-number-of-instances>

      </vdu-profile>

      <virtual-link-profile>

	<id>inside-vl</id>

	<flavour>1g</flavour>

	<max-bit-rate-requirements>

	  <root>10</root>

	</max-bit-rate-requirements>

	<min-bit-rate-requirements>

	  <root>1</root>

	</min-bit-rate-requirements>

	<virtual-link-protocol-data>

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

	  <l3-protocol-data>

	    <name>inside-network</name>

	    <ip-version>ipv4</ip-version>

	    <cidr>192.138.0.0/8</cidr>

	    <gateway-ip>192.138.0.1</gateway-ip>

	    <dhcp-enabled>true</dhcp-enabled>

	  </l3-protocol-data>

	</virtual-link-protocol-data>

      </virtual-link-profile>

      <instantiation-level>

        <id>double</id>

        <vdu-level>