Commit 48fd1d37 authored by Michele Carignani's avatar Michele Carignani
Browse files

Merge branch 'merge-v2.8.1-and-v3.3.1' into 'master' 

Merge v2.8.1 and v3.3.1

See merge request !80
parents 3587cb0e cd8c03e1

README.md

0 → 100644
+3 −0
Original line number Diff line number Diff line 
Note: At this time this document is in draft state, and subject to change till the final approval. As such, files accessed/used from this repository are subject to change. Do not use as reference material.



When approved, this README will be updated to reflect the status of the document.
 
 No newline at end of file

example-data/complex-vnfd.xml

+58 −14
Original line number Diff line number Diff line
@@ -80,8 +80,12 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>root</id>

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

      <type-of-storage>block</type-of-storage>

      <block-storage-data>

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

	<rdma-enabled>true</rdma-enabled>

	<sw-image-desc>CP</sw-image-desc>

      </block-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>CP</id>
@@ -118,12 +122,18 @@ 
      <connectivity-type>

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

      </connectivity-type>

      <nfvi-maintenance-info>

	<impact-notification-lead-time>1</impact-notification-lead-time>

      </nfvi-maintenance-info>

    </int-virtual-link-desc>

    <int-virtual-link-desc>

      <id>mgmt</id>

      <connectivity-type>

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

      </connectivity-type>

      <nfvi-maintenance-info>

	<impact-notification-lead-time>1</impact-notification-lead-time>

      </nfvi-maintenance-info>

    </int-virtual-link-desc>

    <ext-cpd>

      <id>in</id>
@@ -152,22 +162,27 @@ 
        <id>control-plane-active</id>

        <min-number-of-instances>1</min-number-of-instances>

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

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

        </affinity-or-anti-affinity-group>

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <vdu-profile>

        <id>control-plane-standby</id>

        <min-number-of-instances>1</min-number-of-instances>

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

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

        </affinity-or-anti-affinity-group>

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <vdu-profile>

        <id>data-plane</id>

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

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

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <instantiation-level>

        <id>il-1</id>
@@ -210,6 +225,18 @@ 
	<operate-vnf-op-config>

	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>

	</operate-vnf-op-config>

	<create-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</create-snapshot-vnf-op-config>

	<revert-to-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</revert-to-snapshot-vnf-op-config>

      </lcm-operations-configuration>

      <affinity-or-anti-affinity-group>

        <id>control-plane</id>
@@ -223,22 +250,27 @@ 
        <id>control-plane-active</id>

        <min-number-of-instances>1</min-number-of-instances>

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

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

        </affinity-or-anti-affinity-group>

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <vdu-profile>

        <id>control-plane-standby</id>

        <min-number-of-instances>1</min-number-of-instances>

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

        <affinity-or-anti-affinity-group>

          <id>control-plane</id>

        </affinity-or-anti-affinity-group>

        <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <vdu-profile>

        <id>data-plane</id>

        <min-number-of-instances>1</min-number-of-instances>

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

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <instantiation-level>

        <id>il-1</id>
@@ -281,6 +313,18 @@ 
	<operate-vnf-op-config>

	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>

	</operate-vnf-op-config>

	<create-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</create-snapshot-vnf-op-config>

	<revert-to-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</revert-to-snapshot-vnf-op-config>

      </lcm-operations-configuration>

      <affinity-or-anti-affinity-group>

        <id>control-plane</id>

example-data/nfv-nsd.xml

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

<?xml version="1.0" encoding="UTF-8"?>

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

  <vnfd>

    <id>ASA</id>

    <provider>My Company</provider>
@@ -36,8 +37,10 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>asa-vsd</id>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>

      <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:block</type-of-storage>

      <block-storage-data>

	<size-of-storage>0</size-of-storage>

      </block-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>asa-image</id>
@@ -49,7 +52,7 @@ 
      </checksum>

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

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

      <min-disk>20</min-disk>

      <min-disk>0</min-disk>

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

      <size>1</size>

      <image>http://www.mycompany.com/asa.qcow2</image>
@@ -84,6 +87,9 @@ 
        <id>firewall</id>

        <min-number-of-instances>1</min-number-of-instances>

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

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <instantiation-level>

        <id>double</id>
@@ -100,6 +106,20 @@ 
        </vdu-level>

      </instantiation-level>

      <default-instantiation-level>single</default-instantiation-level>

      <lcm-operations-configuration>

	<create-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</create-snapshot-vnf-op-config>

	<revert-to-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</revert-to-snapshot-vnf-op-config>

      </lcm-operations-configuration>

    </df>

  </vnfd>

  <nsd>
@@ -133,4 +153,4 @@ 
      </ns-instantiation-level>

    </df>

  </nsd>

</config>
 
</nfv>

example-data/nfv-vnfd.xml

+23 −3
Original line number Diff line number Diff line
@@ -35,8 +35,11 @@ 
  </virtual-compute-desc>

  <virtual-storage-desc>

    <id>asa-vsd</id>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:file</type-of-storage>

    <file-storage-data>

      <size-of-storage>0</size-of-storage>

      <int-virtual-link-desc>asa-image</int-virtual-link-desc>

    </file-storage-data>

  </virtual-storage-desc>

  <sw-image-desc>

    <id>asa-image</id>
@@ -48,7 +51,7 @@ 
    </checksum>

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

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

    <min-disk>20</min-disk>

    <min-disk>0</min-disk>

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

    <size>1</size>

    <image>http://www.mycompany.com/asa.qcow2</image>
@@ -71,6 +74,9 @@ 
      <id>firewall</id>

      <min-number-of-instances>1</min-number-of-instances>

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

      <nfvi-maintenance-info>

	<impact-notification-lead-time>1</impact-notification-lead-time>

      </nfvi-maintenance-info>

    </vdu-profile>

    <instantiation-level>

      <id>double</id>
@@ -87,5 +93,19 @@ 
      </vdu-level>

    </instantiation-level>

    <default-instantiation-level>single</default-instantiation-level>

    <lcm-operations-configuration>

      <create-snapshot-vnf-op-config>

	<parameter>

	  <key>1</key>

	  <value>1</value>

	</parameter>

      </create-snapshot-vnf-op-config>

      <revert-to-snapshot-vnf-op-config>

	<parameter>

	  <key>1</key>

	  <value>1</value>

	</parameter>

      </revert-to-snapshot-vnf-op-config>

    </lcm-operations-configuration>

  </df>

</vnfd>

example-data/nfv.xml

+44 −4
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>asa-vsd</id>

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

      <size-of-storage>0</size-of-storage>

      <type-of-storage>block</type-of-storage>

      <block-storage-data>

	<size-of-storage>1</size-of-storage>

	<rdma-enabled>true</rdma-enabled>

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

      </block-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>asa-image</id>
@@ -67,6 +71,9 @@ 
      <connectivity-type>

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

      </connectivity-type>

      <nfvi-maintenance-info>

	<impact-notification-lead-time>1</impact-notification-lead-time>

      </nfvi-maintenance-info>

    </int-virtual-link-desc>

    <ext-cpd>

      <id>inside</id>
@@ -95,6 +102,9 @@ 
        <id>firewall</id>

        <min-number-of-instances>1</min-number-of-instances>

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

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <virtual-link-profile>

	<id>inside-vl</id>
@@ -141,6 +151,18 @@ 
	<operate-vnf-op-config>

	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>

	</operate-vnf-op-config>

	<create-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</create-snapshot-vnf-op-config>

	<revert-to-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</revert-to-snapshot-vnf-op-config>

      </lcm-operations-configuration>

    </df>

  </vnfd>
@@ -181,8 +203,11 @@ 
    </virtual-compute-desc>

    <virtual-storage-desc>

      <id>csr-vsd</id>

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

      <size-of-storage>0</size-of-storage>

      <type-of-storage>file</type-of-storage>

      <file-storage-data>

	<size-of-storage>1</size-of-storage>

	<int-virtual-link-desc>csr-image</int-virtual-link-desc>

      </file-storage-data>

    </virtual-storage-desc>

    <sw-image-desc>

      <id>csr-image</id>
@@ -229,6 +254,9 @@ 
        <id>router</id>

        <min-number-of-instances>1</min-number-of-instances>

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

	<nfvi-maintenance-info>

	  <impact-notification-lead-time>1</impact-notification-lead-time>

	</nfvi-maintenance-info>

      </vdu-profile>

      <instantiation-level>

        <id>double</id>
@@ -255,6 +283,18 @@ 
	<operate-vnf-op-config>

	  <min-graceful-stop-timeout>1</min-graceful-stop-timeout>

	</operate-vnf-op-config>

	<create-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</create-snapshot-vnf-op-config>

	<revert-to-snapshot-vnf-op-config>

	  <parameter>

	    <key>1</key>

	    <value>1</value>

	  </parameter>

	</revert-to-snapshot-vnf-op-config>

      </lcm-operations-configuration>

    </df>

  </vnfd>