Commit 76f27511 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Issue#1

parent 98b67160

example-data/complex-vnfd.xml

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

        <num-virtual-cpu>16</num-virtual-cpu>

      </virtual-cpu>

      </virtual-cpu>

    </virtual-compute-desc>

    </virtual-compute-desc>

    <virtual-storage-descriptor>

    <virtual-storage-desc>

      <id>root</id>

      <id>root</id>

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

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

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

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

    </virtual-storage-descriptor>

    </virtual-storage-desc>

    <sw-image-desc>

    <sw-image-desc>

      <id>CP</id>

      <id>CP</id>

      <name>CP</name>

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

    <int-virtual-link-desc>

      <id>internal-vl</id>

      <id>internal-vl</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

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

          <protocol>ipv4</protocol>

        </layer-protocol>

      </connectivity-type>

      </connectivity-type>

    </int-virtual-link-desc>

    </int-virtual-link-desc>

    <int-virtual-link-desc>

    <int-virtual-link-desc>

      <id>mgmt</id>

      <id>mgmt</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

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

          <protocol>ipv4</protocol>

        </layer-protocol>

      </connectivity-type>

      </connectivity-type>

    </int-virtual-link-desc>

    </int-virtual-link-desc>

    <ext-cpd>

    <ext-cpd>

example-data/nfv-nsd.xml

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

      </checksum>

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

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

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

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

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

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

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

      <size>1</size>

      <size>1</size>

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

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

example-data/nfv-vnfd.xml

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

    </checksum>

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

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

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

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

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

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

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

    <size>1</size>

    <size>1</size>

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

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

src/yang/etsi-nfv-common.yang

+22 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,28 @@ submodule etsi-nfv-common { 
      enum "end-vnf-ext-conn-change";

      enum "end-vnf-ext-conn-change";

      enum "start-vnfinfo-modification";

      enum "start-vnfinfo-modification";

      enum "end-vnfinfo-modification";

      enum "end-vnfinfo-modification";

      enum "start-vnf-snapshot-creation";

      enum "end-vnf-snapshot-creation";

      enum "start-vnf-snapshot-reverting-to";

      enum "end-vnf-snapshot-reverting-to";

      enum "start-change-current-vnf-package";

      enum "end-change-current-vnf-package";

    }

  }



  typedef external-lifecycle-management-script-event {

    type enumeration {

      enum "instantiation";

      enum "scaling";

      enum "healing";

      enum "termination";

      enum "vnf-flavour-change";

      enum "vnf-operation-change";

      enum "vnf-ext-conn-change";

      enum "vnfinfo-modification";

      enum "vnf-snapshot-creation";

      enum "vnf-snapshot-reverting-to";

      enum "change-current-vnf-package";

    }

    }

  }

  }

src/yang/etsi-nfv-vnf.yang

+17 −2
Original line number Original line Diff line number Diff line
@@ -2600,10 +2600,25 @@ submodule etsi-nfv-vnf { 
      }

      }





      leaf-list event {

      leaf-list event {

        type union {

          type internal-lifecycle-management-script-event;

          type internal-lifecycle-management-script-event;

          type external-lifecycle-management-script-event;

        }

        description

        description

          "Describes VNF lifecycle event(s) or an external stimulus

          "Describes VNF lifecycle event(s) or an external stimulus

           detected on a VNFM reference point.";

           detected on a VNFM reference point.



           If the event is of type 

           internal-lifecycle-management-script-event, then depending

           on whether the event is of type start-* or end-*, the

           script associated with the VNF LCM operation needs to be 

           executed before the event, or after the event,

           respectively.



           On the other hand, if the event is of type

           external-lifecycle-management-script-event, then the

           script associated with the event needs to be executed

           for the given VNF LCM operation.";

        reference

        reference

          "GS NFV IFA011: Section 7.1.13 LifeCycleManagementScript

          "GS NFV IFA011: Section 7.1.13 LifeCycleManagementScript

           information element";

           information element";