PR1

jethanandanirequested to merge
jethanandani/SOL-006:PR1 into master

This merge request is to bring the SOL006 models up to par with IFA011 and IFA014 Ed261 specification. In addition, the merge also updates the Jenkins job that validates these models.

Edited by jethanandani

Merge request reports

example-data/nfv.xml

0 → 100644
+520 −0
Changes for example-data/nfv.xml: 520 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<config xmlns="http://tail-f.com/ns/config/1.0">

  <nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">

    <vnfd>

      <id>ASA</id>

      <provider>Cisco</provider>

      <product-name>Cisco ASAv</product-name>

      <software-version>9.8</software-version>

      <version>9.8 </version>

      <vnfm-info>ESC</vnfm-info>

      <vdu>

        <id>firewall</id>

        <name>Firewall VDU</name>

        <int-cpd>

          <id>inside</id>

          <ext-cpd>inside</ext-cpd>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </int-cpd>

        <int-cpd>

          <id>management</id>

          <ext-cpd>management</ext-cpd>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </int-cpd>

        <int-cpd>

          <id>outside</id>

          <ext-cpd>outside</ext-cpd>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </int-cpd>

        <virtual-compute-desc>asa-vcd</virtual-compute-desc>

        <virtual-storage-desc>asa-vsd</virtual-storage-desc>

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

      </vdu>

      <virtual-compute-descriptor>

        <id>asa-vcd</id>

        <virtual-memory>

          <size>4.0</size>

        </virtual-memory>

        <virtual-cpu>

          <num-virtual-cpu>2</num-virtual-cpu>

        </virtual-cpu>

      </virtual-compute-descriptor>

      <virtual-storage-descriptor>

        <id>asa-vsd</id>

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

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

      </virtual-storage-descriptor>

      <sw-image-desc>

        <id>asa-image</id>

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

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

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

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

      </sw-image-desc>

      <ext-cpd>

        <id>inside</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

      <ext-cpd>

        <id>management</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

      <ext-cpd>

        <id>outside</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

      <df>

        <id>normal</id>

        <vdu-profile>

          <id>firewall</id>

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

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

        </vdu-profile>

        <instantiation-level>

          <id>double</id>

          <vdu-level>

            <id>firewall</id>

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

          </vdu-level>

        </instantiation-level>

        <instantiation-level>

          <id>single</id>

          <vdu-level>

            <id>firewall</id>

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

          </vdu-level>

        </instantiation-level>

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

      </df>

    </vnfd>

    <vnfd>

      <id>CSR</id>

      <provider>Cisco</provider>

      <product-name>Cisco CSR 1000v</product-name>

      <software-version>3.16</software-version>

      <version>3.16</version>

      <vnfm-info>ESC</vnfm-info>

      <vdu>

        <id>router</id>

        <name>Router VDU</name>

        <int-cpd>

          <id>left</id>

          <ext-cpd>left</ext-cpd>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </int-cpd>

        <int-cpd>

          <id>management</id>

          <ext-cpd>management</ext-cpd>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </int-cpd>

        <int-cpd>

          <id>right</id>

          <ext-cpd>right</ext-cpd>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </int-cpd>

        <virtual-compute-desc>csr-vcd</virtual-compute-desc>

        <virtual-storage-desc>csr-vsd</virtual-storage-desc>

        <sw-image-desc>csr-image</sw-image-desc>

      </vdu>

      <virtual-compute-descriptor>

        <id>csr-vcd</id>

        <virtual-memory>

          <size>4.0</size>

        </virtual-memory>

        <virtual-cpu>

          <num-virtual-cpu>2</num-virtual-cpu>

        </virtual-cpu>

      </virtual-compute-descriptor>

      <virtual-storage-descriptor>

        <id>csr-vsd</id>

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

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

      </virtual-storage-descriptor>

      <sw-image-desc>

        <id>csr-image</id>

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

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

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

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

      </sw-image-desc>

      <ext-cpd>

        <id>left</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

      <ext-cpd>

        <id>management</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

      <ext-cpd>

        <id>right</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

      <df>

        <id>normal</id>

        <vdu-profile>

          <id>router</id>

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

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

        </vdu-profile>

        <instantiation-level>

          <id>double</id>

          <vdu-level>

            <id>router</id>

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

          </vdu-level>

        </instantiation-level>

        <instantiation-level>

          <id>single</id>

          <vdu-level>

            <id>router</id>

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

          </vdu-level>

        </instantiation-level>

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

      </df>

    </vnfd>

    <nsd>

      <id>firewall-nsd</id>

      <vnfd-id>ASA</vnfd-id>

      <sapd>

        <id>inside</id>

      </sapd>

      <sapd>

        <id>management</id>

      </sapd>

      <sapd>

        <id>outside</id>

      </sapd>

      <df>

        <id>firewall</id>

        <vnf-profile>

          <id>firewall</id>

          <vnfd-id>ASA</vnfd-id>

          <flavor-id>normal</flavor-id>

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

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

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

        </vnf-profile>

        <ns-instantiation-level>

          <id>single</id>

          <vnf-to-level-mapping>

            <vnf-profile-id>firewall</vnf-profile-id>

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

          </vnf-to-level-mapping>

        </ns-instantiation-level>

      </df>

    </nsd>

    <nsd>

      <id>service-chain-1</id>

      <vnfd-id>ASA</vnfd-id>

      <vnfd-id>CSR</vnfd-id>

      <pnfd-id>physical-dpi</pnfd-id>

      <sapd>

        <id>inside</id>

      </sapd>

      <sapd>

        <id>management</id>

        <virtual-link-desc>mgmt</virtual-link-desc>

      </sapd>

      <sapd>

        <id>outside</id>

        <vnf>

          <vnfd-id>CSR</vnfd-id>

          <ext-cpd-id>left</ext-cpd-id>

        </vnf>

      </sapd>

      <virtual-link-desc>

        <id>fw2dpi</id>

        <version>1.0</version>

        <connectivity-type>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </connectivity-type>

        <df>

          <id>normal</id>

          <qos>

            <latency>0</latency>

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

          </qos>

        </df>

      </virtual-link-desc>

      <virtual-link-desc>

        <id>mgmt</id>

        <version>1.0</version>

        <connectivity-type>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:IPv4</layer-protocol>

        </connectivity-type>

        <df>

          <id>normal</id>

          <qos>

            <latency>0</latency>

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

          </qos>

        </df>

      </virtual-link-desc>

      <virtual-link-desc>

        <id>r2fw</id>

        <version>1.0</version>

        <connectivity-type>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

        </connectivity-type>

        <df>

          <id>normal</id>

          <qos>

            <latency>0</latency>

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

          </qos>

        </df>

      </virtual-link-desc>

      <df>

        <id>router-fw</id>

        <vnf-profile>

          <id>firewall</id>

          <vnfd-id>ASA</vnfd-id>

          <flavor-id>normal</flavor-id>

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

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

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

          <virtual-link-connectivity>

            <virtual-link-profile-id>mgmt</virtual-link-profile-id>

            <cpd-id>management</cpd-id>

          </virtual-link-connectivity>

          <virtual-link-connectivity>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <cpd-id>outside</cpd-id>

          </virtual-link-connectivity>

        </vnf-profile>

        <vnf-profile>

          <id>router</id>

          <vnfd-id>CSR</vnfd-id>

          <flavor-id>normal</flavor-id>

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

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

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

          <virtual-link-connectivity>

            <virtual-link-profile-id>mgmt</virtual-link-profile-id>

            <cpd-id>management</cpd-id>

          </virtual-link-connectivity>

          <virtual-link-connectivity>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <cpd-id>right</cpd-id>

          </virtual-link-connectivity>

        </vnf-profile>

        <virtual-link-profile>

          <id>mgmt</id>

          <virtual-link-desc-id>mgmt</virtual-link-desc-id>

          <flavor-id>normal</flavor-id>

          <max-bitrate-requirements>

            <root>1000</root>

          </max-bitrate-requirements>

          <min-bitrate-requirements>

            <root>0</root>

          </min-bitrate-requirements>

        </virtual-link-profile>

        <virtual-link-profile>

          <id>r2fw</id>

          <virtual-link-desc-id>r2fw</virtual-link-desc-id>

          <flavor-id>normal</flavor-id>

          <max-bitrate-requirements>

            <root>10000000</root>

          </max-bitrate-requirements>

          <min-bitrate-requirements>

            <root>0</root>

          </min-bitrate-requirements>

        </virtual-link-profile>

        <ns-instantiation-level>

          <id>normal</id>

          <description>Single FW and Router</description>

          <vnf-to-level-mapping>

            <vnf-profile-id>firewall</vnf-profile-id>

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

          </vnf-to-level-mapping>

          <vnf-to-level-mapping>

            <vnf-profile-id>router</vnf-profile-id>

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

          </vnf-to-level-mapping>

        </ns-instantiation-level>

      </df>

      <df>

        <id>router-fw-dpi</id>

        <vnf-profile>

          <id>firewall</id>

          <vnfd-id>ASA</vnfd-id>

          <flavor-id>normal</flavor-id>

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

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

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

          <virtual-link-connectivity>

            <virtual-link-profile-id>fw2dpi</virtual-link-profile-id>

            <cpd-id>inside</cpd-id>

          </virtual-link-connectivity>

          <virtual-link-connectivity>

            <virtual-link-profile-id>mgmt</virtual-link-profile-id>

            <cpd-id>management</cpd-id>

          </virtual-link-connectivity>

          <virtual-link-connectivity>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <cpd-id>outside</cpd-id>

          </virtual-link-connectivity>

        </vnf-profile>

        <vnf-profile>

          <id>router</id>

          <vnfd-id>CSR</vnfd-id>

          <flavor-id>normal</flavor-id>

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

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

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

          <virtual-link-connectivity>

            <virtual-link-profile-id>mgmt</virtual-link-profile-id>

            <cpd-id>management</cpd-id>

          </virtual-link-connectivity>

          <virtual-link-connectivity>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <cpd-id>right</cpd-id>

          </virtual-link-connectivity>

        </vnf-profile>

        <pnf-profile>

          <id>physical-dpi</id>

          <pnfd-id>physical-dpi</pnfd-id>

          <virtual-link-connectivity>

            <virtual-link-profile-id>fw2dpi</virtual-link-profile-id>

            <cpd-id>outside</cpd-id>

          </virtual-link-connectivity>

        </pnf-profile>

        <virtual-link-profile>

          <id>fw2dpi</id>

          <virtual-link-desc-id>fw2dpi</virtual-link-desc-id>

          <flavor-id>normal</flavor-id>

          <max-bitrate-requirements>

            <root>1000000</root>

          </max-bitrate-requirements>

          <min-bitrate-requirements>

            <root>0</root>

          </min-bitrate-requirements>

        </virtual-link-profile>

        <virtual-link-profile>

          <id>mgmt</id>

          <virtual-link-desc-id>mgmt</virtual-link-desc-id>

          <flavor-id>normal</flavor-id>

          <max-bitrate-requirements>

            <root>1000</root>

          </max-bitrate-requirements>

          <min-bitrate-requirements>

            <root>0</root>

          </min-bitrate-requirements>

        </virtual-link-profile>

        <virtual-link-profile>

          <id>r2fw</id>

          <virtual-link-desc-id>r2fw</virtual-link-desc-id>

          <flavor-id>normal</flavor-id>

          <max-bitrate-requirements>

            <root>1000000</root>

          </max-bitrate-requirements>

          <min-bitrate-requirements>

            <root>0</root>

          </min-bitrate-requirements>

        </virtual-link-profile>

        <ns-instantiation-level>

          <id>normal</id>

          <description>Router+FW+Physical DPI</description>

          <vnf-to-level-mapping>

            <vnf-profile-id>firewall</vnf-profile-id>

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

          </vnf-to-level-mapping>

          <vnf-to-level-mapping>

            <vnf-profile-id>router</vnf-profile-id>

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

          </vnf-to-level-mapping>

        </ns-instantiation-level>

      </df>

    </nsd>

    <nsd>

      <id>service-chain-2</id>

      <nested-nsd-id>firewall-nsd</nested-nsd-id>

      <vnfd-id>CSR</vnfd-id>

      <sapd>

        <id>inside</id>

        <ns>

          <nsd-id>firewall-nsd</nsd-id>

          <ext-cpd-id>inside</ext-cpd-id>

        </ns>

      </sapd>

      <sapd>

        <id>outside</id>

        <vnf>

          <vnfd-id>CSR</vnfd-id>

          <ext-cpd-id>left</ext-cpd-id>

        </vnf>

      </sapd>

      <virtual-link-desc>

        <id>r2fw</id>

        <version>1.0</version>

        <connectivity-type>

          <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:IPv4</layer-protocol>

        </connectivity-type>

        <df>

          <id>r2fw</id>

          <qos>

            <latency>1000</latency>

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

          </qos>

        </df>

      </virtual-link-desc>

      <df>

        <id>router-fw</id>

        <vnf-profile>

          <id>router</id>

          <vnfd-id>CSR</vnfd-id>

          <flavor-id>normal</flavor-id>

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

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

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

          <virtual-link-connectivity>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <cpd-id>right</cpd-id>

          </virtual-link-connectivity>

        </vnf-profile>

        <virtual-link-profile>

          <id>r2fw</id>

          <virtual-link-desc-id>r2fw</virtual-link-desc-id>

          <flavor-id>r2fw</flavor-id>

          <max-bitrate-requirements>

            <root>500</root>

          </max-bitrate-requirements>

          <min-bitrate-requirements>

            <root>0</root>

          </min-bitrate-requirements>

        </virtual-link-profile>

        <ns-instantiation-level>

          <id>normal</id>

          <vnf-to-level-mapping>

            <vnf-profile-id>router</vnf-profile-id>

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

          </vnf-to-level-mapping>

          <virtual-link-to-level-mapping>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <root>10</root>

          </virtual-link-to-level-mapping>

        </ns-instantiation-level>

        <ns-profile>

          <id>firewall</id>

          <nsd-id>firewall-nsd</nsd-id>

          <ns-df-id>firewall</ns-df-id>

          <instantiation-level-id>single</instantiation-level-id>

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

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

          <virtual-link-connectivity>

            <virtual-link-profile-id>r2fw</virtual-link-profile-id>

            <cpd-id>outside</cpd-id>

          </virtual-link-connectivity>

        </ns-profile>

      </df>

    </nsd>

    <pnfd>

      <id>physical-dpi</id>

      <version>1.0</version>

      <ext-cpd>

        <id>outside</id>

        <layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>

      </ext-cpd>

    </pnfd>

  </nfv>

</config>

src/yang/etsi-nfv-common.yang

+36 −114
Changes for src/yang/etsi-nfv-common.yang: 36 added lines, 114 removed lines.
Original line number Diff line number Diff line 
module etsi-nfv-common {

  namespace "urn:etsi:params:xml:ns:yang:etsi-nfv-common";

  yang-version 1.1;

  prefix common;



  description
@@ -368,18 +369,28 @@ module etsi-nfv-common { 
         information element.";

    }

  }



  // The following grouping is Cpd information element as defined in

  // IFA014. IFA011 defines its own Cpd information element, which

  // is defined in etsi-nfv-vnf.yang file. Do not use this grouping

  // for inclusion in a Vnf.

  grouping cpd {

    description

      "A Cpd information element describes network connectivity to a

       compute resource or a VL.";

      "The Cpd information element specifies the characteristics of

       connection points attached to NFs and NSs. This is an

       abstract class used as parent for the various Cpd classes.

       It has an attribute 'trunkMode' which enables the NFVO to

       identify whether the Cp instantiated from the Cpd is in trunk

       mode or not.";

    reference

      "GS NFC IFA011: Section 7.1.6.3 Cpd Information Element";

      "GS NFC IFA014: Section 6.6.3.1 Cpd information element";



    leaf id {

      type string;

      description

        "Identifier of this Cpd information element.";

      reference

        "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

        "GS NFC IFA014: Section 6.6.3.1 Cpd information element";

    }

    leaf layer-protocol {

      mandatory true;
@@ -387,134 +398,45 @@ module etsi-nfv-common { 
        base common:layer-protocol;

      }

      description

        "Identifies which protocol the CP uses for connectivity

         purposes (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire,

         etc.).";

        "Identifies a protocol that the connection points

         corresponding to the CPD support for connectivity purposes

         (e.g. Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire, etc.).";

      reference

        "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

        "GS NFC IFA014: Section 6.6.3.1 Cpd information element";

    }

    leaf role {

      type identityref {

        base common:cp-role;

      }

      description

        "Identifies the role of the port in the context of the

         traffic flow patterns in the VNF or parent NS. For example a

         VNF with a tree flow pattern within the VNF will have legal

         cpRoles of ROOT and LEAF.";

        "Identifies the role of the connection points

         corresponding to the CPD in the context of the traffic

         flow patterns in the VNF, PNF or NS. For example an NS with

         a tree flow pattern within the NS will have legal cpRoles

         of ROOT and LEAF.";

      reference

        "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

        "GS NFC IFA014: Section 6.6.3.1 Cpd information element";

    }

    leaf description {

      type string;

      description

        "Human readable description of the connection point";

      reference

        "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

    }

    container protocol {

      description

        "Identifies the protocol layering information the CP uses for

         connectivity purposes and associated information. There shall

         be one cpProtocol for each layer protocol as indicated by the

         attribute layerProtocol.";

      reference

        "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

      leaf associated-layer-protocol {

        type identityref {

          base common:layer-protocol;

        }

        description

          "One of the values of the attribute layerProtocol of the Cpd

           IE.";

        reference

          "GS NFV IFA011: Section 7.1.6.8, CpProtocolData information

           element.";

      }



      list address-data {

        key "address-type";

        leaf address-type {

          type identityref {

            base common:address-type;

          }

          description

            "Describes the type of the address to be assigned to the CP

             instantiated from the parent CPD.

             Value:

             • MAC address.

             • IP address.

             • …

             The content type shall be aligned with the address type

             supported by the layerProtocol attribute of the parent CPD.";

        "Provides human-readable information on the purpose of the

         connection point (e.g. connection point for control plane

         traffic).";

      reference

            "GS NFV IFA011: Section 7.1.3.3, AddressData information

             element.";

        }

        container l2-address-data {

          when "../address-type='mac-address'";

        }

        container l3-address-data {

          when "../address-type='ip-address'";

          leaf ip-address-assignment {

            type boolean;

            description

              "Specify if the address assignment is the responsibility

               of management and orchestration function or not. If it

               is set to True, it is the management and orchestration

               function responsibility. ";

            reference

              "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

          }

          leaf floating-ip-activated {

            type boolean;

            description

              "Specify if the floating IP scheme is activated on the CP

               or not.";

            reference

              "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

          }

          leaf ip-address-type {

            type enumeration {

              enum "ipv4";

              enum "ipv6";

            }

            description

              "Define address type. The address type should be aligned

               with the address type supported by the layerProtocol

               attribute of the parent VnfExtCpd.";

            reference

              "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

          }

          leaf number-of-ip-addresses {

            type uint32;

            description

              "Minimum number of IP addresses to be assigned based on

               this L3AddressData information element.";

            reference

              "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

          }

        }

        description

          "The AddressData information element supports providing

           information about the addressing scheme and parameters

           applicable to a CP.";

        reference

          "GS NFV IFA011: Section 7.1.3.3, AddressData information

           element.";

      }

        "GS NFC IFA014: Section 6.6.3.1 Cpd information element";

    }

    leaf trunk-mode {

      type boolean;

      description

        "Information about whether the CP instantiated from this CPD

         is in Trunk mode (802.1Q or other).";

        "Information about whether the Cp instantiated from this CPD

         is in Trunk mode (802.1Q or other). When operating in

         'trunk mode', the Cp is capable of carrying traffic for

         several VLANs. A cardinality of 0 implies that trunkMode

         is not configured for the Cp i.e. It is equivalent to

         Boolean value 'false'.";

      reference

        "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

        "GS NFC IFA014: Section 6.6.3.1 Cpd information element";

    }

  }

}

src/yang/etsi-nfv-ns.yang

+1060 −148

File changed.

Preview size limit exceeded, changes collapsed.

src/yang/etsi-nfv-pnf.yang

+5 −7
Changes for src/yang/etsi-nfv-pnf.yang: 5 added lines, 7 removed lines.
Original line number Diff line number Diff line 
submodule etsi-nfv-pnf {

  yang-version 1.1;

  belongs-to etsi-nfv {

    prefix nfv;

  }
@@ -10,11 +11,6 @@ submodule etsi-nfv-pnf { 
    prefix common;

  }



  /*

   * Include

   */

  include etsi-nfv-ns;



  description

    "Models for PNFD according to GS NFV-IFA 014.";
@@ -37,7 +33,9 @@ submodule etsi-nfv-pnf { 
    reference

      "GS NFV-IFA014: Section 6.6.2, Pnfd information element";



    container pnfd {

    list pnfd {

      key "id";



      leaf id {

        type string;

        description
@@ -83,7 +81,7 @@ submodule etsi-nfv-pnf { 
        reference

          "GS NFV-IFA014: Section 6.6.2, Pnfd information element";

      }

      list ext-cp {

      list ext-cpd {

        key "id";

        uses common:cpd;

        description

src/yang/etsi-nfv-vnf.yang

+322 −28
Changes for src/yang/etsi-nfv-vnf.yang: 322 added lines, 28 removed lines.
Original line number Diff line number Diff line 
submodule etsi-nfv-vnf {

  yang-version 1.1;

  belongs-to etsi-nfv {

    prefix nfv;

  }
@@ -12,7 +13,6 @@ submodule etsi-nfv-vnf { 
  import etsi-nfv-common {

    prefix common;

  }

  include etsi-nfv-ns;



  description

    "Models for VNFD according to GS NFV-IFA 011.";
@@ -101,6 +101,161 @@ submodule etsi-nfv-vnf { 
    }

  }



  // This grouping definition is for use within Vnfd as defined in

  // IFA011. A similar definition of Cpd exists in IFA014, but

  // that is for use with Sapd and Pnfd. Do not use this grouping

  // for that.

  grouping cpd {

    description

      "A Cpd information element describes network

       connectivity to a compute resource or a VL.";

    reference

      "GS NFC IFA011: Section 7.1.6.3 Cpd Information

       Element";

    leaf id {

      type string;

      description

	"Identifier of this Cpd information element.";

      reference

	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

    }

    leaf layer-protocol {

      mandatory true;

      type identityref {

	base common:layer-protocol;

      }

      description

	"Identifies which protocol the CP uses for connectivity

         purposes (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire,

         etc.).";

      reference

	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

    }

    leaf role {

      type identityref {

	base common:cp-role;

      }

      description

	"Identifies the role of the port in the context of the

         traffic flow patterns in the VNF or parent NS. For example a

         VNF with a tree flow pattern within the VNF will have legal

         cpRoles of ROOT and LEAF.";

      reference

	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

    }

    leaf description {

      type string;

      description

	"Human readable description of the connection point";

      reference

	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

    }

    container protocol {

      description

	"Identifies the protocol layering information the CP uses for

         connectivity purposes and associated information. There shall

         be one cpProtocol for each layer protocol as indicated by the

         attribute layerProtocol.";

      reference

	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

      leaf associated-layer-protocol {

	type identityref {

	  base common:layer-protocol;

	}

	description

	  "One of the values of the attribute layerProtocol of the Cpd

           IE.";

	reference

	  "GS NFV IFA011: Section 7.1.6.8, CpProtocolData information

           element.";

      }



      list address-data {

	key "address-type";

	leaf address-type {

	  type identityref {

	    base common:address-type;

	  }

	  description

	    "Describes the type of the address to be assigned to the CP

             instantiated from the parent CPD.

             Value:

             • MAC address.

             • IP address.

             • …

             The content type shall be aligned with the address type

             supported by the layerProtocol attribute of the parent CPD.";

	  reference

	    "GS NFV IFA011: Section 7.1.3.3, AddressData information

             element.";

	}

	container l2-address-data {

	  when "../address-type='mac-address'";

	}

	container l3-address-data {

	  when "../address-type='ip-address'";

	  leaf ip-address-assignment {

	    type boolean;

	    description

	      "Specify if the address assignment is the responsibility

               of management and orchestration function or not. If it

               is set to True, it is the management and orchestration

               function responsibility. ";

	    reference

	      "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

	  }

	  leaf floating-ip-activated {

	    type boolean;

	    description

	      "Specify if the floating IP scheme is activated on the CP

               or not.";

	    reference

	      "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

	  }

	  leaf ip-address-type {

	    type enumeration {

	      enum "ipv4";

	      enum "ipv6";

	    }

	    description

	      "Define address type. The address type should be aligned

               with the address type supported by the layerProtocol

               attribute of the parent VnfExtCpd.";

	    reference

	      "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

	  }

	  leaf number-of-ip-addresses {

	    type uint32;

	    description

	      "Minimum number of IP addresses to be assigned based on

               this L3AddressData information element.";

	    reference

	      "GS NFV IFA011: Section 7.1.3.4, L3AddressData

               information element.";

	  }

	}

	description

	  "The AddressData information element supports providing

           information about the addressing scheme and parameters

           applicable to a CP.";

	reference

	  "GS NFV IFA011: Section 7.1.3.3, AddressData information

           element.";

      }

    }

    leaf trunk-mode {

      type boolean;

      description

	"Information about whether the CP instantiated from this CPD

         is in Trunk mode (802.1Q or other).";

      reference

	"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";

    }

  }

  

  grouping vnfd {

    list vnfd {

      key "id";
@@ -241,6 +396,7 @@ submodule etsi-nfv-vnf { 
             an external connection point.";

          reference

            "GS NFV IFA011: Section 7.1.6.2, Vdu information element";



          choice cp-connection {

            mandatory true;

            description
@@ -294,13 +450,19 @@ submodule etsi-nfv-vnf { 
              "GS NFV IFA011: Section 7.1.6.4, VduCpd information

               element.";

          }

          uses common:cpd;



          uses cpd;

        }

        leaf virtual-compute-desc {

          type leafref {

            path "../../nfv:virtual-compute-descriptor/" +

                 "nfv:id";

          }

          must "../../nfv:virtual-compute-descriptor[id=current()]/" +

               "nfv:virtual-memory/size >=" +

               "../../nfv:sw-image-desc[id=current()/" +

               "../sw-image-desc]/min-ram" {

          }

          description

            "Describes CPU, Memory and acceleration requirements of

             the Virtualisation Container realizing this VDU.";
@@ -553,7 +715,6 @@ submodule etsi-nfv-vnf { 
              fraction-digits 1;

              range "0..max";

            }

            must ". >= ../../../sw-image-desc[id=current()]/min-ram";

            units "Gb";

            mandatory true;

            description
@@ -729,8 +890,6 @@ submodule etsi-nfv-vnf { 
             related to Virtual Storage.";

        }

        leaf size-of-storage {

          must ". >= ../../sw-image-desc[id=current()]/min-disk";



          type uint64;

          units "Gb";

          mandatory true;
@@ -768,6 +927,9 @@ submodule etsi-nfv-vnf { 
          type leafref {

            path "../../sw-image-desc/id";

          }

          must "../nfv:size-of-storage >=" +

            "../../nfv:sw-image-desc[id=current()]/min-disk" {

          }

          description

            "Software image to be loaded on the VirtualStorage

             resource created based on this VirtualStorageDesc.";
@@ -777,7 +939,8 @@ submodule etsi-nfv-vnf { 
        }

      }



      container sw-image-desc {

      list sw-image-desc {

        key "id";

        description

          "Defines descriptors of software images to be used by the

           VNF.";
@@ -916,6 +1079,7 @@ submodule etsi-nfv-vnf { 
        leaf min-disk {

          type uint64;

          units "Gb";

          default 0;

          description

            "The minimal disk size requirement for this software

             image. The value of the 'size of storage' attribute
@@ -932,6 +1096,7 @@ submodule etsi-nfv-vnf { 
            range "0..max";

          }

          units "Gb";

          default 0;

          description

            "The minimal RAM requirement for this software image.

             The value of the 'size' attribute of
@@ -1122,10 +1287,10 @@ submodule etsi-nfv-vnf { 
          ext-CP to the VDU's CP.

        */

        uses virtual-network-interface-requirements;

        uses common:cpd;

        uses cpd;

      }



      list deployment-flavor {

      list df {

        must "nfv:default-instantiation-level or " +

             "count(nfv:instantiation-level) = 1";

        key "id";
@@ -1335,11 +1500,11 @@ submodule etsi-nfv-vnf { 
            }

            leaf number-of-instances {

              type uint16;

              must ". <= ../../../../nfv:deployment-flavor/" +

                   "nfv:vdu-profile[id=current()]/" +

              must ". <= ../../../../nfv:df/" +

                   "nfv:vdu-profile[id=current()/../nfv:id]/" +

                   "nfv:max-number-of-instances";

              must ". >= ../../../../nfv:deployment-flavor/" +

                   "nfv:vdu-profile[id=current()]/" +

              must ". >= ../../../../nfv:df/" +

                   "nfv:vdu-profile[id=current()/../nfv:id]/" +

                   "nfv:min-number-of-instances";

              mandatory true;

              description
@@ -1694,31 +1859,160 @@ submodule etsi-nfv-vnf { 
              "GS NFV IFA011: Section 7.1.10.2 ScalingAspect

               information element";

          }

          leaf associated-group {

            type leafref {

              path "../../../nfv:element-group/nfv:id";

          leaf max-scale-level {

            type uint32 {

              range "1..max";

            }

            description

              "Reference to the group of Vnfd elements defining this

               aspect. If present, scaling for this aspect is limited

               to the elements of the group, but there is no

               assumption that all the elements of the groups will be

               increased at each step.";

              "The maximum scaleLevel for total number of scaling

               steps that can be applied w.r.t. this aspect. The

               value of this attribute corresponds to the number of

               scaling steps can be applied to this aspect when

               scaling it from the minimum scale level (i.e. 0) to the

               maximum scale level defined by this attribute.";

            reference

              "GS NFV IFA011: Section 7.1.10.2 ScalingAspect

               information element";

          }

          leaf max-scale-level {



          container aspect-delta-details {

            list deltas {

              key "id";

              min-elements 1;



              leaf id {

                type string;

                description

                  "Identifier of this scaling delta.";

                reference

                  "GS NFV IFA011: Section 7.1.10.4 ScalingDelta

                   information element";

              }



              list vdu-delta {

                key "id";



                leaf id {

                  type leafref {

                    path "/nfv/vnfd/vdu/id";

                  }

                  description

                    "Uniquely identifies a VDU.";

                  reference

                    "GS NFV IFA011: Section 7.1.8.9 VduLevel

                     information element";

                }



                leaf number-of-instances {

                  type uint32 {

              range "1..max";

                    range "0..max";

                  }

                  description

              "The maximum scaleLevel for total number of scaling

               steps that can be applied w.r.t. this aspect. The value

               of this attribute corresponds to the number of scaling

               steps can be applied to this aspect when scaling it

               from the minimum scale level (i.e. 0) to the maximum

               scale level defined by this attribute.";

                    "Number of instances of VNFC based on this VDU to

                     deploy for an instantiation level or for a

                     scaling delta. Shall be zero or greater.";

                  reference

                    "GS NFV IFA011: Section 7.1.8.9 VduLevel

                     information element";

                }

                description

                  "The number of VNFC instances based on particular

                   VDUs to be created or removed.";

                reference

                  "GS NFV IFA011: Section 7.1.10.4 ScalingDelta

                   information element";

              }



              list virtual-link-bit-rate-delta {

                key "id";



                leaf id {

                  type string;

                  description

                    "Uniquely identifies a VnfVirtualLinkDesc.";

                  reference

                    "GS NFV IFA011: Section 7.1.10.5

                     VirtualLinkBitRateLevel information element";

                }



                container bit-rate-requirements {

                  leaf root {

                    type uint32;

                    units bits/sec;

                    mandatory true;

                    description

                      "Throughput requirement of the link (e.g.

                       bitrate of E-Line, root bitrate of E-Tree,

                       aggregate capacity of E-LAN).";

                    reference

                      "GS NFV IFA011: Section 7.1.8.6

                       LinkBitrateRequirements information element";

                  }



                  leaf leaf {

                    type uint32;

                    units bits/sec;

                    description

                      "Throughput requirement of leaf connections to

                       the link when applicable to the connectivity

                       type (e.g. for E-Tree and E-LAN branches).";

                    reference

                      "GS NFV IFA011: Section 7.1.8.6

                       LinkBitrateRequirements information element";

                  }

                  description

                    "Bitrate requirements for an instantiation level

                     or bitrate delta for a scaling step.";

                  reference

                    "GS NFV IFA011: Section 7.1.10.5

                     VirtualLinkBitRateLevel information element";

                }

                description

                  "The bitrate to be added or removed to virtual links

                   created from particular virtual link descriptors.";

                reference

                  "GS NFV IFA011: Section 7.1.10.4 ScalingDelta

                   information element";

              }

              description

                "Declares different scaling deltas, each of which is

                 applied for one or more scaling steps of this

                 aspect.";

              reference

                "GS NFV IFA011: Section 7.1.10.3 AspectDeltaDetails

                 information element";

            }



            leaf step-deltas {

              type leafref {

                path "../deltas/id";

              }

              description

                "Identifiers of the individual scaling deltas to be

                 applied for the subsequent scaling steps of this

                 aspect. The first entry in the array shall correspond

                 to the first scaling step (between scale levels 0 to

                 1) and the last entry in the array shall correspond

                 to the last scaling step (between maxScaleLevel-1

                 and maxScaleLevel).



                 Each referenced scaling delta shall be declared in

                 the 'deltas' attribute.";

              reference

                "GS NFV IFA011: Section 7.1.10.3 AspectDeltaDetails

                 information element";

            }

            description

              "A specification of the deltas in terms of number of

               instances of VNFCs and virtual link bit rates that

               correspond to the scaling steps of this aspect. A

               cardinality of zero indicates that this mapping has to

               be specified in a lifecycle management script or be

               otherwise known to the VNFM. The information in this

               attribute, if provided, shall be consistent with the

               information provided in the 'InstantiationLevel'

               information element. If this attribute is provided, it

               shall be provided for all scaling aspects.";

            reference

              "GS NFV IFA011: Section 7.1.10.2 ScalingAspect

               information element";