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

Merge branch 'v3.3.1'

parents 23266bdb 06657ae3

README.md

0 → 100644
+3 −0
Changes for README.md: 3 added lines, 0 removed lines.
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

+48 −0
Changes for example-data/complex-vnfd.xml: 48 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -122,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>
@@ -157,17 +163,26 @@ 
        <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</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</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>
@@ -224,17 +251,26 @@ 
        <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</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</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>
@@ -277,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

+17 −0
Changes for example-data/nfv-nsd.xml: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -87,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>
@@ -103,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>

example-data/nfv-vnfd.xml

+17 −0
Changes for example-data/nfv-vnfd.xml: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -74,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>
@@ -90,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

+33 −0
Changes for example-data/nfv.xml: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -71,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>
@@ -99,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>
@@ -145,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>
@@ -236,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>
@@ -262,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>